GT5-Unofficial/src/main/java/gregtech/common
Dream-Master cbd6ba6651 Merge branch 'Scan-termals-of-EBF'
Conflicts:
	build.properties
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2016-05-22 01:26:18 +02:00
..
blocks Update GT_Item_Casings_Abstract.java 2016-04-16 20:10:23 +02:00
covers Change if chains to switches 2015-10-25 09:27:29 -04:00
entities Reformat code 2015-10-21 22:15:09 -04:00
gui Added all fixes from Blood Asp we need. Just stay at Forestry 3.6.12.3 2015-12-10 01:12:42 +01:00
items Update GT_MetaGenerated_Item_01.java 2016-04-19 18:43:16 +02:00
redstonecircuits Reformat code 2015-10-21 22:15:09 -04:00
render Adding GT:NH Capes 2016-04-18 16:25:35 +02:00
tileentities Merge branch 'Scan-termals-of-EBF' 2016-05-22 01:26:18 +02:00
tools Reformat code 2015-10-21 22:15:09 -04:00
GT_Client.java Adding GT:NH Capes 2016-04-18 16:25:35 +02:00
GT_DummyWorld.java Reformat code 2015-10-21 22:15:09 -04:00
GT_IteratorRandom.java Reformat code 2015-10-21 22:15:09 -04:00
GT_MinableOreGenerator.java Reformat code 2015-10-21 22:15:09 -04:00
GT_Network.java Reformat code 2015-10-21 22:15:09 -04:00
GT_PlayerActivityLogger.java Reformat code 2015-10-21 22:15:09 -04:00
GT_Proxy.java Revert "Try to add Oil Drill. Works but not pumping oil" 2016-04-09 14:02:18 +02:00
GT_RecipeAdder.java Reformat code 2015-10-21 22:15:09 -04:00
GT_Server.java Reformat code 2015-10-21 22:15:09 -04:00
GT_ThaumcraftCompat.java Reformat code 2015-10-21 22:15:09 -04:00
GT_Worldgen_GT_Ore_Layer.java Reformat code 2015-10-21 22:15:09 -04:00
GT_Worldgen_GT_Ore_SmallPieces.java Reformat code 2015-10-21 22:15:09 -04:00
GT_Worldgen_Stone.java Reformat code 2015-10-21 22:15:09 -04:00
GT_Worldgenerator.java Reformat code 2015-10-21 22:15:09 -04:00