modmuss50
|
d96149fc97
|
Revert "Power system re-write, recipe fixes."
This reverts commit d982cc4028 .
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
|
2016-08-10 00:51:44 +01:00 |
|
modmuss50
|
aa05d906f9
|
Revert "Wires now transfer energy from all mods and manages it as EU. (#686)"
This reverts commit 6f54e3801f .
# Conflicts:
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
|
2016-08-10 00:45:33 +01:00 |
|
modmuss50
|
cdae866b2d
|
Revert "Rewrite to use new RebornCore Power API. Texture fixes."
This reverts commit b292fdd352 .
# Conflicts:
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/tiles/TileAlloyFurnace.java
# src/main/java/techreborn/tiles/TileAlloySmelter.java
# src/main/java/techreborn/tiles/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java
# src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/teir1/TileCompressor.java
# src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/teir1/TileExtractor.java
# src/main/java/techreborn/tiles/teir1/TileGrinder.java
# src/main/java/techreborn/tiles/teir1/TileRecycler.java
|
2016-08-10 00:45:07 +01:00 |
|
modmuss50
|
9b882e75ce
|
Revert "Bump version number & small NPE fix."
This reverts commit 8a053117c6 .
# Conflicts:
# build.gradle
|
2016-08-10 00:32:43 +01:00 |
|
modmuss50
|
e3384e3266
|
Revert "Small order fix."
This reverts commit 74e0c3669f .
|
2016-08-10 00:30:23 +01:00 |
|
modmuss50
|
575773a6b3
|
Revert "RF wires fix."
This reverts commit fe64b8ccf7 .
|
2016-08-10 00:30:16 +01:00 |
|
modmuss50
|
8a0d981018
|
Revert "Fusion reactor fixes & rewrite, energy fixes."
This reverts commit 06fad2264f .
|
2016-08-10 00:30:08 +01:00 |
|
modmuss50
|
22fd152ec9
|
Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."
This reverts commit be4f10b975 .
# Conflicts:
# src/main/java/techreborn/init/ModBlocks.java
|
2016-08-10 00:29:47 +01:00 |
|
Nico
|
5f5c43ab96
|
Added new textures + translation optimizations (#711)
* Added new textures + translation optimizations
* Removed old textures
* Added new textures
|
2016-08-03 21:39:04 +01:00 |
|
Nagisa·Jang
|
3fea177b1f
|
fix the mistakes (#712)
|
2016-08-02 14:59:41 +01:00 |
|
Nico
|
9a73c3321e
|
First few Fixes (#707)
* Fixed missing translations
The Plates were only typos...
* Removed old textures
* Added new textures
* Fixed typo for texture
|
2016-08-02 00:35:00 +01:00 |
|
modmuss50
|
bbc5a636f1
|
Added ore vein config
|
2016-08-01 15:30:55 +01:00 |
|
Dragon2488
|
f03fbef70e
|
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn
|
2016-08-01 21:00:30 +07:00 |
|
Dragon2488
|
42d051cda3
|
Veins ore generation + fixes.
|
2016-08-01 20:59:20 +07:00 |
|
modmuss50
|
cb44c79256
|
Remove needed block, update forge
|
2016-08-01 09:37:55 +01:00 |
|
Dragon2488
|
25e709239f
|
Oops
|
2016-08-01 01:25:42 +07:00 |
|
Dragon2488
|
c8301e4db3
|
Veins ore generation system. WIP.
|
2016-08-01 01:12:55 +07:00 |
|
Andrew Burns
|
5898de8d8f
|
Fix typo in config file (#701)
Client was spelt wrong
|
2016-07-30 15:30:11 -07:00 |
|
RarogCmex
|
ecfd3f88fd
|
Update ru_RU.lang 30.07.16 v2
Помимо этой мелкой пыли так же кое-где перевел инструменты и доспехи (из рубина, сапфира, перидота)
|
2016-07-30 17:50:27 +05:00 |
|
Dragon2488
|
7f02559357
|
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn
|
2016-07-29 01:52:08 +07:00 |
|
Dragon2488
|
5af14bbf01
|
Grinder recipes fixes and auto-generation for ores, gems and ingots through ore dictionary
|
2016-07-29 01:28:59 +07:00 |
|
Dragon2488
|
a5a9460707
|
Automation fixes, upgrades fixes.
|
2016-07-27 17:51:03 +07:00 |
|
laz2727
|
99057a8e8e
|
Fix Tinkers Construct crashing
Probably.
|
2016-07-25 20:27:33 +04:00 |
|
Dragon2488
|
be4f10b975
|
Energy storages item charging fixes, transformers fixes, electric items fixes.
|
2016-07-25 15:10:55 +07:00 |
|
Dragon2488
|
b42b5274b5
|
Multiblock fixes (compressor, freezer, grinder), grinder recipes fixes, freezer JEI recipe show fix.
|
2016-07-25 02:26:15 +07:00 |
|
Dragon2488
|
0011553cf7
|
Sawmill changes & fixes.
|
2016-07-24 01:10:37 +07:00 |
|
Dragon2488
|
06fad2264f
|
Fusion reactor fixes & rewrite, energy fixes.
|
2016-07-22 21:45:55 +07:00 |
|
Dragon2488
|
fe64b8ccf7
|
RF wires fix.
|
2016-07-22 01:46:43 +07:00 |
|
Dragon2488
|
74e0c3669f
|
Small order fix.
|
2016-07-22 01:03:36 +07:00 |
|
Dragon2488
|
8a053117c6
|
Bump version number & small NPE fix.
|
2016-07-22 00:21:32 +07:00 |
|
Dragon2488
|
b292fdd352
|
Rewrite to use new RebornCore Power API. Texture fixes.
|
2016-07-21 22:22:56 +07:00 |
|
Archengius
|
6f54e3801f
|
Wires now transfer energy from all mods and manages it as EU. (#686)
* Wires now transfer energy from all mods and manages it as EU. Multipart will fire in hell.
* Fix TechReborn to work with latest RebornCore
|
2016-07-21 07:51:55 -07:00 |
|
modmuss50
|
10aa2f2ffb
|
fix merge
|
2016-07-19 11:46:53 -07:00 |
|
al132
|
aa8fbbb7bc
|
Merge remote-tracking branch 'refs/remotes/TechReborn/1.9.4' into 1.9.4
# Conflicts:
# src/main/java/techreborn/client/container/ContainerExtractor.java
|
2016-07-19 00:21:18 -05:00 |
|
al132
|
f4cd3fc818
|
Leaves Constructor reverted
|
2016-07-18 23:37:02 -05:00 |
|
al132
|
7a6df30d10
|
Rubber and recipe fixes
|
2016-07-18 23:26:41 -05:00 |
|
Dragon2488
|
d982cc4028
|
Power system re-write, recipe fixes.
Please note that this version breaks all wires placed in worlds before.
|
2016-07-18 11:57:52 +07:00 |
|
al132
|
166f9a924f
|
Fixed Output of extractor (#679)
* Add CraftTweaker support for the Compressor
* Fix Extractor insertion and extraction
* Oops
|
2016-07-18 02:06:47 +01:00 |
|
al132
|
84b5de3417
|
Oops
|
2016-07-17 17:38:10 -05:00 |
|
al132
|
9e2c23d04a
|
Fix Extractor insertion and extraction
|
2016-07-17 17:36:40 -05:00 |
|
al132
|
48cbda6453
|
Add CraftTweaker support for the Compressor (#677)
|
2016-07-17 21:31:56 +01:00 |
|
al132
|
ea74721945
|
Add CraftTweaker support for the Compressor
|
2016-07-17 15:19:31 -05:00 |
|
modmuss50
|
fbc0d32407
|
Fix rare crash with the power net
|
2016-07-16 23:44:42 +01:00 |
|
modmuss50
|
adf9b8c0e4
|
Fix #676
|
2016-07-16 22:16:22 +01:00 |
|
Dragon2488
|
25c581e129
|
Recipe fixes.
|
2016-07-16 22:17:44 +07:00 |
|
Dragon2488
|
33df1d3319
|
Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. (#673)
|
2016-07-16 10:44:54 +01:00 |
|
Prospector
|
ddb96d58ec
|
Merge pull request #672 from Dragon2488/1.9.4
Properly integration with IC2 through ore dictionary. JEI recipes...
|
2016-07-15 04:05:16 -07:00 |
|
Dragon2488
|
1f197c3728
|
Properly integration with IC2 through ore dictionary. JEI recipes energy usage and time descriptions.
|
2016-07-15 17:28:41 +07:00 |
|
Prospector
|
31d1afa044
|
Merge pull request #671 from Dragon2488/1.9.4
Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability…
|
2016-07-14 22:39:43 -07:00 |
|
Dragon2488
|
2b148f3d68
|
Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability with renamed (or tagged) cells. Merge dynamic and empty cells into one item. Right click on fluid block fills cell with fluid.
|
2016-07-15 12:15:09 +07:00 |
|