+ Added several new Materials and Alloys. (Nitinol 60, Adv. Nitinol, Hypogen, Titansteel, Arcanite, Octiron, Tungsten Titanium Carbide, Astral Titanium, Celestial Tungsten, Chronomatic Glass).

+ Added Carbon nanotubes, Carbyne and associated materials required to create them.
+ Added Hypervisor Matrix (Fusion), a core component for the MK4.
% Tweaked recipes for the MK4 Fusion Reactor and components, making it significantly harder.
$ Fixed some base elements not generating correctly due to inverted logic for detection.
$ Fixed rare chance for an invalid compressor recipe to generate.
$ Fixed Voltages and tiering of all materials, resolves many recipe issues within the EBF and ABS.
$ Fixed invalid compound tooltips on all ore materials.

4 files changed, 116 insertions, 101 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index a8b7d6b297..6a659fc165 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -10,6 +10,7 @@ public final class ALLOY {
 	//Just some GT Alloys that I need within mine.
 	public static final Material BRONZE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bronze);
 	public static final Material STEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.Steel);
+	public static final Material STEEL_BLACK = MaterialUtils.generateMaterialFromGtENUM(Materials.BlackSteel);
 	public static final Material INVAR = MaterialUtils.generateMaterialFromGtENUM(Materials.Invar);
 	public static final Material KANTHAL = MaterialUtils.generateMaterialFromGtENUM(Materials.Kanthal);
 	public static final Material NICHROME = MaterialUtils.generateMaterialFromGtENUM(Materials.Nichrome);
@@ -26,6 +27,7 @@ public final class ALLOY {
 			150, //Protons
 			80, //Neutrons
 			true, //Uses Blast furnace?
+			"⬟ ⯂ ⬢ ⬣ ⯃ ⯄",
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().AER, 5),
@@ -188,6 +190,21 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20),
 					new MaterialStack(NICHROME, 10)
 			});
+	
+	public static final Material NITINOL_60 = new Material(
+			"Nitinol 60", //Material Name
+			MaterialState.SOLID, //State
+			null, //Material Colour
+			5651, //Melting Point in C
+			8975,
+			-1,
+			-1,
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 40),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 60)
+			});
 
 
 	public static final Material ZERON_100 = new Material(
@@ -437,6 +454,21 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().CARBON, 50),
 					new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50)
 			});
+	
+	public static final Material TUNGSTEN_TITANIUM_CARBIDE = new Material(
+			"Tungsten Titanium Carbide", //Material Name
+			MaterialState.SOLID, //State
+			null,
+			-1, //Melting Point in C
+			-1,
+			-1,
+			-1,
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(TUNGSTEN_CARBIDE, 70),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 30)
+			});
 
 	public static final Material SILICON_CARBIDE = new Material(
 			"Silicon Carbide", //Material Name
@@ -497,6 +529,23 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50),
 					new MaterialStack(ELEMENT.getInstance().CARBON, 50)
 			});
+	
+	public static final Material ARCANITE = new Material(
+			"Arcanite", //Material Name
+			MaterialState.SOLID, //State
+			null,
+			5666, //Melting Point in C
+			9875,
+			-1,
+			-1,
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().THORIUM232, 40),
+					new MaterialStack(ENERGYCRYSTAL, 40),
+					new MaterialStack(ELEMENT.getInstance().ORDO, 10),
+					new MaterialStack(ELEMENT.getInstance().PERDITIO, 10)
+			});
 
 	public static final Material LEAGRISIUM = new Material(
 			"Grisium", //Material Name
@@ -704,7 +753,7 @@ public final class ALLOY {
 	public static final Material PIKYONIUM = new Material(
 			"Pikyonium 64B", //Material Name
 			MaterialState.SOLID, //State
-			null, //Material Colour
+            new short[]{52, 103, 186, 0}, //Material Colour
 			7850, //Melting Point in C
 			11765, //Boiling Point in C
 			-1,
@@ -744,12 +793,49 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2),
 			});
 	
+	//Titansteel
+	public static final Material TITANSTEEL = new Material(
+			"Titansteel", //Material Name
+			MaterialState.SOLID, //State
+			null, //Material Colour
+			8250, //Melting Point in C
+			11765, //Boiling Point in C
+			-1,
+			-1,
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ALLOY.TUNGSTEN_TITANIUM_CARBIDE, 3),
+					new MaterialStack(ELEMENT.getInstance().IGNIS, 1),
+					new MaterialStack(ELEMENT.getInstance().TERRA, 1),
+					new MaterialStack(ELEMENT.getInstance().PERDITIO, 1),
+			});
+	
+	
+	public static final Material OCTIRON = new Material(
+			"Octiron", //Material Name
+			MaterialState.SOLID, //State
+			null,
+			9120, //Melting Point in C
+			14200,
+			-1,
+			-1,
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ARCANITE, 30),
+					new MaterialStack(TITANSTEEL, 30),
+					new MaterialStack(ENERGYCRYSTAL, 5),
+					new MaterialStack(STEEL_BLACK, 10),
+					new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25)
+			});
+	
 	//Quantum
 	public static final Material QUANTUM = new Material(
 			"Quantum", //Material Name
 			MaterialState.SOLID, //State
 			null, //Material Colour
-			9500, //Melting Point in C
+			10500, //Melting Point in C
 			25000, //Boiling Point in C
 			150, //Protons
 			200, //Neutrons
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 2c41789d9e..d69ad9b065 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -122,6 +122,8 @@ public final class ELEMENT {
 	public final Material IGNIS = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire, TextureSets.GEM_A.get());
 	public final Material TERRA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEarth, TextureSets.GEM_A.get());
 	public final Material AQUA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedWater, TextureSets.GEM_A.get());
+	public final Material PERDITIO = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEntropy, TextureSets.GEM_A.get());
+	public final Material ORDO = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedOrder, TextureSets.GEM_A.get());
 	
 	//Fictional	
 	public final Material YELLORIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yellorium, new short[] {255, 242, 10}, TextureSets.NUCLEAR.get());
@@ -146,8 +148,7 @@ public final class ELEMENT {
 	public final Material AMERICIUM241 = new Material("Americium-241", MaterialState.SOLID, TextureSets.NUCLEAR.get(), Materials.Americium.mDurability, Materials.Americium.mRGBa, Materials.Americium.mMeltingPoint, Materials.Americium.mBlastFurnaceTemp, 95, 146, false, StringUtils.superscript("241Am"), 2, false);//Not a GT Inherited Material
 
 	public final Material MAGIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Magic, new short[] {10, 185, 140});
-	public final Material THAUMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thaumium);
-
+	public final Material THAUMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thaumium);	
 
 	static {
 		Logger.MATERIALS("Initialising Base Elements.");
@@ -202,6 +203,16 @@ public final class ELEMENT {
 	public static ELEMENT getInstance(){
 		return INSTANCE;
 	}
+	
+	public static class STANDALONE {
+		
+		public static final Material CELESTIAL_TUNGSTEN = new Material("Celestial Tungsten", MaterialState.SOLID, TextureSets.REFINED.get(), ELEMENT.INSTANCE.TUNGSTEN.getRGB(), INSTANCE.TUNGSTEN.getMeltingPointC()+6500, INSTANCE.TUNGSTEN.getBoilingPointC()+7500, 160, 101, true, "✦◆✦", 0);//Not a GT Inherited Material
+		public static final Material ASTRAL_TITANIUM = new Material("Astral Titanium", MaterialState.SOLID, TextureSets.REFINED.get(), ELEMENT.INSTANCE.TITANIUM.getRGB(), INSTANCE.TITANIUM.getMeltingPointC()+7500, INSTANCE.TITANIUM.getBoilingPointC()+7500, 145, 133, true, "✧◇✧", 0);//Not a GT Inherited Material
+		public static final Material CHRONOMATIC_GLASS = new Material("Chromatic Glass", MaterialState.SOLID, new short[]{255, 255, 255}, 9200, 17550, 40, 51, false, "🕛🕒🕕🕘🕛 ", 0);//Not a GT Inherited Material
+		public static final Material ADVANCED_NITINOL = new Material("Advanced Nitinol", MaterialState.SOLID, TextureSets.ENRICHED.get(), ALLOY.NITINOL_60.getRGB(), 8400, 14377, 40, 51, true, "⚷⚙⚷ Ni4Ti6", 0);//Not a GT Inherited Material
+		public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
+		
+	}
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 5819374f4d..1ee02a2654 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -5,23 +5,14 @@ import static gregtech.api.enums.GT_Values.M;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentSkipListSet;
-
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.*;
 
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TextureSet;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.item.base.cell.BaseItemCell;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
@@ -31,6 +22,10 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_Aspects;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -96,10 +91,14 @@ public class Material {
 	public Material(String materialName, MaterialState defaultState, final TextureSet set, short[] rgba, int j, int k, int l, int m, int radiationLevel, MaterialStack[] materialStacks){
 		this(materialName, defaultState, set, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks);
 	}
-
+	
 	public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){
 		this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", 0, inputs);
 	}
+	
+	public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemSymbol, final MaterialStack... inputs){
+		this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemSymbol, 0, inputs);
+	}
 
 	public Material(final String materialName, final MaterialState defaultState, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, boolean generateCells, final MaterialStack... inputs){
 		this(materialName, defaultState, null, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", 0, generateCells, true, inputs);
@@ -401,7 +400,7 @@ public class Material {
 				}
 			}
 
-			if (vMaterialInput.size() > 0) {
+			/*if (vMaterialInput.size() > 0) {
 				AutoMap<Integer> aDataSet = new AutoMap<Integer>();
 
 				int bonus = 0;
@@ -428,7 +427,8 @@ public class Material {
 			}
 			else {
 				this.vTier = MaterialUtils.getTierOfMaterial((int) MathUtils.celsiusToKelvin(meltingPoint));				
-			}
+			}*/
+			this.vTier = MaterialUtils.getTierOfMaterial(meltingPoint);
 
 
 			//Sets the materials 'tier'. Will probably replace this logic.
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index d8ac82d724..78a0d250a9 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -15,8 +15,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1),
@@ -33,8 +31,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
@@ -56,8 +52,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
@@ -76,8 +70,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
@@ -96,8 +88,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().LEAD, 1),
@@ -114,8 +104,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().NICKEL, 1),
@@ -135,8 +123,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), //Y not YT/YB
@@ -153,8 +139,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), //Y not YT/YB
@@ -175,8 +159,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), //Y not YT/YB
@@ -196,8 +178,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
@@ -215,8 +195,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 4),
@@ -239,8 +217,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
@@ -262,8 +238,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
@@ -283,8 +257,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
@@ -301,8 +273,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
@@ -320,8 +290,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
@@ -339,8 +307,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
@@ -363,8 +329,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3),
@@ -388,8 +352,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// (Ca,Th,Ce)Zr(Ti,Nb)2O7
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
@@ -410,8 +372,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// (La)2(CO3)3·8(H2O)
 					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
@@ -430,8 +390,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// (Ce)2(CO3)3·8(H2O)
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
@@ -450,8 +408,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// (Nd)2(CO3)3·8(H2O)
 					new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
@@ -470,8 +426,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// ((Ca,Ce)(Al,Ti,Mg)12O19)
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
@@ -491,8 +445,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 9),
@@ -514,8 +466,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// (YCa)Cu5(As2O4)3(OH)6·3H2O
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
@@ -535,8 +485,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// (CdCa)Cu7(AsO2)4(O2H)5·3H2O
 					new MaterialStack(ELEMENT.getInstance().CADMIUM, 1),
@@ -556,8 +504,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// (LaCa)Cu5(AsO6)2(OH)4·3H2O
 					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1),
@@ -577,8 +523,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// (NdCa)Cu6(As3O3)2(O2H)6·3H2O
 					new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1),
@@ -598,8 +542,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// (Ca,Sr,Ce,Na)5(PO4)3F
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 5),
@@ -620,8 +562,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// SmAl3(PO4)2(OH)6
 					new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1),
@@ -640,8 +580,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
@@ -659,8 +597,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
@@ -678,8 +614,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
@@ -698,8 +632,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			-1, //Radiation
 			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().BISMUTH, 13),
@@ -718,8 +650,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			0, //Radiation
 			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().MERCURY, 54/4),
@@ -741,8 +671,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			0, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
@@ -764,8 +692,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			0, //Radiation
 			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().GOLD, 3),
@@ -784,8 +710,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			0, //Radiation
 			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().GOLD, 8),
@@ -805,8 +729,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			0, //Radiation
 			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11),
@@ -825,8 +747,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			0, //Radiation
 			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2),
@@ -845,8 +765,6 @@ public final class ORES {
 			-1,
 			-1,
 			-1,
-			false,
-			"(IrRuRhPt)SAs",
 			0, //Radiation
 			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1),