Merge branch '1.9' of https://github.com/MrBretze/TechReborn into MrBretze-1.9

# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
This commit is contained in:
Modmuss50 2016-03-28 19:32:06 +01:00
commit fe916ae6b2
2 changed files with 1101 additions and 858 deletions

File diff suppressed because it is too large Load diff