Merge branch 'master' of github.com:SirSengir/BuildCraft
Conflicts: common/net/minecraft/src/buildcraft/api/recipes/RefineryRecipe.java
This commit is contained in:
commit
69412830a7
Conflicts: common/net/minecraft/src/buildcraft/api/recipes/RefineryRecipe.java