diff options
| author | Prometheus0000 <prometheus0000000@gmail.com> | 2021-05-08 17:02:43 -0400 |
|---|---|---|
| committer | Prometheus0000 <prometheus0000000@gmail.com> | 2021-05-08 17:02:43 -0400 |
| commit | a39c2a4f4dc0617f95c84b7761e426af77001248 (patch) | |
| tree | 4a932482f4c9a28cccc57f1e79004d67fec49c35 /src/main/java/gregtech | |
| parent | a2136e6ac97654910cd767b0c60846318a887b0e (diff) | |
| download | GT5-Unofficial-a39c2a4f4dc0617f95c84b7761e426af77001248.tar.gz GT5-Unofficial-a39c2a4f4dc0617f95c84b7761e426af77001248.tar.bz2 GT5-Unofficial-a39c2a4f4dc0617f95c84b7761e426af77001248.zip | |
Fix name of americium
Diffstat (limited to 'src/main/java/gregtech')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java index cfbbeaa528..343f8ec0ed 100644 --- a/src/main/java/gregtech/api/enums/Element.java +++ b/src/main/java/gregtech/api/enums/Element.java @@ -241,7 +241,7 @@ public enum Element { $Np(-93, -144, 0, -1, null, "Anti-Neptunium", false), $Pu(-94, -152, 0, -1, null, "Anti-Plutonium", false), $Pu_241(-94, -149, 0, -1, null, "Anti-Plutonium-241", true), - $Am(-95, -150, 0, -1, null, "Anti-Americum", false), + $Am(-95, -150, 0, -1, null, "Anti-Americium", false), $Cm(-96, -153, 0, -1, null, "Anti-Curium", false), $Bk(-97, -152, 0, -1, null, "Anti-Berkelium", false), $Cf(-98, -153, 0, -1, null, "Anti-Californium", false), diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index f565ba917b..3b061e904c 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -103,7 +103,7 @@ public enum CombType { DOB("d-o-b", true, Materials._NULL, 50,0x007700, 0x002400), THORIUM("thorium", true, Materials.Thorium, 75,0x001E00, 0x005000), LUTETIUM("lutetium", true, Materials.Lutetium, 10,0xE6FFE6, 0xFFFFFF), - AMERICUM("americum", true, Materials.Americium, 5,0xE6E6FF, 0xC8C8C8), + AMERICIUM("americium", true, Materials.Americium, 5,0xE6E6FF, 0xC8C8C8), NEUTRONIUM("neutronium", true, Materials.Neutronium, 2,0xFFF0F0, 0xFAFAFA), //Twilight diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 99b7088d95..e63c440cf7 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -325,7 +325,7 @@ public class ItemComb extends Item { addProcessGT(CombType.NAQUADRIA,new Materials[] {Materials.Naquadria, Materials.NaquadahEnriched, Materials.Naquadah}, Voltage.LUV); addProcessGT(CombType.THORIUM,new Materials[] {Materials.Thorium, Materials.Uranium, Materials.Coal}, Voltage.EV); addProcessGT(CombType.LUTETIUM,new Materials[] {Materials.Lutetium, Materials.Thorium}, Voltage.IV); - addProcessGT(CombType.AMERICUM,new Materials[] {Materials.Americium, Materials.Lutetium}, Voltage.LUV); + addProcessGT(CombType.AMERICIUM,new Materials[] {Materials.Americium, Materials.Lutetium}, Voltage.LUV); addProcessGT(CombType.NEUTRONIUM,new Materials[] {Materials.Neutronium, Materials.Americium}, Voltage.UV); if(!GT_Mod.gregtechproxy.mNerfedCombs) { addCentrifugeToMaterial(CombType.ALMANDINE, new Materials[] {Materials.Almandine, Materials.Pyrope, Materials.Sapphire, Materials.GreenSapphire}, new int[] { 90 * 100, 80 * 100, 75 * 100, 75 * 100}, new int[] {}, Voltage.ULV, NI, 30 * 100); @@ -335,7 +335,7 @@ public class ItemComb extends Item { addCentrifugeToMaterial(CombType.NAQUADRIA,new Materials[] {Materials.Naquadria, Materials.NaquadahEnriched, Materials.Naquadah}, new int[] {10 * 100, 10 * 100, 15 * 100}, new int[] {}, Voltage.LUV, NI, 30 * 100); addCentrifugeToMaterial(CombType.THORIUM,new Materials[] {Materials.Thorium, Materials.Uranium, Materials.Coal}, new int[] {75 * 100, 75 * 100 * 100, 95 * 100}, new int[] {}, Voltage.EV, NI, 30 * 100); addCentrifugeToMaterial(CombType.LUTETIUM,new Materials[] {Materials.Lutetium, Materials.Thorium}, new int[] {35 * 100, 55 * 100}, new int[] {}, Voltage.IV, NI, 30 * 100); - addCentrifugeToMaterial(CombType.AMERICUM,new Materials[] {Materials.Americium, Materials.Lutetium}, new int[] {25 * 100, 45 * 100}, new int[] {}, Voltage.LUV, NI, 30 * 100); + addCentrifugeToMaterial(CombType.AMERICIUM,new Materials[] {Materials.Americium, Materials.Lutetium}, new int[] {25 * 100, 45 * 100}, new int[] {}, Voltage.LUV, NI, 30 * 100); addCentrifugeToMaterial(CombType.NEUTRONIUM,new Materials[] {Materials.Neutronium, Materials.Americium}, new int[] {15 * 100, 35 * 100}, new int[] {}, Voltage.UV, NI, 30 * 100); } diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 60e3b031fe..11099069ec 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -1408,7 +1408,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { ), AMERICIUM(GT_BranchDefinition.RADIOACTIVE, "Americium", false, new Color(0xE6E6FF), new Color(0xC8C8C8), beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.AMERICUM), 0.05f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.AMERICIUM), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); |