diff options
| author | Martin Robertz <dream-master@gmx.net> | 2018-01-14 20:44:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-14 20:44:57 +0100 |
| commit | 816d6919d7f5d8557348598f301ec34ead5c9dda (patch) | |
| tree | 40288c18c677ec6c973c01d591aadc048040c4b8 /src/main/java/gregtech/api/enums/Element.java | |
| parent | ab3cdb7d8934292b96c8e700dc450bbce8d4d6bc (diff) | |
| parent | 339e25961312b6be3de3d924a6043fe882e3c6ac (diff) | |
| download | GT5-Unofficial-816d6919d7f5d8557348598f301ec34ead5c9dda.tar.gz GT5-Unofficial-816d6919d7f5d8557348598f301ec34ead5c9dda.tar.bz2 GT5-Unofficial-816d6919d7f5d8557348598f301ec34ead5c9dda.zip | |
Merge pull request #92 from LOKKO12/experimental
Added UUM support for Oriharukon, Desh and Meteoric Iron
Diffstat (limited to 'src/main/java/gregtech/api/enums/Element.java')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Element.java | 8 |
1 files changed, 8 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..1421a6a3ad 100644 --- a/src/main/java/gregtech/api/enums/Element.java +++ b/src/main/java/gregtech/api/enums/Element.java @@ -134,6 +134,10 @@ 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), + Ma(0, 0, 100, -1, null, "Magic", false), Nt(0, 100000, 0, -1, null, "Neutronium", false), @@ -261,6 +265,10 @@ 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), + + $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), $Ma(0, 0, -100, -1, null, "Anti-Magic", false), $Nt(0, -10000, 0, -1, null, "Anti-Neutronium", false); |