aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorLOKKO12 <33183715+LOKKO12@users.noreply.github.com>2018-01-14 18:47:56 +0100
committerGitHub <noreply@github.com>2018-01-14 18:47:56 +0100
commit27d93b8696b227fd36f53cf36deb8120b86a0723 (patch)
tree7b57b626bdbc113b5273b8abb12c7a3d622a7421 /src/main/java
parentfa68b654b62e39deeff3e5cddd9fe7829324f0f3 (diff)
downloadGT5-Unofficial-27d93b8696b227fd36f53cf36deb8120b86a0723.tar.gz
GT5-Unofficial-27d93b8696b227fd36f53cf36deb8120b86a0723.tar.bz2
GT5-Unofficial-27d93b8696b227fd36f53cf36deb8120b86a0723.zip
Added Desh as Titanium and Oriharukon as Isotopes
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/enums/Element.java6
1 files changed, 6 insertions, 0 deletions
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);