diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java index fea3bd998..7cf429073 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java @@ -13,7 +13,6 @@ package ellpeck.actuallyadditions.crafting; import ellpeck.actuallyadditions.config.values.ConfigCrafting; import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.items.metalists.TheFoods; -import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.Util; @@ -80,9 +79,6 @@ public class CrusherCrafting{ CrusherRecipeRegistry.addRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), new ItemStack(Items.sugar, 2)); miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.tallgrass, 1, Util.WILDCARD), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.GREEN_DYE.ordinal())); - miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); - CrusherRecipeRegistry.addRecipe("oreNickel", "dustNickel", 2, "dustPlatinum", 1, 15); CrusherRecipeRegistry.addRecipe("oreIron", "dustIron", 2, "dustGold", 1, 20); diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java index 64141ecd1..a19fcdb8c 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java @@ -32,8 +32,7 @@ public enum TheMiscItems{ BAT_WING("BatWing", EnumRarity.rare), DRILL_CORE("DrillCore", EnumRarity.uncommon), BLACK_DYE("BlackDye", EnumRarity.epic), - LENS("Lens", EnumRarity.uncommon), - GREEN_DYE("GreenDye", EnumRarity.epic); + LENS("Lens", EnumRarity.uncommon); public final String name; public final EnumRarity rarity; diff --git a/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java b/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java index 66a1d5ed3..88d6e7f26 100644 --- a/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java +++ b/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java @@ -65,7 +65,6 @@ public class InitOreDict{ //For Crafting addOre(InitItems.itemMisc, TheMiscItems.BLACK_DYE.ordinal(), "dyeBlack"); - addOre(InitItems.itemMisc, TheMiscItems.GREEN_DYE.ordinal(), "dyeGreen"); } private static void addOre(ItemStack stack, String name){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 146bdcc44..baf780e48 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -313,7 +313,6 @@ item.actuallyadditions.itemLaserWrench.name=Laser Wrench item.actuallyadditions.itemChestToCrateUpgrade.name=Chest To Storage Crate Upgrade item.actuallyadditions.itemMiscDrillCore.name=Drill Core item.actuallyadditions.itemMiscBlackDye.name=Black Dye -item.actuallyadditions.itemMiscGreenDye.name=Green Dye item.actuallyadditions.itemCrystalRed.name=Restonia Crystal item.actuallyadditions.itemCrystalBlue.name=Palis Crystal item.actuallyadditions.itemCrystalLightBlue.name=Diamatine Crystal