From 27d93b8696b227fd36f53cf36deb8120b86a0723 Mon Sep 17 00:00:00 2001
From: LOKKO12 <33183715+LOKKO12@users.noreply.github.com>
Date: Sun, 14 Jan 2018 18:47:56 +0100
Subject: Added Desh as Titanium and Oriharukon as Isotopes

---
 src/main/java/gregtech/api/enums/Element.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/main/java/gregtech/api/enums/Element.java')

diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java
index cbe59c8851..33f1f4ef86 100644
--- a/src/main/java/gregtech/api/enums/Element.java
+++ b/src/main/java/gregtech/api/enums/Element.java
@@ -134,6 +134,9 @@ public enum Element {
     Og(118, 176, 0, -1, null, "Oganesson", false),
     Tn(125, 198, 0, -1, null, "Tritanium", false),
 
+    De(22, 27, 0, -1, null, "Desh", true), 
+    Oh(76, 125, 0, -1, null, "Oriharukon", true),
+       
     Ma(0, 0, 100, -1, null, "Magic", false),
     Nt(0, 100000, 0, -1, null, "Neutronium", false),
 
@@ -261,6 +264,9 @@ public enum Element {
     $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),
+    
+    $De(-22, -27, 0, -1, null, "Anti-Desh", true), 
+    $Oh(-76, -125, 0, -1, null, "Anti-Oriharukon", true),
 
     $Ma(0, 0, -100, -1, null, "Anti-Magic", false),
     $Nt(0, -10000, 0, -1, null, "Anti-Neutronium", false);
-- 
cgit 


From 675fe5aca0aacac87aa05968cdc22afaa3c96519 Mon Sep 17 00:00:00 2001
From: LOKKO12 <33183715+LOKKO12@users.noreply.github.com>
Date: Sun, 14 Jan 2018 20:22:23 +0100
Subject: set desh an oriharukon as elements not as isotopes

---
 src/main/java/gregtech/api/enums/Element.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api/enums/Element.java')

diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java
index 33f1f4ef86..08bcbff51d 100644
--- a/src/main/java/gregtech/api/enums/Element.java
+++ b/src/main/java/gregtech/api/enums/Element.java
@@ -134,8 +134,8 @@ public enum Element {
     Og(118, 176, 0, -1, null, "Oganesson", false),
     Tn(125, 198, 0, -1, null, "Tritanium", false),
 
-    De(22, 27, 0, -1, null, "Desh", true), 
-    Oh(76, 125, 0, -1, null, "Oriharukon", true),
+    De(22, 27, 0, -1, null, "Desh", false), 
+    Oh(76, 125, 0, -1, null, "Oriharukon", false),
        
     Ma(0, 0, 100, -1, null, "Magic", false),
     Nt(0, 100000, 0, -1, null, "Neutronium", false),
-- 
cgit 


From 339e25961312b6be3de3d924a6043fe882e3c6ac Mon Sep 17 00:00:00 2001
From: LOKKO12 <33183715+LOKKO12@users.noreply.github.com>
Date: Sun, 14 Jan 2018 20:42:07 +0100
Subject: Update Element.java

---
 src/main/java/gregtech/api/enums/Element.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/gregtech/api/enums/Element.java')

diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java
index 08bcbff51d..1421a6a3ad 100644
--- a/src/main/java/gregtech/api/enums/Element.java
+++ b/src/main/java/gregtech/api/enums/Element.java
@@ -134,6 +134,7 @@ public enum Element {
     Og(118, 176, 0, -1, null, "Oganesson", false),
     Tn(125, 198, 0, -1, null, "Tritanium", false),
 
+    SpFe(26, 42, 0, -1, null, "Meteoric Iron", false),
     De(22, 27, 0, -1, null, "Desh", false), 
     Oh(76, 125, 0, -1, null, "Oriharukon", false),
        
@@ -265,6 +266,7 @@ public enum Element {
     $Og(-118, -176, 0, -1, null, "Anti-Oganesson", false),
     $Tn(-125, -198, 0, -1, null, "Anti-Tritanium", false),
     
+    $SpFe(-26, -42, 0, -1, null, "Anti-Meteoric Iron", true),
     $De(-22, -27, 0, -1, null, "Anti-Desh", true), 
     $Oh(-76, -125, 0, -1, null, "Anti-Oriharukon", true),
 
-- 
cgit