GT5-Unofficial/src/main/java/gregtech/api/interfaces
Johannes Gäßler de42d1da42 Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into
BrickedBlastFurnace

Conflicts:
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/api/enums/Textures.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-17 01:02:38 +02:00
..
internal Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into 2017-06-17 01:02:38 +02:00
metatileentity Add missing translation lines. #772 2017-06-05 20:45:15 +02:00
tileentity Cherry-Pick c12e474 2017-06-01 13:18:34 +02:00
IColorModulationContainer.java Reformat code 2015-10-21 22:06:25 -04:00
ICondition.java Reformat code 2015-10-21 22:06:25 -04:00
IDamagableItem.java Reformat code 2015-10-21 22:06:25 -04:00
IDebugableBlock.java Reformat code 2015-10-21 22:06:25 -04:00
IDescribable.java Reformat code 2015-10-21 22:06:25 -04:00
IFoodStat.java Reformat code 2015-10-21 22:06:25 -04:00
IIconContainer.java Reformat code 2015-10-21 22:06:25 -04:00
IItemBehaviour.java Reformat code 2015-10-21 22:06:25 -04:00
IItemContainer.java Reformat code 2015-10-21 22:06:25 -04:00
IMaterialHandler.java Computronics support & Improved mod dependant Materials 2016-10-04 04:12:40 +01:00
IOreRecipeRegistrator.java Reformat code 2015-10-21 22:06:25 -04:00
IProjectileItem.java Reformat code 2015-10-21 22:06:25 -04:00
IRedstoneCircuitBlock.java Reformat code 2015-10-21 22:06:25 -04:00
ISubTagContainer.java Reformat code 2015-10-21 22:06:25 -04:00
ITexture.java Reformat code 2015-10-21 22:06:25 -04:00
IToolStats.java Port GT6 timber changes 2017-06-13 18:58:18 +02:00