aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/Element.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api/enums/Element.java')
-rw-r--r--src/main/java/gregtech/api/enums/Element.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java
index ed64c02792..cbe59c8851 100644
--- a/src/main/java/gregtech/api/enums/Element.java
+++ b/src/main/java/gregtech/api/enums/Element.java
@@ -126,12 +126,12 @@ public enum Element {
Ds(110, 171, 0, -1, null, "Darmstadtium", false),
Rg(111, 169, 0, -1, null, "Roentgenium", false),
Cn(112, 173, 0, -1, null, "Copernicium", false),
- Uut(113, 171, 0, -1, null, "Ununtrium", false),
+ Nh(113, 171, 0, -1, null, "Nihonium", false),
Fl(114, 175, 0, -1, null, "Flerovium", false),
- Uup(115, 173, 0, -1, null, "Ununpentium", false),
+ Mc(115, 173, 0, -1, null, "Moscovium", false),
Lv(116, 177, 0, -1, null, "Livermorium", false),
- Fa(117, 177, 0, -1, null, "Farnsium", false), // Uus, Ununseptium
- Uuo(118, 176, 0, -1, null, "Ununoctium", false),
+ Ts(117, 177, 0, -1, null, "Teness", false),
+ Og(118, 176, 0, -1, null, "Oganesson", false),
Tn(125, 198, 0, -1, null, "Tritanium", false),
Ma(0, 0, 100, -1, null, "Magic", false),
@@ -254,12 +254,12 @@ public enum Element {
$Ds(-110, -171, 0, -1, null, "Anti-Darmstadtium", false),
$Rg(-111, -169, 0, -1, null, "Anti-Roentgenium", false),
$Cn(-112, -173, 0, -1, null, "Anti-Copernicium", false),
- $Uut(-113, -171, 0, -1, null, "Anti-Ununtrium", false),
+ $Nh(-113, -171, 0, -1, null, "Anti-Nihonium", false),
$Fl(-114, -175, 0, -1, null, "Anti-Flerovium", false),
- $Uup(-115, -173, 0, -1, null, "Anti-Ununpentium", false),
+ $Mc(-115, -173, 0, -1, null, "Anti-Moscovium", false),
$Lv(-116, -177, 0, -1, null, "Anti-Livermorium", false),
- $Uus(-117, -177, 0, -1, null, "Anti-Ununseptium", false),
- $Uuo(-118, -176, 0, -1, null, "Anti-Ununoctium", false),
+ $Ts(-117, -177, 0, -1, null, "Anti-Tenness", false),
+ $Og(-118, -176, 0, -1, null, "Anti-Oganesson", false),
$Tn(-125, -198, 0, -1, null, "Anti-Tritanium", false),
$Ma(0, 0, -100, -1, null, "Anti-Magic", false),
@@ -309,4 +309,4 @@ public enum Element {
public long getMass() {
return mProtons + mNeutrons + mAdditionalMass;
}
-} \ No newline at end of file
+}