Merge branch 'mergeGTNH' into experimental

1 files changed, 9 insertions, 5 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
index f3347772ce..2f54c9c415 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
@@ -14,18 +14,23 @@ public class GT_Block_Metal extends GT_Block_Storage {
     public Materials[] mMats;
     public OrePrefixes mPrefix;
     public IIconContainer[] mBlockIcons;
+    public boolean mHideBlocks;
 
     public GT_Block_Metal(String aName, Materials[] aMats, OrePrefixes aPrefix, IIconContainer[] aBlockIcons) {
         super(GT_Item_Storage.class, aName, Material.iron);
         mMats = aMats;
         mPrefix = aPrefix;
         mBlockIcons = aBlockIcons;
+        mHideBlocks = Loader.isModLoaded("NotEnoughItems");
+
         for (int i = 0; i < aMats.length; i++) {
-            GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + i + ".name", "Block of " + aMats[i].mDefaultLocalName);
-            GT_OreDictUnificator.registerOre(aPrefix, aMats[i], new ItemStack(this, 1, i));
+            if (aMats[i].mMetaItemSubID > 0 && aMats[i].mHasParentMod) {
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + i + ".name", "Block of " + aMats[i].mDefaultLocalName);
+                GT_OreDictUnificator.registerOre(aPrefix, aMats[i], new ItemStack(this, 1, i));
+            }
         }
-        if(aMats.length<16 && Loader.isModLoaded("NotEnoughItems")){
-        	for( int i = aMats.length;i<16;i++)codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i));                
+        if (aMats.length<16 && Loader.isModLoaded("NotEnoughItems")) {
+            for (int i = aMats.length; i < 16; i++) codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i));
         }
     }
 
@@ -35,5 +40,4 @@ public class GT_Block_Metal extends GT_Block_Storage {
         }
         return null;
     }
-
 }