1 files changed, 31 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 6c6a2b06e5..57d7086f2f 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
 
 public enum CombType {
-    //Organic
+    //Organic Line
     LIGNIE("lignite", true, Materials.Lignite, 100),
     COAL("coal", true, Materials.Coal, 100),
     STICKY("stickyresin", true, Materials._NULL, 50),
@@ -27,6 +27,20 @@ public enum CombType {
     STAINLESSSTEL("steainlesssteel", true, Materials.StainlessSteel, 75),
     ENDERIUM("enderium", true, Materials.Enderium, 40),
 
+    //Thaumcraft Line
+    THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100),
+    THAUMIUMSHARD("tahumiumshard", true, Materials._NULL, 85),
+    AMBER("amber", true, Materials.Amber, 90),
+    QUICKSILVER("quicksilver", true, Materials.Mercury, 90),
+    SALISMUNDUS("salismundus", true, Materials._NULL, 75),
+    TAINTED("tainted", true, Materials._NULL, 80),
+    MITHRIL("mithril", true, Materials.Mithril, 70),
+    ASTRALSILVER("astralsilver", true, Materials.AstralSilver, 70),
+    THAUMINITE("thauminte", true, Materials._NULL, 50),
+    SCHADOWMETAL("shadowmetal", true, Materials.Shadow, 50),
+    DIVIDED("devided", true, Materials.Unstable, 40),
+    SPARKELING("sparkeling", true, Materials.NetherStar, 40),
+
     //Gem Line
     STONE("stone", true, Materials._NULL, 70),
     CERTUS("certus", true, Materials.CertusQuartz, 100),
@@ -38,7 +52,7 @@ public enum CombType {
     OLIVINE("olivine", true, Materials.Olivine, 100),
     EMERALD("emerald", true, Materials.Emerald, 100),
 
-    // Metals Line
+    //Metals Line
     SLAG("slag", true, Materials._NULL, 50),
     COPPER("coppon", true, Materials.Copper, 100),
     TIN("tine", true, Materials.Tin, 100),
@@ -50,7 +64,7 @@ public enum CombType {
     SILVER("argentia", true, Materials.Silver, 100),
     GOLD("aurelia", true, Materials.Gold, 100),
 
-    // Rare Metals Line    
+    //Rare Metals Line
     ALUMINIUM("bauxia", true, Materials.Aluminium, 60),
     MANGANESE("pyrolusium", true, Materials.Manganese, 30),
     TITANIUM("titanium", true, Materials.Ilmenite, 100),
@@ -59,7 +73,7 @@ public enum CombType {
     PLATINUM("platina", true, Materials.Platinum, 40),
     IRIDIUM("quantaria", true, Materials.Iridium, 20),
 
-    // Radioactive Line
+    //Radioactive Line
     URANIUM("urania", true, Materials.Uranium, 50),
     PLUTONIUM("plutonium", true, Materials.Plutonium, 10),
     NAQUADAH("stargatium", true, Materials.Naquadah, 10);
@@ -85,6 +99,19 @@ public enum CombType {
             {0x6DD284, 0x006600},
             {0x778899, 0xC8C8DC},
             {0x2E8B57, 0x599087},
+            //Thaumcraft
+            {0x7A007A, 0x5C005C},
+            {0x9966FF, 0xAD85FF},
+            {0xE60000, 0x774B15},
+            {0x7A007A, 0x5C005C},
+            {0xF7ADDE, 0x592582},
+            {0x904BB8, 0xE800FF},
+            {0xF0E68C, 0xFFFFD2},
+            {0xAFEEEE, 0xE6E6FF},
+            {0x2E2D79, 0x7581E0},
+            {0x2E2D79, 0x7581E0},
+            {0xF0F0F0, 0xDCDCDC},
+            {0x7A007A, 0xFFFFFF},
             //gems
             {0x808080, 0x999999},
             {0x57CFFB, 0xBBEEFF},