Commit graph

3400 commits

Author SHA1 Message Date
modmuss50
965d74d641 Improvements to the iron furnace, closes #1016 2017-10-04 10:12:15 +01:00
Dimmerworld
4c1d011544 Made Scrapboxinator functional to a extent
Fix progressbar flicker(Major one)
Opens the scrapbox now and has a vaild output
2017-10-04 15:37:09 +11:00
modmuss50
e5e05d0afd Chainsaw chops down the entire tree 2017-10-03 17:39:33 +01:00
modmuss50
3481cf4dba Merge remote-tracking branch 'origin/1.12' into 1.12 2017-10-03 17:03:08 +01:00
modmuss50
f00214f7de Rewrite item power distribution to support fe. should fix #1260 2017-10-03 17:02:58 +01:00
Modmuss50
e80583a1e7 Update forge 2017-10-03 15:52:20 +01:00
modmuss50
81264e0fe2 Add back cable damage, closes #1150 2017-10-03 13:24:51 +01:00
drcrazy
369a19b239 Updated alloy smelter GUI to use guiBase 2017-10-03 14:44:08 +03:00
drcrazy
e569abbc6f #releaseBuild 2017-10-02 21:12:28 +03:00
drcrazy
08c2f8921e Add ability to insert\extract from fusion reactor. Closes #1237 2017-10-02 21:08:05 +03:00
drcrazy
0ae99ebae8 Keep state for running reactor. Closes #1187 2017-10-02 18:38:47 +03:00
drcrazy
1c57bd0100 MOre fixed warnings 2017-10-01 03:15:58 +03:00
drcrazy
1c95ca4967 Fixed warnings for Location and getStateFromMeta 2017-10-01 03:03:05 +03:00
drcrazy
1b4fee595d Fixed warnings 2017-09-30 03:58:01 +03:00
drcrazy
b10459a288 Updated Diesel generator recipes. Closes #1279 2017-09-30 03:03:55 +03:00
drcrazy
0e5ab26cf0 Moved check for power acceptors to earlier stage. Closes #1281 2017-09-30 01:29:26 +03:00
drcrazy
bfa0c8f80a Fixed energy usage from IDSU. Closes #1282 2017-09-30 00:45:25 +03:00
drcrazy
6f96dd7c2b Renamed files to fix startup messages 2017-09-29 02:22:05 +03:00
modmuss50
27829ea1f2 Merge remote-tracking branch 'origin/1.12' into 1.12 2017-09-28 23:45:04 +01:00
modmuss50
f5076ea8af Downgrade mappings + update all libs 2017-09-28 23:44:16 +01:00
drcrazy
1875d8abb4 #releaseBuild 2017-09-29 01:24:26 +03:00
drcrazy
4ce046a2ac Added recipe for DragonEgg Syphon 2017-09-29 01:08:31 +03:00
modmuss50
17b09b882a Fix build issues 2017-09-28 22:44:55 +01:00
modmuss50
8bf7bce11c Fix merge issue 2017-09-28 21:09:15 +01:00
modmuss50
e51f3f7c51 Merge remote-tracking branch 'origin/1.12' into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
2017-09-28 21:04:02 +01:00
modmuss50
2e1c469524 Add support for wrenches from other mods. 2017-09-28 21:01:38 +01:00
drcrazy
40e470629d Added check for config for block break with pickaxe. Closes #1172 2017-09-28 02:03:16 +03:00
modmuss50
ffe13d0c79 Update rolling machine CT support for 1.12 closes #1251 2017-09-27 13:45:49 +01:00
drcrazy
3010afa351 Fix to-do 2017-09-27 02:56:24 +03:00
drcrazy
02473d4585 Fix warnings 2017-09-25 17:52:45 +03:00
drcrazy
ae75191c00 Fixed check for max storage for chests. Closes #1026 2017-09-22 04:03:20 +03:00
drcrazy
833974d698 Fixed inventory drop for chests. Closes #1239 2017-09-20 02:26:37 +03:00
drcrazy
8a1d9c78eb Dirty fix for empty itemstack. Closes #1255 2017-09-19 15:11:00 +03:00
modmuss50
27bfa618db #releaseBuild 2017-09-18 23:49:13 +01:00
modmuss50
e74067db40 1.12.2 2017-09-18 23:47:07 +01:00
Modmuss50
e9dd765062 #releaseBuild 2017-09-18 23:08:06 +01:00
drcrazy
7ab16224a5 Fixed existing cable bug. Introduced new. Closes #1240 2017-09-18 01:25:01 +03:00
drcrazy
cd7b008430 Fixed missing ender eye and pearl grinder recipes 2017-09-17 21:00:15 +03:00
drcrazy
be88077f8c #releaseBuild 2017-09-16 01:06:26 +03:00
drcrazy
01c04c27bb Some machines can use batteries now 2017-09-16 00:50:43 +03:00
drcrazy
4ccd3ff290 Fixed lava check inside blast furnace multiblock 2017-09-15 02:10:55 +03:00
drcrazy
c43077e640 Fixed blast furnace double energy tap. Closes #1273 2017-09-15 01:54:09 +03:00
drcrazy
8de19ff5e7 Fix warnings 2017-09-14 17:55:28 +03:00
drcrazy
da399fc916 Fix empty check 2017-09-14 10:30:41 +03:00
drcrazy
f39026b959 JEI integration refactoring 2017-09-13 13:27:33 +03:00
drcrazy
5d441defa7 Update IndustrialElectrolyzer GUI to GuiBase. Closes #1272.
Also started JEI refactoring
2017-09-13 03:40:38 +03:00
drcrazy
7cc8a4985f Fix plate iridium alloy name. Closes #1271 2017-09-11 23:15:59 +03:00
modmuss50
33aaacc8f8 #releaseBuild 2017-09-11 09:35:57 +01:00
modmuss50
b18f99a4dd Fix server crash 2017-09-11 09:28:45 +01:00
drcrazy
5b09618ad2 Fix double tile entity update 2017-09-10 01:15:07 +03:00