TechReborn/ToAddBack/compat/recipes
modmuss50 9a585bcfb2 Merge branch '1.7.10' into 1.8.9
Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/BlockOre.java
	src/main/java/techreborn/items/ItemCells.java
2016-02-16 13:49:25 +00:00
..
RecipesBuildcraft.java 2731 2015-11-23 14:49:35 +00:00
RecipesForestry.java 2731 2015-11-23 14:49:35 +00:00
RecipesIC2.java Merge branch '1.7.10' into 1.8.9 2016-02-16 13:49:25 +00:00
RecipesNatura.java 2731 2015-11-23 14:49:35 +00:00
RecipesThaumcraft.java 2731 2015-11-23 14:49:35 +00:00
RecipesThermalExpansion.java 2731 2015-11-23 14:49:35 +00:00