diff options
| author | Martin Robertz <dream-master@gmx.net> | 2022-01-22 14:37:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-22 14:37:06 +0100 |
| commit | 4cf893076fb15e1c86810c68be36d683aa7c7e1b (patch) | |
| tree | 6c647a0cf1c084844accc1381947d37273719fcd | |
| parent | 888f07c5796b860bb7e0fbb507a5728950e941fd (diff) | |
| parent | ab1c8d2e3c1fc64b2da3c9dec912b85d54f34b43 (diff) | |
| download | GT5-Unofficial-4cf893076fb15e1c86810c68be36d683aa7c7e1b.tar.gz GT5-Unofficial-4cf893076fb15e1c86810c68be36d683aa7c7e1b.tar.bz2 GT5-Unofficial-4cf893076fb15e1c86810c68be36d683aa7c7e1b.zip | |
Merge pull request #92 from GTNewHorizons/ztones-conflict
Fix Ztones recipe conflict with GTNH
| -rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index cd8d9311c0..5f73088842 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -2796,7 +2796,8 @@ public class RECIPES_Machines { } } for (int a=0;a<5;a++) { - for (int i = 0;i<16;i++) { + for (int i = 0;i<16;i++) { + if (GTNH) continue; ItemStack aInput = aInputs[a][i]; ItemStack aOutput = aOutputs[a][i]; if (GT_Values.RA.addCutterRecipe( |