diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-06-21 21:36:03 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-06-21 21:36:03 +0200 |
| commit | e29201f753ba631b235d1351e4f2bd5264d5264c (patch) | |
| tree | 1928b00e4faf305027bf807e8e9ab7ccc583614f /src/main/java/gregtech/common/items | |
| parent | a88d9c4e72adc5b5063398af39c5c80817623cb5 (diff) | |
| download | GT5-Unofficial-e29201f753ba631b235d1351e4f2bd5264d5264c.tar.gz GT5-Unofficial-e29201f753ba631b235d1351e4f2bd5264d5264c.tar.bz2 GT5-Unofficial-e29201f753ba631b235d1351e4f2bd5264d5264c.zip | |
new files from gt pull requests
Diffstat (limited to 'src/main/java/gregtech/common/items')
| -rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index f2abbfc4b4..11bf1d8cdb 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -830,7 +830,7 @@ public class GT_MetaGenerated_Item_01 } public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { - return (aDoShowAllItems) || (((aPrefix != OrePrefixes.gem) || (!aMaterial.name().startsWith("Infused"))) && (aPrefix != OrePrefixes.nugget) && (aPrefix != OrePrefixes.dustTiny) && (aPrefix != OrePrefixes.dustSmall) && (aPrefix != OrePrefixes.dustImpure) && (aPrefix != OrePrefixes.dustPure) && (aPrefix != OrePrefixes.crushed) && (aPrefix != OrePrefixes.crushedPurified) && (aPrefix != OrePrefixes.crushedCentrifuged) && (aPrefix != OrePrefixes.ingotHot) && isPlasmaCellUsed(aPrefix, aMaterial)); + return (aDoShowAllItems) || (((aPrefix != OrePrefixes.gem) || (!aMaterial.name().startsWith("Infused"))) && (aPrefix != OrePrefixes.nugget) && (aPrefix != OrePrefixes.dustTiny) && (aPrefix != OrePrefixes.dustSmall) && (aPrefix != OrePrefixes.dustImpure) && (aPrefix != OrePrefixes.dustPure) && (aPrefix != OrePrefixes.crushed) && (aPrefix != OrePrefixes.crushedPurified) && (aPrefix != OrePrefixes.crushedCentrifuged) && (aPrefix != OrePrefixes.ingotHot) && !(aPrefix == OrePrefixes.cellPlasma && !isPlasmaCellUsed(aPrefix, aMaterial))); } public ItemStack getContainerItem(ItemStack aStack) { |