Johannes Gäßler f698d3f8e0 Merge branch 'BrickedBlastFurnace' into unstable ... Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/blocks/GT_Block_Casings4.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java		2017-06-25 23:45:45 +02:00
..
automation	Refactored mDescription to mDescriptionArray, added a deprecated field	2017-04-26 20:37:47 +02:00
boilers	Correcting Steel Boiler Tooltip #1080	2017-06-06 13:00:11 +02:00
generators	that makes it look better?	2017-06-01 12:01:20 +02:00
machines	Merge branch 'BrickedBlastFurnace' into unstable	2017-06-25 23:45:45 +02:00
storage	Add missing translation lines. #772	2017-06-05 20:45:15 +02:00