TechReborn/ToAddBack/compat
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
..
ee3 2731 2015-11-23 14:49:35 +00:00
nei Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 2015-12-12 11:41:21 +00:00
recipes Merge branch '1.7.10' into 1.8.9 2016-02-16 13:49:25 +00:00