modmuss50
fd5af79496
Merge remote-tracking branch 'origin/1.12' into 1.12
2017-10-11 17:42:36 +01:00
modmuss50
23ccd878bd
Fix rolling machine CT
2017-10-11 17:42:27 +01:00
drcrazy
ae27bf7b9f
Added multiblock hologram to Vacuum Freezer. Closes #1297
2017-10-11 17:24:36 +03:00
modmuss50
610c2e479e
Small tile cleanup + small fixes for potential issues.
2017-10-11 13:04:09 +01:00
modmuss50
c80cc0101f
Allow changing of the power cost view in fusion reactor recipes.
2017-10-11 12:56:29 +01:00
modmuss50
55b09da681
Fix fusion reactor not using its starting power.
2017-10-11 12:44:42 +01:00
drcrazy
79c66e2349
Suppressed warning for old upgrade slots
2017-10-11 11:28:04 +03:00
drcrazy
5d38337caa
Fixed unused variable warning
2017-10-11 11:20:42 +03:00
drcrazy
751be69426
Fixed warnings for IronAlloyFurnace (checkBurningTime, updateEntity)
2017-10-11 11:18:42 +03:00
drcrazy
5961ce5961
Fixed warning by hasContainerItem()
2017-10-11 10:52:12 +03:00
drcrazy
3945a961ef
Replaced direct FMLLog usage with LogHelper
2017-10-11 10:40:45 +03:00
drcrazy
387d4287de
Fixed warnings for VersionChecker by removing it )
2017-10-11 02:07:08 +03:00
drcrazy
8692bef2bb
Little polish to AESU GUI
2017-10-11 01:59:25 +03:00
drcrazy
e81fc202ad
Added AESU logic
2017-10-11 00:49:12 +03:00
drcrazy
58aac2ce0b
Updated AESU GUI
2017-10-10 00:13:08 +03:00
modmuss50
45d2df8650
Fix #1293 again
2017-10-09 13:23:41 +01:00
modmuss50
18be69aaf7
Improve tank server->client syncing, closes https://github.com/TechReborn/TechReborn/issues/1291
2017-10-08 19:28:52 +01:00
modmuss50
62366c8085
Fixes #1293
2017-10-08 18:58:00 +01:00
modmuss50
a590fd8ee1
Should fix #1289
2017-10-08 18:56:07 +01:00
drcrazy
1177b693f7
Fixed IDSU not charging items
2017-10-08 02:41:54 +03:00
drcrazy
350d3589c9
Fix warnings for subitemtype instead of supressing it
2017-10-08 01:59:28 +03:00
drcrazy
ca829c18cc
Added wrench support
2017-10-08 00:04:08 +03:00
drcrazy
12e2cbe11b
Fixed textformatting warnings
2017-10-07 14:39:30 +03:00
modmuss50
a80409c138
Some small tweaks to the auto crafting table, closes #1286
2017-10-04 15:19:45 +01:00
modmuss50
4e536718a3
Large changes to allow the Electrical Furnace to be upgraded
2017-10-04 13:35:58 +01:00
Modmuss50
db636be12c
Merge pull request #1285 from Dimmerworld/Scrapboxinator
...
Made Scrapboxinator functional to an extent
2017-10-04 11:07:10 +01:00
Dimmerworld
28010d0790
Make scrapboxinator great again!
...
Fix input/output
Greatly reduced process time
Removed any sign of upgrades
Remove WIP tag
Add crafting recipe
Cleaned up unused imports
Recipe:
(ironplate|circuit|ironplate)
(dirt|scrapbox|dirt)
(ironplate|circuit|ironplate)
2017-10-04 21:02:51 +11:00
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
f00214f7de
Rewrite item power distribution to support fe. should fix #1260
2017-10-03 17:02:58 +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
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
f5076ea8af
Downgrade mappings + update all libs
2017-09-28 23:44:16 +01: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
e74067db40
1.12.2
2017-09-18 23:47:07 +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
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
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
modmuss50
094b67e050
Slight rework of the gui system, should fix some issues with wrenching. Should fix #1264 fixes #988 + a handful of weird gui de-syncs
2017-09-06 13:46:12 +01:00
alexpic57
93b869a446
fix background not showing on somes machines
2017-09-06 14:42:54 +02:00
drcrazy
8588a40474
Added plateIridiumAlloy. Closes #1262 . Closes #1073
2017-09-06 02:38:07 +03:00
drcrazy
71a0ac3e66
Updated recipe to use or not use oreDict names. Closes #1210
2017-09-05 23:40:40 +03:00
drcrazy
849f9fc07b
Fix null IItemstack being converted to air. I hope. Closes #1222
2017-09-05 18:02:42 +03:00
drcrazy
48c9371d77
Added missing cell recipes. Closes #867
2017-09-05 15:32:43 +03:00
drcrazy
a1c77aa47c
Merged inventory keys in blockstate jsons
2017-09-05 00:15:02 +03:00
drcrazy
dfaef8a6c2
Updated fluid generators GUI. Closes #1097
2017-09-04 00:12:58 +03:00
drcrazy
37d8b8641f
GUI rework for Diesel generator
2017-09-03 03:41:50 +03:00
drcrazy
d5a3118801
Made iridium reinforced blocks more blast resistant. Closes #1259
2017-09-02 01:30:36 +03:00
drcrazy
021a6b0077
Fix for name format. Closes #1258
2017-09-01 18:40:33 +03:00
drcrazy
207ac79b77
Change sulfur output from dust to cell. Closes #1105
2017-09-01 17:35:38 +03:00
drcrazy
07b1724e24
Updated max energy storage for several tools. Closes #1219
2017-09-01 16:19:59 +03:00
drcrazy
ace5813745
Update onBlockActivated to use newer method
2017-09-01 13:42:39 +03:00
drcrazy
ceac5fc282
Update for deprecated method
2017-09-01 02:32:05 +03:00
drcrazy
6a36f79e03
Removed duplicate coal dust grinding recipe. Closes #1256
2017-08-31 13:06:41 +03:00
drcrazy
46f9266197
Magnalium plate is back. Closes #1109
2017-08-31 03:02:00 +03:00