TechReborn/src/main/java/techreborn/init
modmuss50 0922e0b886
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
2016-12-26 23:49:42 +00:00
..
IC2Dict.java Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 2016-12-26 23:49:42 +00:00
IC2Duplicates.java Added a config to allow the de-duplication of ic2 items. When this is enabled TR will require you to use ic2's recipes. #releaseBuild 2016-12-21 17:57:36 +00:00
ModBlocks.java Fix block ore dictionary names 2016-12-21 16:41:33 -08:00
ModFluids.java Add the unified FluidGenerator recipe system + Restructure FluidGenerators tiles 2016-12-17 01:25:32 +01:00
ModItems.java Remove deprecated empty cell 2016-12-12 15:57:04 -08:00
ModLoot.java Auto Format code 2016-10-08 20:46:16 +01:00
ModParts.java Auto Format code 2016-10-08 20:46:16 +01:00
ModRecipes.java Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 2016-12-26 23:49:42 +00:00
ModSounds.java Auto Format code 2016-10-08 20:46:16 +01:00
OreDict.java Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 2016-12-26 23:49:42 +00:00
SubItemRetriever.java Remove deprecated empty cell 2016-12-12 15:57:04 -08:00