From 5e775a9c8af41a976c91b452b09dbd20d15e348b Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Wed, 15 Jan 2014 07:54:12 -0500 Subject: [PATCH] Fixed recipe conflict --- common/mekanism/common/Mekanism.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 2dd97ed3f..1b9dbb394 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -519,7 +519,7 @@ public class Mekanism "EPE", "IEG", "EPE", Character.valueOf('E'), Mekanism.EnrichedAlloy, Character.valueOf('P'), "dustOsmium", Character.valueOf('I'), "dustIron", Character.valueOf('G'), "dustGold" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(CardboardBox), new Object[] { - "SSS", "S S" , "SSS", Character.valueOf('S'), Sawdust + "SS", "SS", Character.valueOf('S'), Sawdust })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Item.paper, 6), new Object[] { "SSS", Character.valueOf('S'), Sawdust