aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-09-20 12:58:36 +0200
committerDream-Master <dream-master@gmx.net>2018-09-20 12:58:36 +0200
commitb1d52ea380463edb32eef0685a9f5607e24ef6ea (patch)
treeac2b64f3ee930e8961ac644371dbb618265bd2af
parent01f0c548282e28a8b73ae7cecb744bc5f55fad03 (diff)
downloadGT5-Unofficial-b1d52ea380463edb32eef0685a9f5607e24ef6ea.tar.gz
GT5-Unofficial-b1d52ea380463edb32eef0685a9f5607e24ef6ea.tar.bz2
GT5-Unofficial-b1d52ea380463edb32eef0685a9f5607e24ef6ea.zip
fix some spellibng errors and color derps from combs
-rw-r--r--src/main/java/gregtech/common/items/CombType.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 3e4a33e21d..3c85bd8040 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -56,19 +56,19 @@ public enum CombType {
OLIVINE("olivine", true, Materials.Olivine, 100),
EMERALD("emerald", true, Materials.Emerald, 100),
PYROPE("pyrope", true, Materials.Pyrope, 100),
- GROSSULAR("grassular", true, Materials.Grossular, 100),
+ GROSSULAR("grossular", true, Materials.Grossular, 100),
FIRESTONE("firestone", true, Materials.Firestone, 100),
//Metals Line
SLAG("slag", true, Materials._NULL, 50),
COPPER("coppon", true, Materials.Copper, 100),
- TIN("tine", true, Materials.Tin, 100),
+ TIN("tin", true, Materials.Tin, 100),
LEAD("lead", true, Materials.Lead, 100),
IRON("iron", true, Materials.Iron, 100),
STEEL("steel", true, Materials.Steel, 95),
NICKEL("nickel", true, Materials.Nickel, 100),
ZINC("zinc", true, Materials.Zinc, 100),
- SILVER("argentia", true, Materials.Silver, 100),
+ SILVER("silver", true, Materials.Silver, 100),
GOLD("gold", true, Materials.Gold, 100),
SULFUR("sulfur", true, Materials.Sulfur, 100),
GALLIUM ("gallium", true, Materials.Gallium, 75),
@@ -127,10 +127,10 @@ public enum CombType {
//gems
{0x808080, 0x999999},
{0x57CFFB, 0xBBEEFF},
- {0x7D0F0F, 0xD11919},
{0xA375FF, 0xB591FF},
- {0x1947D1, 0x476CDA},
+ {0x7D0F0F, 0xD11919},
{0x555643, 0x343428},
+ {0x1947D1, 0x476CDA},
{0xE6005C, 0xCC0052},
{0xBD4C4C, 0xECCECE},
{0xA3A341, 0xEDEDCE},