aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/common
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2015-05-19 18:22:18 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2015-05-19 18:22:18 +0200
commit20313127ce97c9fe336ac0fa91ab70fc6eee62eb (patch)
treea95144d19b88351692f65f82e393eb9bf54057fe /main/java/gregtech/common
parent83f8f232e7d542b1c1cf21b55beb630c2d916225 (diff)
parentb3b1c10bfc2a0282ddfb68cca16fc18fc871fddb (diff)
downloadGT5-Unofficial-20313127ce97c9fe336ac0fa91ab70fc6eee62eb.tar.gz
GT5-Unofficial-20313127ce97c9fe336ac0fa91ab70fc6eee62eb.tar.bz2
GT5-Unofficial-20313127ce97c9fe336ac0fa91ab70fc6eee62eb.zip
Merge pull request #23 from doushio9967/fix-registerore
Fix JD's broken code
Diffstat (limited to 'main/java/gregtech/common')
-rw-r--r--main/java/gregtech/common/GT_Proxy.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/java/gregtech/common/GT_Proxy.java b/main/java/gregtech/common/GT_Proxy.java
index 881797c060..feddd5be46 100644
--- a/main/java/gregtech/common/GT_Proxy.java
+++ b/main/java/gregtech/common/GT_Proxy.java
@@ -1329,7 +1329,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
default:
break;
}
- if ((!aPrefix.mIsUnificatable) || (aMaterial.mUnificatable)) {return;
+ if (aPrefix.mIsUnificatable && !aMaterial.mUnificatable) {
+ return;
}
} else {
for (Dyes tDye : Dyes.VALUES) {