diff options
| author | Florexiz <florexiz.nm@gmail.com> | 2021-11-08 21:38:44 +0300 |
|---|---|---|
| committer | Florexiz <florexiz.nm@gmail.com> | 2021-11-08 21:38:44 +0300 |
| commit | 80024f8a5a65668573014c2da0b56d17e9ab477f (patch) | |
| tree | 8e21a2b511eccde56b9397a6f65ec823526e5243 /src/Java/gtPlusPlus/core | |
| parent | 6e7ce3372c1b98dc5e7e6d1dfcdb3624e9e0aa53 (diff) | |
| parent | 19b518ff60ad7dd7e3bbe703675ebd3afc8378d9 (diff) | |
| download | GT5-Unofficial-80024f8a5a65668573014c2da0b56d17e9ab477f.tar.gz GT5-Unofficial-80024f8a5a65668573014c2da0b56d17e9ab477f.tar.bz2 GT5-Unofficial-80024f8a5a65668573014c2da0b56d17e9ab477f.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java | 1 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ELEMENT.java | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java index 05af9eaa58..ca7041617d 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java @@ -41,6 +41,7 @@ public class BaseItemColourable extends Item this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); + this.setHasSubtypes(true); this.rarity = regRarity; this.itemDescription = description; this.descColour = colour; diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index ba2579aa97..3af8b560ad 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -27,7 +27,9 @@ public final class ELEMENT { public final Material SODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium); public final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium); public final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium); + public final Material ALUMINIUMOXIDE = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminiumoxide); public final Material SILICON = MaterialUtils.generateMaterialFromGtENUM(Materials.Silicon); + public final Material SILICONDIOXIDE = MaterialUtils.generateMaterialFromGtENUM(Materials.SiliconDioxide); public final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphor); public final Material SULFUR = MaterialUtils.generateMaterialFromGtENUM(Materials.Sulfur); public final Material CHLORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Chlorine); @@ -236,8 +238,8 @@ public final class ELEMENT { new MaterialStack[]{ new MaterialStack(getInstance().OXYGEN, 30), new MaterialStack(getInstance().IRON, 20), - new MaterialStack(getInstance().SILICON, 20), - new MaterialStack(getInstance().ALUMINIUM, 10), + new MaterialStack(getInstance().SILICONDIOXIDE, 20), + new MaterialStack(getInstance().ALUMINIUMOXIDE, 10), new MaterialStack(getInstance().POTASSIUM, 10), new MaterialStack(getInstance().CALCIUM, 5), new MaterialStack(getInstance().SODIUM, 5) |