diff options
| author | Serenibyss <10861407+serenibyss@users.noreply.github.com> | 2023-07-12 06:31:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-12 13:31:26 +0200 |
| commit | 76566c04a14f7e57e843cd9d3d976b1dd680385b (patch) | |
| tree | 2cbfac01d6f481dd654c8155f7eb921c145a091a /src/main/java/gtPlusPlus/core/recipe | |
| parent | 395eec3625db2819f61953aaa268106cb3c4045a (diff) | |
| download | GT5-Unofficial-76566c04a14f7e57e843cd9d3d976b1dd680385b.tar.gz GT5-Unofficial-76566c04a14f7e57e843cd9d3d976b1dd680385b.tar.bz2 GT5-Unofficial-76566c04a14f7e57e843cd9d3d976b1dd680385b.zip | |
Fix some recipe conflicts (#688)
* Rope conflict
* Ethylbenzene conflict
* Rock Salt, Potash conflicts
* spotless apply
Diffstat (limited to 'src/main/java/gtPlusPlus/core/recipe')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 2 |
1 files changed, 1 insertions, 1 deletions
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, |