+ Added new Radioactive ore.

+ Added Custom Nuclear Texture Set.
% More material work.
$ Fixed issue allowing Multiblocks to have > 1 Control Core Hatch.
$ Fixed Broken Ore texture for ENRICHED TextureSet.
$ Fixed a few fluid recipes broken in the refactor.

39 files changed, 1892 insertions, 1195 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index a664555cf2..92c7a9a049 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -57,6 +57,29 @@ import net.minecraftforge.oredict.OreDictionary;
 @Mod(modid = CORE.MODID, name = CORE.name, version = CORE.VERSION, dependencies = "required-after:Forge; after:TConstruct; after:PlayerAPI; after:dreamcraft; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO; after:tectech; after:GTRedtech; after:beyondrealitycore; after:OpenBlocks; after:IC2NuclearControl; after:TGregworks; after:StevesCarts;")
 public class GTplusplus implements ActionListener {
 
+	public static enum INIT_PHASE {
+		SUPER(null),
+		PRE_INIT(SUPER),
+		INIT(PRE_INIT),
+		POST_INIT(INIT);		
+		protected boolean mIsPhaseActive = false;
+		private final INIT_PHASE mPrev;
+		
+		private INIT_PHASE(INIT_PHASE aPreviousPhase) {
+			mPrev = aPreviousPhase;
+		}
+		
+		public synchronized final boolean isPhaseActive() {			
+			return mIsPhaseActive;
+		}
+		public synchronized final void setPhaseActive(boolean aIsPhaseActive) {
+			if (mPrev != null && mPrev.isPhaseActive()) {
+				mPrev.setPhaseActive(false);
+			}
+			mIsPhaseActive = aIsPhaseActive;
+		}
+	}
+	
 	//Mod Instance
 	@Mod.Instance(CORE.MODID)
 	public static GTplusplus instance;
@@ -87,12 +110,14 @@ public class GTplusplus implements ActionListener {
 	
 	public GTplusplus() {
 		super();
+		INIT_PHASE.SUPER.setPhaseActive(true);
 		mChunkLoading = new ChunkLoading();
 	}
 
 	// Pre-Init
 	@Mod.EventHandler
 	public void preInit(final FMLPreInitializationEvent event) {
+		INIT_PHASE.PRE_INIT.setPhaseActive(true);
 		Logger.INFO("Loading " + CORE.name + " "+CORE.VERSION+" on Gregtech "+Utils.getGregtechVersionAsString());
 		//Load all class objects within the plugin package.
 		Core_Manager.veryEarlyInit();
@@ -133,6 +158,7 @@ public class GTplusplus implements ActionListener {
 	// Init
 	@Mod.EventHandler
 	public void init(final FMLInitializationEvent event) {
+		INIT_PHASE.INIT.setPhaseActive(true);
 		mChunkLoading.init(event);
 		proxy.init(event);
 		proxy.registerNetworkStuff();
@@ -154,6 +180,7 @@ public class GTplusplus implements ActionListener {
 	// Post-Init
 	@Mod.EventHandler
 	public void postInit(final FMLPostInitializationEvent event) {
+		INIT_PHASE.POST_INIT.setPhaseActive(true);
 		mChunkLoading.postInit(event);
 		proxy.postInit(event);
 		BookHandler.runLater();
diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
index 34da346ff2..6014388cda 100644
--- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
+++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -29,10 +29,10 @@ public class BasicBlock extends BlockContainer {
 			this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
 		}
 
-		this.setCreativeTab(AddToCreativeTab.tabBlock);
-		this.setHardness(2.0F);
+		this.setCreativeTab(AddToCreativeTab.tabBlock);		
 		this.setResistance(6.0F);
 		this.setLightLevel(0.0F);
+		this.setHardness(1.0f*harvestLevel);
 		this.setHarvestLevel("pickaxe", harvestLevel);
 		this.setStepSound(soundTypeMetal);
 	}
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
index 634dc4c022..b089688193 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -32,14 +32,14 @@ public class BlockBaseModular extends BasicBlock {
 	
 	public BlockBaseModular(final Material material, final BlockTypes blockType, final int colour) {
 		this(material.getUnlocalizedName(), material.getLocalizedName(), net.minecraft.block.material.Material.iron,
-				blockType, colour, Math.min(Math.max(material.vTier, 1), 5));
+				blockType, colour, Math.min(Math.max(material.vTier, 1), 6));
 		blockMaterial = material;
 	}
 
 	protected BlockBaseModular(final String unlocalizedName, final String blockMaterial,
 			final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, final int colour,
 			final int miningLevel) {
-		super(unlocalizedName, vanillaMaterial);
+		super(blockType, unlocalizedName, vanillaMaterial, miningLevel);	
 		this.setHarvestLevel(blockType.getHarvestTool(), miningLevel);
 		this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture());
 		this.blockColour = colour;
@@ -130,8 +130,8 @@ public class BlockBaseModular extends BasicBlock {
 			}		
 			metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType);	
 			int tier = this.blockMaterial.vTier;
-			String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier < 3 ? "block1" : tier < 6 ? "block6" : "block5");			
-			this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/"+ "METALLIC" +"/" + aType);
+			String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier <= 4 ? "block1" : "block5");			
+			this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/"+ metType +"/" + aType);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 526f2b245c..4d7478dbdd 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -30,12 +30,13 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 	private final Material blockMaterial;
 
 	public BlockBaseOre(final Material material, final BlockTypes blockType, final int colour) {
-		super(blockType, Utils.sanitizeString(material.getUnlocalizedName()), net.minecraft.block.material.Material.rock);
+		super(blockType, Utils.sanitizeString(material.getUnlocalizedName()), net.minecraft.block.material.Material.rock, Math.min(Math.max(material.vTier, 1), 6));
+		int aMaterialTierForMining = Math.min(Math.max(material.vTier, 1), 6);
 		this.blockMaterial = material;
-		this.setHardness(2.0f);
+		this.setHardness(1.0f*aMaterialTierForMining);
 		this.setResistance(6.0F);
 		this.setLightLevel(0.0F);
-		this.setHarvestLevel("pickaxe", Math.min(Math.max(material.vTier, 1), 5));
+		this.setHarvestLevel("pickaxe", aMaterialTierForMining);
 		this.setStepSound(soundTypeStone);		
 		this.setBlockName("Ore"+Utils.sanitizeString(Utils.sanitizeString(material.getUnlocalizedName())));
 		this.setBlockTextureName("stone");
diff --git a/src/Java/gtPlusPlus/core/client/CustomTextureSet.java b/src/Java/gtPlusPlus/core/client/CustomTextureSet.java
index d7bbecd6c7..400503b2fa 100644
--- a/src/Java/gtPlusPlus/core/client/CustomTextureSet.java
+++ b/src/Java/gtPlusPlus/core/client/CustomTextureSet.java
@@ -8,7 +8,8 @@ public class CustomTextureSet extends TextureSet {
 		
 		REFINED(),
 		GEM_A(),
-		ENRICHED();
+		ENRICHED(),
+		NUCLEAR;
 
 		private final CustomTextureSet A;
 		
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 0e21e9b154..c86c10bb53 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -280,6 +280,8 @@ public final class ModItems {
 
 	public static ItemStack itemHotTitaniumIngot;
 
+	public static Fluid fluidZrF4;
+
 	static {
 		Logger.INFO("Items!");
 		//Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is called upon.
@@ -621,7 +623,7 @@ public final class ModItems {
 		//Zirconium Tetrafluoride
 		GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
 		GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));
-		FluidUtils.generateFluidNoPrefix("ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[]{170, 170, 140, 100}); //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
+		fluidZrF4 = FluidUtils.generateFluidNoPrefix("ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[]{170, 170, 140, 100}); //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
 
 		//Coolant Salt
 		//NaBF4 - NaF - 621C
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index ea0a2bb5eb..b07815fa60 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -97,14 +97,14 @@ public class BaseItemComponent extends Item{
 			return false;
 		}		
 		//Register Component
-		Map<String, BaseItemComponent> aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName());
+		Map<String, ItemStack> aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName());
 		if (aMap == null) {
-			aMap = new HashMap<String, BaseItemComponent>();
+			aMap = new HashMap<String, ItemStack>();
 		}
 		String aKey = componentType.getGtOrePrefix().name();
-		BaseItemComponent x = aMap.get(aKey);
+		ItemStack x = aMap.get(aKey);
 		if (x == null) {
-			aMap.put(aKey, this);
+			aMap.put(aKey, ItemUtils.getSimpleStack(this));
 			Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap);
 			return true;
 		}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 56d2aabdba..517e3f7c1f 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -18,12 +18,12 @@ import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
 
-public class ItemBlockGtBlock extends ItemBlock{
+public class ItemBlockGtBlock extends ItemBlock {
 
 	protected final int blockColour;
-	protected final int sRadiation;
+	private int sRadiation;
 
-	private final Material mMaterial;
+	private Material mMaterial;
 
 	private final Block thisBlock;
 	private boolean isOre = false;
@@ -32,46 +32,23 @@ public class ItemBlockGtBlock extends ItemBlock{
 	public ItemBlockGtBlock(final Block block) {
 		super(block);
 		this.thisBlock = block;
-		if (block instanceof BlockBaseOre){
+		if (block instanceof BlockBaseOre) {
 			this.isOre = true;
-		}
-		else if (block instanceof BlockBaseModular) {
+		} else if (block instanceof BlockBaseModular) {
 			this.isModular = true;
 		}
-		else {
-
-		}
-		if (!isModular && !isOre) {
-			mMaterial = null;
-		}
-		else {
-			if (isOre) {
-				mMaterial = ((BlockBaseOre) block).getMaterialEx();
-			}
-			else {
-				mMaterial = ((BlockBaseModular) block).getMaterialEx();				
-			}
-		}		
-
 		final BlockBaseModular baseBlock = (BlockBaseModular) block;
 		if (isModular) {
 			this.blockColour = baseBlock.getRenderColor(0);
-		}
-		else if (isOre) {
+		} else if (isOre) {
 			this.blockColour = block.getBlockColor();
-		}
-		else {
+		} else {
 			this.blockColour = block.getBlockColor();
 		}
-		if (this.mMaterial != null) {
-			this.sRadiation = mMaterial.vRadiationLevel;
-		}
-		else {
-			this.sRadiation = 0;
-		}
-
-
-		//GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""), ItemUtils.getSimpleStack(this));
+		// GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block",
+		// "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block",
+		// "").replace("-", "").replace("_", "").replace(" ", ""),
+		// ItemUtils.getSimpleStack(this));
 	}
 
 	public int getRenderColor(final int aMeta) {
@@ -80,45 +57,66 @@ public class ItemBlockGtBlock extends ItemBlock{
 
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		
-		if (this.mMaterial != null){
-			list.add(this.mMaterial.vChemicalFormula);			
-		}
-		
-		if (this.sRadiation > 0){
-			list.add(CORE.GT_Tooltip_Radioactive);
+
+		if (this.mMaterial != null) {
+			list.add(this.mMaterial.vChemicalFormula);
+			if (this.mMaterial.vRadiationLevel > 0) {
+				list.add(CORE.GT_Tooltip_Radioactive);
+			}
+		} else {
+			list.add("Material is Null.");
 		}
-		
+
 		if (KeyboardUtils.isCtrlKeyDown()) {
 			Block b = Block.getBlockFromItem(stack.getItem());
 			if (b != null) {
-				
+
 				String aTool = b.getHarvestTool(stack.getItemDamage());
 				int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage());
-				list.add("Mining Level: "+Math.min(Math.max(aMiningLevel1, 0), 5));	
-				
+				list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
+
 				if (this.mMaterial != null) {
-					list.add("Ore contains:    ");	
+					list.add("Ore contains:    ");
 					if (mMaterial.getComposites().isEmpty()) {
-						list.add("- "+mMaterial.getLocalizedName());						
-					}
-					else {
+						list.add("- " + mMaterial.getLocalizedName());
+					} else {
 						for (MaterialStack m : mMaterial.getComposites()) {
-							list.add("- "+m.getStackMaterial().getLocalizedName()+" x"+m.getPartsPerOneHundred());					
+							list.add("- " + m.getStackMaterial().getLocalizedName() + " x" + m.getPartsPerOneHundred());
 						}
 					}
 				}
 			}
-		}
-		else {
-			list.add(EnumChatFormatting.DARK_GRAY+"Hold Ctrl to show additional info.");				
+		} else {
+			list.add(EnumChatFormatting.DARK_GRAY + "Hold Ctrl to show additional info.");
 		}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
 	@Override
-	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) {
-		EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.sRadiation, world, entityHolding);
+	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
+			final boolean p_77663_5_) {
+
+		if (!isModular && !isOre) {
+			mMaterial = null;
+		} else {
+			if (this.mMaterial == null) {
+				Block b = Block.getBlockFromItem(iStack.getItem());
+				if (isOre) {
+					mMaterial = ((BlockBaseOre) b).getMaterialEx();
+				} else {
+					mMaterial = ((BlockBaseModular) b).getMaterialEx();
+				}
+				if (mMaterial != null) {
+					this.sRadiation = mMaterial.vRadiationLevel;
+				} else {
+					this.sRadiation = 0;
+				}
+			}
+			if (this.sRadiation > 0) {
+				EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.sRadiation, world, entityHolding);
+			}
+		}
+
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
index 791d861414..e4079521d4 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
@@ -57,12 +57,7 @@ public class ItemBlockOre extends ItemBlock{
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 
-		if (!mInitOres_Everglades || mMapOreBlockItemToDimName.size() == 0 || (aPlayer != null ? aPlayer.worldObj.getWorldTime() % 200 == 0 : false)) {
-
-			//mMapOreBlockItemToDimName.clear();
-			mDimsForThisOre.clear();
-
-
+		if (!mInitOres_Everglades) {
 			for (WorldGen_GT_Ore_Layer f : gtPlusPlus.everglades.gen.gt.WorldGen_Ores.validOreveins.values()) {
 				Material[]  m2 = new Material[] {f.mPrimary, f.mSecondary, f.mBetween, f.mSporadic};
 				for (Material m1 : m2) {
@@ -70,8 +65,9 @@ public class ItemBlockOre extends ItemBlock{
 					if (aMap == null) {
 						aMap = new AutoMap<String>();
 					}
-					if (!aMap.containsValue("Everglades")) {
-						aMap.put("Everglades");	
+					String aDimName = "Everglades";
+					if (!aMap.containsValue(aDimName)) {
+						aMap.put(aDimName);	
 					}							
 					mMapOreBlockItemToDimName.put(m1.getUnlocalizedName().toLowerCase(), aMap);
 				}				
@@ -120,21 +116,21 @@ public class ItemBlockOre extends ItemBlock{
 			}
 
 			if (mDimsForThisOre.isEmpty()) {
-				AutoMap A = mMapOreBlockItemToDimName.get(this.mThisMaterial.getUnlocalizedName().toLowerCase());
+				AutoMap<String> A = mMapOreBlockItemToDimName.get(this.mThisMaterial.getUnlocalizedName().toLowerCase());
 				if (A != null) {
 					mDimsForThisOre = A;
-				}
-				else {
-					mDimsForThisOre.put("Unknown");
-				}			
+				}		
 			}
-			
+
+			list.add("Found:    ");
 			if (!mDimsForThisOre.isEmpty()) {
-				list.add("Found:    ");
 				for (String m : mDimsForThisOre) {
 					list.add("- "+m);					
 				}			
 			}
+			else {
+				list.add("- Unknown");				
+			}
 
 		}
 		else {
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 53f778455c..f52856b824 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -212,7 +212,7 @@ public final class ALLOY {
 	public static final Material MARAGING250 = new Material(
 			"Maraging Steel 250", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{140, 140, 140, 0}, //Material Colour
+			null, //Material Colour
 			2413, //Melting Point in C
 			4555,
 			-1,
@@ -230,7 +230,7 @@ public final class ALLOY {
 	public static final Material MARAGING300 = new Material(
 			"Maraging Steel 300", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{150, 150, 150, 0}, //Material Colour
+			null, //Material Colour
 			2413, //Melting Point in C
 			4555,
 			-1,
@@ -248,7 +248,7 @@ public final class ALLOY {
 	public static final Material MARAGING350 = new Material(
 			"Maraging Steel 350", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{160, 160, 160, 0}, //Material Colour
+			null, //Material Colour
 			2413, //Melting Point in C
 			4555,
 			-1,
@@ -266,7 +266,7 @@ public final class ALLOY {
 	public static final Material STELLITE = new Material(
 			"Stellite", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{129, 75, 120, 0}, //Material Colour
+			null, //Material Colour
 			4310, //Melting Point in C
 			6250,
 			-1,
@@ -283,7 +283,7 @@ public final class ALLOY {
 	public static final Material TALONITE = new Material(
 			"Talonite", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{228, 75, 120, 0}, //Material Colour
+			null, //Material Colour
 			3454, //Melting Point in C
 			5500,
 			-1,
@@ -300,7 +300,7 @@ public final class ALLOY {
 	public static final Material HASTELLOY_W = new Material(
 			"Hastelloy-W", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{218, 165, 32, 0}, //Material Colour
+			null, //Material Colour
 			3350, //Melting Point in C
 			5755,
 			-1,
@@ -318,7 +318,7 @@ public final class ALLOY {
 	public static final Material HASTELLOY_X = new Material(
 			"Hastelloy-X", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{255, 193, 37, 0}, //Material Colour
+			null, //Material Colour
 			3350, //Melting Point in C
 			5755,
 			-1,
@@ -337,7 +337,7 @@ public final class ALLOY {
 	public static final Material HASTELLOY_N = new Material(
 			"Hastelloy-N", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{236, 213, 48, 0}, //Material Colour
+			null, //Material Colour
 			4350, //Melting Point in C
 			6875,
 			-1,
@@ -355,7 +355,7 @@ public final class ALLOY {
 	public static final Material HASTELLOY_C276 = new Material(
 			"Hastelloy-C276", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{238, 180, 34, 0}, //Material Colour
+			null, //Material Colour
 			4350, //Melting Point in C
 			6520,
 			-1,
@@ -374,7 +374,7 @@ public final class ALLOY {
 	public static final Material INCOLOY_020 = new Material(
 			"Incoloy-020", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{101, 81, 71, 0}, //Material Colour
+			null, //Material Colour
 			3425, //Melting Point in C
 			5420,
 			-1,
@@ -391,7 +391,7 @@ public final class ALLOY {
 	public static final Material INCOLOY_DS = new Material(
 			"Incoloy-DS", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{71, 101, 81, 0}, //Material Colour
+			null, //Material Colour
 			3425, //Melting Point in C
 			5420,
 			-1,
@@ -408,7 +408,7 @@ public final class ALLOY {
 	public static final Material INCOLOY_MA956 = new Material(
 			"Incoloy-MA956", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{81, 71, 101, 0}, //Material Colour
+			null, //Material Colour
 			4425, //Melting Point in C
 			6875,
 			-1,
@@ -523,7 +523,7 @@ public final class ALLOY {
 	public static final Material EGLIN_STEEL_BASE = new Material(
 			"Eglin Steel Base Compound", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{139,69,19, 0}, //Material Colour
+			null, //Material Colour
 			-1, //Melting Point in C
 			-1, //Boiling Point in C
 			-1,
@@ -579,7 +579,7 @@ public final class ALLOY {
 	public static final Material TRINIUM_TITANIUM = new Material(
 			"Trinium Titanium Alloy", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{239,210,200, 0}, //Material Colour
+			null, //Material Colour
 			3750, //Melting Point in C
 			7210, //Boiling Point in C
 			-1,
@@ -592,7 +592,7 @@ public final class ALLOY {
 	public static final Material TRINIUM_NAQUADAH = new Material(
 			"Trinium Naquadah Alloy", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{255, 243, 117, 0}, //Material Colour
+			null, //Material Colour
 			4200, //Melting Point in C
 			7400, //Boiling Point in C
 			-1,
@@ -605,7 +605,7 @@ public final class ALLOY {
 	public static final Material TRINIUM_NAQUADAH_CARBON = new Material(
 			"Trinium Naquadah Carbonite", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{255, 233, 0, 0}, //Material Colour
+			null, //Material Colour
 			6500, //Melting Point in C
 			9000, //Boiling Point in C
 			-1,
@@ -645,7 +645,7 @@ public final class ALLOY {
 	public static final Material LAFIUM = new Material(
 			"Lafium Compound", //Material Name
 			MaterialState.SOLID, //State
-			new short[]{75,180,255, 0}, //Material Colour
+			null, //Material Colour
 			6750, //Melting Point in C
 			9865, //Boiling Point in C
 			-1,
@@ -667,7 +667,7 @@ public final class ALLOY {
 	public static final Material CINOBITE = new Material(
 			"Cinobite A243", //Material Name