Commit graph

3385 commits

Author SHA1 Message Date
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
drcrazy
b13d282bf1 Fix unused imports 2017-09-09 01:54:43 +03:00
Modmuss50
5985acc431 Merge pull request #1269 from alexpic57/1.12
update Implosion Compressor to GuiBase + fix duplication
2017-09-08 21:10:20 +01:00
alexpic57
c1dd9d9192 fix all? the tile to prevent bug duplication 2017-09-08 21:39:46 +02:00
alexpic57
53adc8142e remove wrong import 2017-09-08 21:25:13 +02:00
alexpic57
885ba9210c fix bug duplication #1012 2017-09-08 21:18:57 +02:00
alexpic57
1d873c2d33 fix identation + remove unused import + fix jei button on ImplosionCompressor 2017-09-08 13:58:27 +02:00
alexpic57
e4b5d3378a update Implosion Compressor to GuiBase 2017-09-08 09:48:55 +02:00
drcrazy
aa2df32222 Fix build 2017-09-08 02:11:49 +03:00
drcrazy
ab1802ba5e Refactoring for translation 2017-09-08 02:03:35 +03:00
drcrazy
8a8205b4b1 Change eupertick to 0.1. Closes #1176 2017-09-07 18:31:20 +03:00
drcrazy
e26d7e3a0c Fixed tooltip issue. Closes #865 2017-09-07 18:29:52 +03:00
drcrazy
30ee947c22 Added player detector recipe. Removed unused imports 2017-09-07 03:17:40 +03:00
drcrazy
015fd889f2 More luv to computer cube block 2017-09-07 01:04:20 +03:00
drcrazy
bc390fa0e0 Fixed missing nuke textures 2017-09-07 00:13:37 +03:00
Modmuss50
7a55995546 Merge pull request #1265 from alexpic57/1.12
fix background not showing on somes machines
2017-09-06 13:48:39 +01:00