Modmuss50 0fdba82490 Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 ... # Conflicts: # src/main/java/techreborn/compat/CompatManager.java		2015-12-16 17:10:25 +00:00
..
RecipesBiomesOPlenty.java	2731	2015-11-23 14:49:35 +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 remote-tracking branch 'remotes/origin/master' into 1.8.8	2015-12-16 17:10: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