Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/items/tools/ItemWrench.java
This commit is contained in:
modmuss50 2016-12-07 13:52:48 +00:00
commit 3f8128d890
7 changed files with 73 additions and 23 deletions
src/main/java/techreborn/init

View file

@ -3155,7 +3155,7 @@ public class ModRecipes {
if (ConfigTechReborn.ExpensiveDrill)
CraftingHelper
.addShapedOreRecipe(OreDictionary.getOres("drillBasic").get(0).copy(), " S ", "SCS", "SBS", 'S',
.addShapedOreRecipe(new ItemStack(ModItems.ironDrill), " S ", "SCS", "SBS", 'S',
"ingotSteel", 'B', "reBattery", 'C',
"circuitBasic");