diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-29 14:12:35 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-29 14:12:35 +1000 |
| commit | 29183be2ec89ee54d748ac6ca64ed67f89f50f90 (patch) | |
| tree | 5329e51436cff7a2b4b3af507d88eb971583cfa0 /src/Java/gtPlusPlus/core/material | |
| parent | d1963f3f97fb6478fdfb0a5c64dd7c5a2d156c93 (diff) | |
| download | GT5-Unofficial-29183be2ec89ee54d748ac6ca64ed67f89f50f90.tar.gz GT5-Unofficial-29183be2ec89ee54d748ac6ca64ed67f89f50f90.tar.bz2 GT5-Unofficial-29183be2ec89ee54d748ac6ca64ed67f89f50f90.zip | |
+ Add Gadolinium, Samarium, Ytterbium & Lanthanum if they do not exist.
+ Added new recipe for production of Fluorite.
% Some Alloys now use Phosphor instead of Phosphorus.
% Changed Ore Block unlocalized name.
$ Fixed ore itemblock not showing Chemical Formula.
$ Greatly improved radiation handler.
$ Fixed old fluorite ore not generating properly.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ELEMENT.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index eccd283da9..f98eb3552e 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -43,7 +43,7 @@ public final class ELEMENT { public final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium); public final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium); public final Material SILICON = MaterialUtils.generateMaterialFromGtENUM(Materials.Silicon); - public final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphorus); + public final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphor); public final Material SULFUR = MaterialUtils.generateMaterialFromGtENUM(Materials.Sulfur); public final Material CHLORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Chlorine); public final Material ARGON = MaterialUtils.generateMaterialFromGtENUM(Materials.Argon); diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 62fd0ebb80..3884920c96 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -481,7 +481,7 @@ public class Material { */ public final ItemStack getOre(final int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+this.unlocalizedName+"Ore", stacksize); + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ore"+Utils.sanitizeString(this.getUnlocalizedName()), stacksize); } public final ItemStack getCrushed(final int stacksize){ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("crushed"+this.unlocalizedName, stacksize); |