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
..
vector	Merge branch 'BrickedBlastFurnace' into unstable	2017-06-25 23:45:45 +02:00