From 76566c04a14f7e57e843cd9d3d976b1dd680385b Mon Sep 17 00:00:00 2001 From: Serenibyss <10861407+serenibyss@users.noreply.github.com> Date: Wed, 12 Jul 2023 06:31:26 -0500 Subject: Fix some recipe conflicts (#688) * Rope conflict * Ethylbenzene conflict * Rock Salt, Potash conflicts * spotless apply --- src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gtPlusPlus/core/recipe') diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index a887a18145..92d1301a1d 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1137,7 +1137,7 @@ public class RECIPES_GREGTECH { */ CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemRope, 6) }, + new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemRope, 6), ItemUtils.getGregtechCircuit(6) }, null, ItemUtils.getSimpleStack(ModBlocks.blockNet, 2), 1 * 20, -- cgit