aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/util
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-19 17:51:55 +0000
committerGitHub <noreply@github.com>2021-12-19 17:51:55 +0000
commit8260839312546c53d1ab94f2ee4e87ae4e5f0b9f (patch)
treee668043316debaeb58b46f1d364fac73e9254501 /src/main/java/gtPlusPlus/core/util
parent615dd5ae99d6703efef551fd34e2092b1b8a4496 (diff)
parent62676f57093ed476b9c378615560749c6e0136e3 (diff)
downloadGT5-Unofficial-8260839312546c53d1ab94f2ee4e87ae4e5f0b9f.tar.gz
GT5-Unofficial-8260839312546c53d1ab94f2ee4e87ae4e5f0b9f.tar.bz2
GT5-Unofficial-8260839312546c53d1ab94f2ee4e87ae4e5f0b9f.zip
Merge branch 'master' into New-Multis
Diffstat (limited to 'src/main/java/gtPlusPlus/core/util')
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index e96bd3391b..fa685aa93c 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1314,9 +1314,6 @@ public class ItemUtils {
}
public static boolean isCatalyst(ItemStack aStack) {
- if (GT_Utility.areStacksEqual(aStack, RocketFuels.Formaldehyde_Catalyst_Stack, true)) {
- return true;
- }
if (GT_Utility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) {
return true;
}
@@ -1338,6 +1335,9 @@ public class ItemUtils {
if (GT_Utility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) {
return true;
}
+ if (GT_Utility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) {
+ return true;
+ }
if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) {
return true;
}