438d5f39d32c34e9d5eff03ee2ae912833944578 [438d5f3]

1 files changed, 14 insertions, 12 deletions

diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 8d256b72ab..ca5f9a981e 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -139,7 +139,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 	TarPitch			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Tar Pitch"						,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
 	Serpentine			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2  |8                               , 255, 255, 255,   0,	"Serpentine"					,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
 	Flux				(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1                                     , 255, 255, 255,   0,	"Flux"							,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
-    RedstoneAlloy       ( 381, TextureSet.SET_METALLIC          ,   3.0F,    128,  2, 1|2         |64|128                   , 181,  51,  51,   0,   "Redstone Alloy"                ,    0,       0,        500, 1000, true , false,   1,   1,   1, Dyes.dyeRed         ),
+	RedstoneAlloy       ( 381, TextureSet.SET_METALLIC          ,   3.0F,    128,  2, 1|2         |64|128                   , 181,  51,  51,   0,   "Redstone Alloy"                ,    0,       0,        500, 1000,  true, false,   1,   1,   1, Dyes.dyeRed         ),
 	OsmiumTetroxide		(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1                                     , 255, 255, 255,   0,	"Osmium Tetroxide"				,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
 	NitricAcid			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 0                                     , 255, 255, 255,   0,	"Nitric Acid"					,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
 	RubberTreeSap		(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 0                                     , 255, 255, 255,   0,	"Rubber Tree Sap"				,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
@@ -154,13 +154,13 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 	Endium              ( 770, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|2  |8                               , 165, 220, 250,   0,    "Endium"                       ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeYellow      ),
 	Prismarine			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1  |4                                 , 255, 255, 255,   0,	"Prismarine"					,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
 	GraveyardDirt		(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1                                     , 255, 255, 255,   0,	"Graveyard Dirt"				,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
-    DarkSteel           ( 364, TextureSet.SET_METALLIC          ,   8.0F,    512,  3, 1|2         |64|128                   ,  80,  70,  80,   0,    "Dark Steel"                   ,    0,       0,       1811, 1500,  true, false,   3,   1,   1, Dyes.dyePurple      ),
+    DarkSteel           ( 364, TextureSet.SET_METALLIC          ,   8.0F,    512,  3, 1|2         |64|128                   ,  80,  70,  80,   0,    "Dark Steel"                   ,    0,       0,         -1, 1800,  true, false,   3,   1,   1, Dyes.dyePurple      ),
     Terrasteel          (  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,    "Terrasteel"                   ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          ),
-    ConductiveIron      ( 369, TextureSet.SET_METALLIC          ,   6.0F,    256,  3, 1|2         |64|128                   , 217, 178, 171,   0,    "Conductive Iron"              ,    0,       0,       1811, 1200,  true, false,   4,   1,   1, Dyes.dyeRed         ),
+    ConductiveIron      ( 369, TextureSet.SET_METALLIC          ,   6.0F,    256,  3, 1|2         |64|128                   , 217, 178, 171,   0,    "Conductive Iron"              ,    0,       0,         -1, 1200,  true, false,   4,   1,   1, Dyes.dyeRed         ),
     ElectricalSteel     ( 365, TextureSet.SET_METALLIC          ,   6.0F,    512,  2, 1|2         |64|128                   , 185, 185, 185,   0,    "Electrical Steel"             ,    0,       0,       1811, 1000,  true, false,   4,   1,   1, Dyes.dyeGray        ),
-    EnergeticAlloy      ( 366, TextureSet.SET_METALLIC          ,  12.0F,   1024,  3, 1|2         |64|128                   , 255, 170,  81,   0,    "Energetic Alloy"              ,    0,       0,       1800, 1500,  true, false,   3,   1,   1, Dyes.dyeOrange      ),
+    EnergeticAlloy      ( 366, TextureSet.SET_METALLIC          ,  12.0F,   1024,  3, 1|2         |64|128                   , 255, 170,  81,   0,    "Energetic Alloy"              ,    0,       0,         -1, 2200,  true, false,   3,   1,   1, Dyes.dyeOrange      ),
     VibrantAlloy        ( 367, TextureSet.SET_METALLIC          ,  18.0F,   4048,  4, 1|2         |64|128                   , 157, 188,  53,   0,    "Vibrant Alloy"                ,    0,       0,       3300, 3000,  true, false,   4,   1,   1, Dyes.dyeLime        ),
-    PulsatingIron       ( 378, TextureSet.SET_METALLIC          ,   6.0F,    256,  3, 1|2         |64|128                   , 128, 246, 155,   0,    "Pulsating Iron"               ,    0,       0,       1811, 1600,  true, false,   4,   1,   1, Dyes.dyeLime        ),
+    PulsatingIron       ( 378, TextureSet.SET_METALLIC          ,   6.0F,    256,  3, 1|2         |64|128                   , 128, 246, 155,   0,    "Pulsating Iron"               ,    0,       0,         -1, 1800,  true, false,   4,   1,   1, Dyes.dyeLime        ),
 	Teslatite			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1                                     ,  60, 180, 200,   0,	"Teslatite"						,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
 	Fluix				(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1  |4                                 , 255, 255, 255,   0,	"Fluix"							,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
 	Manasteel			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Manasteel"						,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL			),
@@ -396,22 +396,22 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 	Quantum				(  -1, TextureSet.SET_NONE				,   1.0F,      0,  0, 0                                     , 255, 255, 255,   0,	"Quantum"						,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeWhite		),
 	RareEarth			( 891, TextureSet.SET_FINE				,   1.0F,      0,  0, 1                                     , 128, 128, 100,   0,	"Rare Earth"					,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray		, Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.LUCRUM, 1))),
 	Red					(  -1, TextureSet.SET_NONE				,   1.0F,      0,  0, 0                                     , 255,   0,   0,   0,	"Red"							,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed			),
-	Reinforced			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  0, 0                                     , 255, 255, 255,   0,	"Reinforced"					,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeGray		),
+    Reinforced          ( 383, TextureSet.SET_METALLIC          ,   7.0F,    480,  2, 1|2          |64|128                  , 105, 141, 165,   0,   "Reinforced"                    ,    0,       0,         -1, 1700,  true, false,   1,   1,   1, Dyes.dyeBlue        ),
 	SeedOil				( 713, TextureSet.SET_FLUID				,   1.0F,      0,  0,         16                            , 196, 255,   0,   0,	"Seed Oil"						,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime		, Arrays.asList(new TC_AspectStack(TC_Aspects.GRANUM, 2))),
 	SeedOilHemp			( 722, TextureSet.SET_FLUID				,   1.0F,      0,  0,         16                            , 196, 255,   0,   0,	"Hemp Seed Oil"					,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime		, Arrays.asList(new TC_AspectStack(TC_Aspects.GRANUM, 2))),
 	SeedOilLin			( 723, TextureSet.SET_FLUID				,   1.0F,      0,  0,         16                            , 196, 255,   0,   0,	"Lin Seed Oil"					,    3,       2,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLime		, Arrays.asList(new TC_AspectStack(TC_Aspects.GRANUM, 2))),
 	Stone				( 299, TextureSet.SET_ROUGH				,   4.0F,     32,  1, 1            |64|128                  , 205, 205, 205,   0,	"Stone"							,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightGray	, Arrays.asList(new TC_AspectStack(TC_Aspects.TERRA, 1))),
 	TNT					(  -1, TextureSet.SET_NONE				,   1.0F,      0,  0, 0                                     , 255, 255, 255,   0,	"TNT"							,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeRed			, Arrays.asList(new TC_AspectStack(TC_Aspects.PERDITIO, 7), new TC_AspectStack(TC_Aspects.IGNIS, 4))),
-	Unstable			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  4, 0                                     , 255, 255, 255, 127,	"Unstable"						,    0,       0,         -1,    0, false, true,   1,   1,   1, Dyes.dyeWhite		, Arrays.asList(new TC_AspectStack(TC_Aspects.PERDITIO, 4))),
-	Unstableingot		(  -1, TextureSet.SET_NONE				,   1.0F,      0,  4, 0                                     , 255, 255, 255, 127,	"Unstable"						,    0,       0,         -1,    0, false, true,   1,   1,   1, Dyes.dyeWhite		, Arrays.asList(new TC_AspectStack(TC_Aspects.PERDITIO, 4))),
+	Unstable			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  4, 0                                     , 255, 255, 255, 127,	"Unstable"						,    0,       0,         -1,    0, false, true,    1,   1,   1, Dyes.dyeWhite		, Arrays.asList(new TC_AspectStack(TC_Aspects.PERDITIO, 4))),
+	Unstableingot		(  -1, TextureSet.SET_NONE				,   1.0F,      0,  4, 0                                     , 255, 255, 255, 127,	"Unstable"						,    0,       0,         -1,    0, false, true,    1,   1,   1, Dyes.dyeWhite		, Arrays.asList(new TC_AspectStack(TC_Aspects.PERDITIO, 4))),
 	Wheat				( 881, TextureSet.SET_POWDER			,   1.0F,      0,  0, 1                                     , 255, 255, 196,   0,	"Wheat"							,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow		, Arrays.asList(new TC_AspectStack(TC_Aspects.MESSIS, 2))),
 	
 	/**
 	 * TODO: This
 	 */
 	AluminiumBrass		(  -1, TextureSet.SET_METALLIC			,   6.0F,     64,  2, 1|2          |64                      , 255, 255, 255,   0,	"Aluminium Brass"				,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow		),
-    Osmiridium          ( 317, TextureSet.SET_METALLIC          ,   7.0F,   1600,  3, 1|2          |64|128                  , 100, 100, 255,   0,    "Osmiridium"                   ,    0,       0,       3500, 3500, true, false,   1,   1,   1, Dyes.dyeLightBlue    ),
-    Sunnarium           ( 318, TextureSet.SET_SHINY             ,   1.0F,      0,  1, 1|2          |64|128                  , 255, 255,   0,   0,    "Sunnarium"                    ,    0,       0,       3600, 3600, true, false,   1,   1,   1, Dyes.dyeYellow       ),
+    Osmiridium          ( 317, TextureSet.SET_METALLIC          ,   7.0F,   1600,  3, 1|2          |64|128                  , 100, 100, 255,   0,    "Osmiridium"                   ,    0,       0,       3500, 3500, true, false,    1,   1,   1, Dyes.dyeLightBlue   ),
+    Sunnarium           ( 318, TextureSet.SET_SHINY             ,   1.0F,      0,  1, 1|2          |64|128                  , 255, 255,   0,   0,    "Sunnarium"                    ,    0,       0,       3600, 3600, true, false,    1,   1,   1, Dyes.dyeYellow      ),
     Endstone			( 808, TextureSet.SET_DULL				,   1.0F,      0,  1, 1                                     , 255, 255, 255,   0,	"Endstone"						,    0,       0,         -1,    0, false, false,   0,   1,   1, Dyes.dyeYellow		),
 	Netherrack			( 807, TextureSet.SET_DULL				,   1.0F,      0,  0, 1                                     , 200,   0,   0,   0,	"Netherrack"					,    0,       0,         -1,    0, false, false,   0,   1,   1, Dyes.dyeRed			),
 	SoulSand			(  -1, TextureSet.SET_DULL				,   1.0F,      0,  0, 1                                     , 255, 255, 255,   0,	"Soulsand"						,    0,       0,         -1,    0, false, false,   0,   1,   1, Dyes.dyeBrown		),
@@ -456,9 +456,11 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 	Diamond				( 500, TextureSet.SET_DIAMOND			,   8.0F,   1280,  3, 1  |4|8      |64|128                  , 200, 255, 255, 127,	"Diamond"						,    0,       0,         -1,    0, false, true,   5,  64,   1, Dyes.dyeWhite		, 1, Arrays.asList(new MaterialStack(Carbon, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 3), new TC_AspectStack(TC_Aspects.LUCRUM, 4))),
 	Electrum			( 303, TextureSet.SET_SHINY				,  12.0F,     64,  2, 1|2  |8      |64|128                  , 255, 255, 100,   0,	"Electrum"						,    0,       0,         -1,    0, false, false,   4,   1,   1, Dyes.dyeYellow		, 2, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(Gold, 1))),
 	Emerald				( 501, TextureSet.SET_EMERALD			,   7.0F,    256,  2, 1  |4|8      |64                      ,  80, 255,  80, 127,	"Emerald"						,    0,       0,         -1,    0, false, true,   5,   1,   1, Dyes.dyeGreen		, 1, Arrays.asList(new MaterialStack(Beryllium, 3), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 6), new MaterialStack(Oxygen, 18)), Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 3), new TC_AspectStack(TC_Aspects.LUCRUM, 5))),
+    EnhancedGalgadorianMetal(385, TextureSet.SET_METALLIC       ,  32.0F,   7200,  5, 1|2|       64|128                     , 152,  93, 133,   0,   "EnhancedGalgadorianMetal"      ,    0,       0,       3500, 3500, true, false,   1,   1,   1, Dyes.dyePink         ),
 	FreshWater			(  -1, TextureSet.SET_FLUID				,   1.0F,      0,  0,         16                            ,   0,   0, 255,   0,	"Fresh Water"					,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlue		, 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.AQUA, 2))),
 	Galena				( 830, TextureSet.SET_DULL				,   1.0F,      0,  3, 1    |8                               , 100,  60, 100,   0,	"Galena"						,    0,       0,         -1,    0, false, false,   4,   1,   1, Dyes.dyePurple		, 1, Arrays.asList(new MaterialStack(Lead, 3), new MaterialStack(Silver, 3), new MaterialStack(Sulfur, 2))),
-	Garnierite			( 906, TextureSet.SET_METALLIC			,   1.0F,      0,  3, 1    |8                               ,  50, 200,  70,   0,	"Garnierite"					,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightBlue	, 1, Arrays.asList(new MaterialStack(Nickel, 1), new MaterialStack(Oxygen, 1))), 
+    GalgadorianMetal    ( 384, TextureSet.SET_METALLIC          ,  16.0F,   3600,  3, 1|2|       64|128                     , 154, 105, 119,   0,   "GalgadorianMetal"              ,    0,       0,       -1,   2200,  true, false,   1,   1,   1, Dyes.dyePink        ),
+	Garnierite			( 906, TextureSet.SET_METALLIC			,   1.0F,      0,  3, 1    |8                               ,  50, 200,  70,   0,	"Garnierite"					,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeLightBlue	, 1, Arrays.asList(new MaterialStack(Nickel, 1), new MaterialStack(Oxygen, 1))),
 	Glyceryl			( 714, TextureSet.SET_FLUID				,   1.0F,      0,  1,         16                            ,   0, 150, 150,   0,	"Glyceryl Trinitrate"			,    0,       0,         -1,    0, false, false,   1,   1,   1, Dyes.dyeCyan		, 1, Arrays.asList(new MaterialStack(Carbon, 3), new MaterialStack(Hydrogen, 5), new MaterialStack(Nitrogen, 3), new MaterialStack(Oxygen, 9))),
 	GreenSapphire		( 504, TextureSet.SET_GEM_HORIZONTAL	,   7.0F,    256,  2, 1  |4|8      |64                      , 100, 200, 130, 127,	"Green Sapphire"				,    0,       0,         -1,    0, false, true,   5,   1,   1, Dyes.dyeCyan		, 1, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 5), new TC_AspectStack(TC_Aspects.VITREUS, 3))),
 	Grossular			( 831, TextureSet.SET_ROUGH				,   1.0F,      0,  1, 1    |8                               , 200, 100,   0,   0,	"Grossular"						,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes.dyeOrange		, 1, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12))),
@@ -733,7 +735,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 				Tartarite, Thyrium, Tritanium, Vulcanite, Vyroxeres, Yellorium, Zectium, AluminiumBrass, Osmiridium, Sunnarium, AnnealedCopper, BatteryAlloy, Brass, Bronze, ChromiumDioxide, Cupronickel, DeepIron, 
 				Electrum, Invar, IronCompressed, Kanthal, Magnalium, Nichrome, NiobiumNitride, NiobiumTitanium, PigIron, SolderingAlloy, StainlessSteel, Steel, Ultimet, VanadiumGallium, WroughtIron, 
 				YttriumBariumCuprate, IronWood, Alumite, Manyullyn, ShadowIron, ShadowSteel, Steeleaf, SterlingSilver, RoseGold, BlackBronze, BismuthBronze, BlackSteel, RedSteel, BlueSteel, DamascusSteel, 
-				TungstenSteel, AstralSilver, Midasium, Mithril, BlueAlloy, RedAlloy, CobaltBrass, Thaumium, IronMagnetic, SteelMagnetic, NeodymiumMagnetic, Knightmetal);
+				TungstenSteel, AstralSilver, Midasium, Mithril, BlueAlloy, RedAlloy, CobaltBrass, Thaumium, IronMagnetic, SteelMagnetic, NeodymiumMagnetic, Knightmetal, GalgadorianMetal, EnhancedGalgadorianMetal, Reinforced);
 		
 		SubTag.FOOD.addTo(MeatRaw, MeatCooked, Ice, Water, Salt, Chili, Cocoa, Cheese, Coffee, Chocolate, Milk, Honey, FryingOilHot, FishOil, SeedOil, SeedOilLin, SeedOilHemp, Wheat, Sugar, FreshWater);