aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-06-29 15:37:32 +0200
committerGitHub <noreply@github.com>2021-06-29 15:37:32 +0200
commit49a44fb0499754580f46815b4ba835316f0826d4 (patch)
tree19090ca34c7d4a6825d1caed950c9653fe6bf718 /src/main/java
parent89346cad46f07a17feb4492bfd92c0b03234d704 (diff)
parentc4ed5b313b76429d9c838e2d6632750311458432 (diff)
downloadGT5-Unofficial-49a44fb0499754580f46815b4ba835316f0826d4.tar.gz
GT5-Unofficial-49a44fb0499754580f46815b4ba835316f0826d4.tar.bz2
GT5-Unofficial-49a44fb0499754580f46815b4ba835316f0826d4.zip
Merge pull request #581 from GTNewHorizons/change-Naquadah-material-type
make arc furnace smelt Naquadah parts into ingot
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/util/GT_OreDictUnificator.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
index 4a5ca9070b..98809bbf45 100644
--- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
+++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
@@ -448,7 +448,6 @@ public class GT_OreDictUnificator {
public static ItemStack getIngotOrDust(MaterialStack aMaterial) {
ItemStack rStack = getIngot(aMaterial);
- if(aMaterial!=null&&aMaterial.mMaterial!=null&&(aMaterial.mMaterial==Materials.Naquadah||aMaterial.mMaterial==Materials.NaquadahEnriched))rStack = getDust(aMaterial);
if (rStack == null) rStack = getDust(aMaterial);
return rStack;
}