aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-01-22 03:11:48 +0900
committermiozune <miozune@gmail.com>2022-01-22 03:11:48 +0900
commit7c459f274d9b18aac5b99b074e6b58fbe716a6c0 (patch)
treec7fcdca13cc27de3521d7809f6f75cbaffa8a81e /src
parent888f07c5796b860bb7e0fbb507a5728950e941fd (diff)
downloadGT5-Unofficial-7c459f274d9b18aac5b99b074e6b58fbe716a6c0.tar.gz
GT5-Unofficial-7c459f274d9b18aac5b99b074e6b58fbe716a6c0.tar.bz2
GT5-Unofficial-7c459f274d9b18aac5b99b074e6b58fbe716a6c0.zip
Fix Ztones recipe conflict with GTNH
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java3
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..aca0e3b553 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 (Loader.isModLoaded("dreamcraft")) continue;
ItemStack aInput = aInputs[a][i];
ItemStack aOutput = aOutputs[a][i];
if (GT_Values.RA.addCutterRecipe(