diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-09-25 00:25:15 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-09-25 00:25:15 +0100 |
| commit | 3ee18ca5551f4bde620e79082b9854bfbf76ab83 (patch) | |
| tree | 6194316cfdb24885f8c016cda2d01b0ae07d2273 /src/main/java/gregtech/api/items | |
| parent | fed8109b17fd2b41de17ceef92f37e39dc1ffc53 (diff) | |
| download | GT5-Unofficial-3ee18ca5551f4bde620e79082b9854bfbf76ab83.tar.gz GT5-Unofficial-3ee18ca5551f4bde620e79082b9854bfbf76ab83.tar.bz2 GT5-Unofficial-3ee18ca5551f4bde620e79082b9854bfbf76ab83.zip | |
Cleanup, disable auto TE recipes with config and fixes
Diffstat (limited to 'src/main/java/gregtech/api/items')
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java index 0106c55f09..cadbe685fe 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java @@ -50,7 +50,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item { if (tPrefix == null) continue; Materials tMaterial = GregTech_API.sGeneratedMaterials[i % 1000]; if (tMaterial == null) continue; - if (doesMaterialAllowGeneration(tPrefix, tMaterial) || (tMaterial == Materials.Cobalt && tPrefix == OrePrefixes.spring)) { + if (doesMaterialAllowGeneration(tPrefix, tMaterial)) { ItemStack tStack = new ItemStack(this, 1, i); GT_LanguageManager.addStringLocalization(getUnlocalizedName(tStack) + ".name", getDefaultLocalization(tPrefix, tMaterial, i)); GT_LanguageManager.addStringLocalization(getUnlocalizedName(tStack) + ".tooltip", tMaterial.getToolTip(tPrefix.mMaterialAmount / M)); @@ -146,7 +146,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item { OrePrefixes aPrefix = mGeneratedPrefixList[i / 1000]; Materials aMaterial = GregTech_API.sGeneratedMaterials[i % 1000]; if (aPrefix != null && aMaterial != null) { - if ((doesMaterialAllowGeneration(aPrefix, aMaterial) || (aMaterial == Materials.Cobalt && aPrefix == OrePrefixes.spring)) && doesShowInCreative(aPrefix, aMaterial, GregTech_API.sDoShowAllItemsInCreative)) { + if (doesMaterialAllowGeneration(aPrefix, aMaterial) && doesShowInCreative(aPrefix, aMaterial, GregTech_API.sDoShowAllItemsInCreative)) { ItemStack tStack = new ItemStack(this, 1, i); isItemStackUsable(tStack); aList.add(tStack); |