Merge pull request #50 from GTNewHorizons/gtnh-milling

Milling/Nuclear Sciences revamp + Lots of minor fixes

1 files changed, 446 insertions, 442 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index c2556b60f1..0186c23a07 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -6,119 +6,147 @@ import gtPlusPlus.core.material.state.MaterialState;
 
 public final class ORES {
 
-	public static final Material GEIKIELITE = new Material(
-			"Geikielite", //Material Name
+	public static final Material AGARDITE_CD = new Material(
+			"Agardite (Cd)", //Material Name
 			MaterialState.ORE, //State
-			TextureSets.GEM_A.get(), //Texture Set
-			new short[]{187, 193, 204, 0}, //Material Colour
+			TextureSet.SET_METALLIC, //Texture Set
+			new short[]{170, 188, 33, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().TITANIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)
+			new MaterialStack[]{// (CdCa)Cu7(AsO2)4(O2H)5·3H2O
+					new MaterialStack(ELEMENT.getInstance().CADMIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().COPPER, 7),
+					new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 11)
 			});	
 
-	public static final Material ZIMBABWEITE = new Material(
-			"Zimbabweite", //Material Name
+	public static final Material AGARDITE_LA = new Material(
+			"Agardite (La)", //Material Name
 			MaterialState.ORE, //State
 			TextureSet.SET_FINE, //Texture Set
-			new short[]{193, 187, 131, 0}, //Material Colour
+			new short[]{206, 232, 9, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().LEAD, 1),
-					new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
-					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 4),
-					new MaterialStack(ELEMENT.getInstance().TANTALUM, 4),
-					new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 18)
+			new MaterialStack[]{// (LaCa)Cu5(AsO6)2(OH)4·3H2O
+					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1),
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().COPPER, 5),
+					new MaterialStack(ELEMENT.getInstance().ARSENIC, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
 			});	
 
-	public static final Material TITANITE = new Material(
-			"Titanite", //Material Name
+	public static final Material AGARDITE_ND = new Material(
+			"Agardite (Nd)", //Material Name
 			MaterialState.ORE, //State
 			TextureSet.SET_METALLIC, //Texture Set
-			new short[]{184, 198, 105, 0}, //Material Colour
+			new short[]{225, 244, 78, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().SILICON, 2),
-					new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 10)
+			new MaterialStack[]{// (NdCa)Cu6(As3O3)2(O2H)6·3H2O
+					new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().COPPER, 6),
+					new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12)
 			});	
 
-	public static final Material ZIRCONILITE = new Material(
-			"Zirconolite", //Material Name
+	public static final Material AGARDITE_Y = new Material(
+			"Agardite (Y)", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_FINE, //Texture Set
-			new short[]{45, 26, 0, 0}, //Material Colour
+			TextureSet.SET_METALLIC, //Texture Set
+			new short[]{210, 232, 44, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
-					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 14)
+			new MaterialStack[]{// (YCa)Cu5(As2O4)3(OH)6·3H2O
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().COPPER, 5),
+					new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12)
 			});	
 
-	public static final Material CROCROITE = new Material(
-			"Crocoite", //Material Name
+	//Alburnite
+	//Ag8GeTe2S4
+	public static final Material ALBURNITE = new Material(
+			"Alburnite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_GEM_VERTICAL, //Texture Set
-			new short[]{255, 143, 84, 0}, //Material Colour
+			TextureSet.SET_METALLIC, //Texture Set
+			new short[]{16, 5, 105, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().LEAD, 2),
-					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
-					new MaterialStack(ELEMENT.getInstance().CAESIUM, 1),
+			0, //Radiation
+			new MaterialStack[]{// Na3AlF6
+					new MaterialStack(ELEMENT.getInstance().GOLD, 8),
+					new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().SULFUR, 4)
 			});	
 
-	public static final Material NICHROMITE = new Material(
-			"Nichromite", //Material Name
+	public static final Material CERITE = new Material(
+			"Cerite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_METALLIC, //Texture Set
-			new short[]{22, 19, 19, 0}, //Material Colour
+			TextureSets.REFINED.get(), //Texture Set
+			new short[]{68, 13, 0, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().NICKEL, 1),
-					new MaterialStack(ELEMENT.getInstance().COBALT, 1),
+			new MaterialStack[]{// (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3
+					new MaterialStack(ELEMENT.getInstance().CERIUM, 9),
+					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9),
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 9),
+					new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 3),
 					new MaterialStack(ELEMENT.getInstance().IRON, 3),
-					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
+					new MaterialStack(ELEMENT.getInstance().SILICON, 7),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 20),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4)
 			});	
 
-	public static final Material YTTRIAITE = new Material( //TODO
-			"Yttriaite", //Material Name
+	//Comancheite
+	//Hg55N24(NH2,OH)4(Cl,Br)34
+	public static final Material COMANCHEITE = new Material(
+			"Comancheite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_METALLIC, //Texture Set
+			TextureSets.REFINED.get(), //Texture Set
+			new short[]{65, 205, 105, 0}, //Material Colour
+			-1,
+			-1,
+			-1,
+			-1,
+			0, //Radiation
+			new MaterialStack[]{// Na3AlF6
+					new MaterialStack(ELEMENT.getInstance().MERCURY, 54/4),
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 28/4),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12/4),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 8/4),
+					new MaterialStack(ELEMENT.getInstance().CHLORINE, 34/4),
+					new MaterialStack(ELEMENT.getInstance().BROMINE, 34/4)
+			});	
+
+	public static final Material CROCROITE = new Material(
+			"Crocoite", //Material Name
+			MaterialState.ORE, //State
+			TextureSet.SET_GEM_VERTICAL, //Texture Set
 			new short[]{255, 143, 84, 0}, //Material Colour
 			-1,
 			-1,
@@ -126,67 +154,82 @@ public final class ORES {
 			-1,
 			-1, //Radiation
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), //Y not YT/YB
+					new MaterialStack(ELEMENT.getInstance().LEAD, 2),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
-					new MaterialStack(ELEMENT.getInstance().IRON, 4),
-					new MaterialStack(ELEMENT.getInstance().TIN, 1),
-					new MaterialStack(ELEMENT.getInstance().NITROGEN, 2)
-			});	
+					new MaterialStack(ELEMENT.getInstance().CAESIUM, 1),
+			});
 
-	//Samarskite_Y
-	public static final Material SAMARSKITE_Y = new Material(
-			"Samarskite (Y)", //Material Name
+	public static final Material CRYOLITE = new Material(
+			"Cryolite (F)", //Material Name
 			MaterialState.ORE, //State
-			TextureSets.ENRICHED.get(), //Texture Set
-			new short[]{65, 163, 164, 0}, //Material Colour
+			TextureSet.SET_SHINY, //Texture Set
+			new short[]{205, 205, 255, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), //Y not YT/YB
-					new MaterialStack(ELEMENT.getInstance().IRON, 10),
-					new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
-					new MaterialStack(ELEMENT.getInstance().THORIUM, 3),
-					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().TANTALUM, 3)
+			new MaterialStack[]{// Na3AlF6
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
+					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
 			});
 
-	//Samarskite_YB
-	public static final Material SAMARSKITE_YB = new Material(
-			"Samarskite (Yb)", //Material Name
+	//Demicheleite-(Br)
+	//	BiSBr
+	public static final Material DEMICHELEITE_BR = new Material(
+			"Demicheleite (Br)", //Material Name
 			MaterialState.ORE, //State
-			TextureSets.ENRICHED.get(), //Texture Set
-			new short[]{95, 193, 194, 0}, //Material Colour
+			TextureSet.SET_SHINY, //Texture Set
+			new short[]{165, 75, 75, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), //Y not YT/YB
-					new MaterialStack(ELEMENT.getInstance().IRON, 9),
-					new MaterialStack(ELEMENT.getInstance().URANIUM235, 3),
-					new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 3),
-					new MaterialStack(ELEMENT.getInstance().TANTALUM, 2)
+			new MaterialStack[]{// Na3AlF6
+					new MaterialStack(ELEMENT.getInstance().BISMUTH, 13),
+					new MaterialStack(ELEMENT.getInstance().SULFUR, 11),
+					new MaterialStack(ELEMENT.getInstance().BROMINE, 1)
 			});
 
-	public static final Material ZIRCON = new Material(
-			"Zircon", //Material Name
+	public static final Material FLORENCITE = new Material(
+			"Florencite", //Material Name
 			MaterialState.ORE, //State
-			TextureSets.GEM_A.get(), //Texture Set
-			new short[]{195, 19, 19, 0}, //Material Colour
+			TextureSet.SET_METALLIC, //Texture Set
+			new short[]{249, 249, 124, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().SILICON, 1),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 4),
+			new MaterialStack[]{// SmAl3(PO4)2(OH)6
+					new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
+					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 10),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6)
+			});
+
+	public static final Material FLUORCAPHITE = new Material(
+			"Fluorcaphite", //Material Name
+			MaterialState.ORE, //State
+			TextureSet.SET_FINE, //Texture Set
+			new short[]{255, 255, 30, 0}, //Material Colour
+			-1,
+			-1,
+			-1,
+			-1,
+			-1, //Radiation
+			new MaterialStack[]{// (Ca,Sr,Ce,Na)5(PO4)3F
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 5),
+					new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5),
+					new MaterialStack(ELEMENT.getInstance().CERIUM, 5),
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 5),
+					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 12),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 6),
 			});
 
 	//Gadolinite_Ce
@@ -202,6 +245,7 @@ public final class ORES {
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 4),
+					new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
 					new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
@@ -224,6 +268,7 @@ public final class ORES {
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
 					new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4),
@@ -233,171 +278,161 @@ public final class ORES {
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 9),
 			});
 
-	public static final Material LEPERSONNITE = new Material(
-			"Lepersonnite", //Material Name
+	public static final Material GEIKIELITE = new Material(
+			"Geikielite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_EMERALD, //Texture Set
-			new short[]{175, 175, 20, 0}, //Material Colour
+			TextureSets.GEM_A.get(), //Texture Set
+			new short[]{187, 193, 204, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN,32),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24)
+					new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)
 			});
-
-	public static final Material XENOTIME = new Material(
-			"Xenotime", //Material Name
+	
+	public static final Material GREENOCKITE = new Material(
+			"Greenockite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_OPAL, //Texture Set
-			new short[]{235, 89, 199, 0}, //Material Colour
+			TextureSets.GEM_A.get(), //Texture Set
+			new short[]{110, 193, 25, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
+					new MaterialStack(ELEMENT.getInstance().CADMIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().SULFUR, 2),
 			});
-
-	public static final Material YTTRIALITE = new Material(
-			"Yttrialite", //Material Name
+	
+	public static final Material HIBONITE = new Material(
+			"Hibonite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_RUBY, //Texture Set
-			new short[]{35, 189, 99, 0}, //Material Colour
+			TextureSet.SET_METALLIC, //Texture Set
+			new short[]{58, 31, 0, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().SILICON, 2),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 7),
+			new MaterialStack[]{// ((Ca,Ce)(Al,Ti,Mg)12O19)
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
+					new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 12),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
 			});
-
-	public static final Material YTTROCERITE = new Material(
-			"Yttrocerite", //Material Name
+	
+	//Honeaite
+	//Au3TlTe2
+	public static final Material HONEAITE = new Material(
+			"Honeaite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_DIAMOND, //Texture Set
-			new short[]{35, 19, 199, 0}, //Material Colour
+			TextureSet.SET_FINE, //Texture Set
+			new short[]{165, 165, 5, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().FLUORINE, 5),
-					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
+			0, //Radiation
+			new MaterialStack[]{// Na3AlF6
+					new MaterialStack(ELEMENT.getInstance().GOLD, 3),
+					new MaterialStack(ELEMENT.getInstance().THALLIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2)
 			});
 	
-	public static final Material POLYCRASE = new Material(
-			"Polycrase", //Material Name
+	//Irarsite
+	//(Ir,Ru,Rh,Pt)AsS
+	public static final Material IRARSITE = new Material(
+			"Irarsite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_ROUGH, //Texture Set
-			new short[]{51, 0, 11, 0}, //Material Colour
+			TextureSets.ENRICHED.get(), //Texture Set
+			new short[]{125, 105, 105, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
-					new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().TANTALUM, 2),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 6)
+			0, //Radiation
+			new MaterialStack[]{// Na3AlF6
+					new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().RHODIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().PLATINUM, 1),
+					new MaterialStack(ELEMENT.getInstance().ARSENIC, 1),
+					new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
 			});
 	
-	public static final Material ZIRCOPHYLLITE = new Material(
-			"Zircophyllite", //Material Name
+	//Kashinite
+	//(Ir,Rh)2S3
+	public static final Material KASHINITE = new Material(
+			"Kashinite", //Material Name
 			MaterialState.ORE, //State
-			TextureSets.REFINED.get(), //Texture Set
-			new short[]{30, 0, 6, 0}, //Material Colour
+			TextureSet.SET_SHINY, //Texture Set
+			new short[]{75, 105, 75, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3),
-					new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
-					new MaterialStack(ELEMENT.getInstance().MANGANESE, 7),
-					new MaterialStack(ELEMENT.getInstance().IRON, 7),
-					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().SILICON, 8),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 13),
-					new MaterialStack(ELEMENT.getInstance().FLUORINE, 7),
+			0, //Radiation
+			new MaterialStack[]{// Na3AlF6
+					new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().RHODIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().SULFUR, 3)
 			});
 	
-	public static final Material ZIRKELITE = new Material(
-			"Zirkelite", //Material Name
+	//	Tl(Cl,Br)
+	public static final Material LAFOSSAITE = new Material(
+			"Lafossaite", //Material Name
 			MaterialState.ORE, //State
-			TextureSets.GEM_A.get(), //Texture Set
-			new short[]{229, 208, 48, 0}, //Material Colour
+			TextureSets.REFINED.get(), //Texture Set
+			new short[]{165, 105, 205, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// (Ca,Th,Ce)Zr(Ti,Nb)2O7
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 7)
+			new MaterialStack[]{// Na3AlF6
+					new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
+					new MaterialStack(ELEMENT.getInstance().BROMINE, 1),
+					new MaterialStack(ELEMENT.getInstance().THALLIUM, 1)
 			});
 	
-	public static final Material LANTHANITE_LA = new Material(
-			"Lanthanite (La)", //Material Name
+	public static final Material LANTHANITE_CE = new Material(
+			"Lanthanite (Ce)", //Material Name
 			MaterialState.ORE, //State
-			TextureSets.REFINED.get(), //Texture Set
-			new short[]{219, 160, 214, 0}, //Material Colour
+			TextureSet.SET_METALLIC, //Texture Set
+			new short[]{186, 113, 179, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// (La)2(CO3)3·8(H2O)
-					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
+			new MaterialStack[]{// (Ce)2(CO3)3·8(H2O)
+					new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
 					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
 			});
 	
-	public static final Material LANTHANITE_CE = new Material(
-			"Lanthanite (Ce)", //Material Name
+	public static final Material LANTHANITE_LA = new Material(
+			"Lanthanite (La)", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_METALLIC, //Texture Set
-			new short[]{186, 113, 179, 0}, //Material Colour
+			TextureSets.REFINED.get(), //Texture Set
+			new short[]{219, 160, 214, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// (Ce)2(CO3)3·8(H2O)
-					new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
+			new MaterialStack[]{// (La)2(CO3)3·8(H2O)
+					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
 					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
@@ -422,399 +457,368 @@ public final class ORES {
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
 			});
 	
-	public static final Material HIBONITE = new Material(
-			"Hibonite", //Material Name
+	//Iodine Source
+	public static final Material LAUTARITE = new Material(
+			"Lautarite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_METALLIC, //Texture Set
-			new short[]{58, 31, 0, 0}, //Material Colour
+			TextureSet.SET_FINE, //Texture Set
+			new short[]{165, 105, 205, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// ((Ca,Ce)(Al,Ti,Mg)12O19)
+			new MaterialStack[]{// Na3AlF6
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
-					new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
-					new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 12),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
+					new MaterialStack(ELEMENT.getInstance().IODINE, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 6)
 			});
 	
-	public static final Material CERITE = new Material(
-			"Cerite", //Material Name
+	public static final Material LEPERSONNITE = new Material(
+			"Lepersonnite", //Material Name
 			MaterialState.ORE, //State
-			TextureSets.REFINED.get(), //Texture Set
-			new short[]{68, 13, 0, 0}, //Material Colour
+			TextureSet.SET_EMERALD, //Texture Set
+			new short[]{175, 175, 20, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3
-					new MaterialStack(ELEMENT.getInstance().CERIUM, 9),
-					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9),
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 9),
-					new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 3),
-					new MaterialStack(ELEMENT.getInstance().IRON, 3),
-					new MaterialStack(ELEMENT.getInstance().SILICON, 7),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 20),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4)
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN,32),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24)
 			});
 	
-	public static final Material AGARDITE_Y = new Material(
-			"Agardite (Y)", //Material Name
+	//Miessiite
+	//Pd11Te2Se2
+	public static final Material MIESSIITE = new Material(
+			"Miessiite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_METALLIC, //Texture Set
-			new short[]{210, 232, 44, 0}, //Material Colour
+			TextureSet.SET_FINE, //Texture Set
+			new short[]{75, 75, 75, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			-1, //Radiation
-			new MaterialStack[]{// (YCa)Cu5(As2O4)3(OH)6·3H2O
-					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().COPPER, 5),
-					new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12)
+			0, //Radiation
+			new MaterialStack[]{// Na3AlF6
+					new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11),
+					new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().SELENIUM, 2)
 			});
 	
-	public static final Material AGARDITE_CD = new Material(
-			"Agardite (Cd)", //Material Name
+	public static final Material NICHROMITE = new Material(
+			"Nichromite", //Material Name
 			MaterialState.ORE, //State
 			TextureSet.SET_METALLIC, //Texture Set
-			new short[]{170, 188, 33, 0}, //Material Colour
+			new short[]{22, 19, 19, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// (CdCa)Cu7(AsO2)4(O2H)5·3H2O
-					new MaterialStack(ELEMENT.getInstance().CADMIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().COPPER, 7),
-					new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 11)
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 1),
+					new MaterialStack(ELEMENT.getInstance().COBALT, 1),
+					new MaterialStack(ELEMENT.getInstance().IRON, 3),
+					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
 			});
 	
-	public static final Material AGARDITE_LA = new Material(
-			"Agardite (La)", //Material Name
+	//Perroudite
+	//Hg5Ag4S5(I,Br)2Cl2
+	public static final Material PERROUDITE = new Material(
+			"Perroudite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_FINE, //Texture Set
-			new short[]{206, 232, 9, 0}, //Material Colour
+			TextureSet.SET_METALLIC, //Texture Set
+			new short[]{77, 165, 174, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			-1, //Radiation
-			new MaterialStack[]{// (LaCa)Cu5(AsO6)2(OH)4·3H2O
-					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1),
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().COPPER, 5),
-					new MaterialStack(ELEMENT.getInstance().ARSENIC, 2),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
+			0, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
+					new MaterialStack(ELEMENT.getInstance().SILVER, 4),
+					new MaterialStack(ELEMENT.getInstance().IODINE, 2),
+					new MaterialStack(ELEMENT.getInstance().MERCURY, 5),
+					new MaterialStack(ELEMENT.getInstance().BROMINE, 2),
+					new MaterialStack(ELEMENT.getInstance().CHLORINE, 2)
 			});
 	
-	public static final Material AGARDITE_ND = new Material(
-			"Agardite (Nd)", //Material Name
+	public static final Material POLYCRASE = new Material(
+			"Polycrase", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_METALLIC, //Texture Set
-			new short[]{225, 244, 78, 0}, //Material Colour
+			TextureSet.SET_ROUGH, //Texture Set
+			new short[]{51, 0, 11, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// (NdCa)Cu6(As3O3)2(O2H)6·3H2O
-					new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1),
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().COPPER, 6),
-					new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12)
+					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
+					new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().TANTALUM, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 6)
 			});
-	
-	public static final Material FLUORCAPHITE = new Material(
-			"Fluorcaphite", //Material Name
+
+	//Radiobarite
+	//Radium, Barium, Barite?
+	public static final Material RADIOBARITE = new Material(
+			"Barite (Rd)", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_FINE, //Texture Set
-			new short[]{255, 255, 30, 0}, //Material Colour
+			TextureSet.SET_FLINT, //Texture Set
+			new short[]{205, 205, 205, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			-1, //Radiation
-			new MaterialStack[]{// (Ca,Sr,Ce,Na)5(PO4)3F
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 5),
-					new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5),
-					new MaterialStack(ELEMENT.getInstance().CERIUM, 5),
-					new MaterialStack(ELEMENT.getInstance().SODIUM, 5),
-					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 12),
-					new MaterialStack(ELEMENT.getInstance().FLUORINE, 6),
-			});
+			0, //Radiation
+			new MaterialStack[]{// Na3AlF6
+					new MaterialStack(ELEMENT.getInstance().BARIUM, 32),
+					new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().SULFUR, 16),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 15)
+			});	
 	
-	public static final Material FLORENCITE = new Material(
-			"Florencite", //Material Name
+	//Samarskite_Y
+	public static final Material SAMARSKITE_Y = new Material(
+			"Samarskite (Y)", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_METALLIC, //Texture Set
-			new short[]{249, 249, 124, 0}, //Material Colour
+			TextureSets.ENRICHED.get(), //Texture Set
+			new short[]{65, 163, 164, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// SmAl3(PO4)2(OH)6
-					new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
-					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 10),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6)
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), //Y not YT/YB
+					new MaterialStack(ELEMENT.getInstance().IRON, 10),
+					new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
+					new MaterialStack(ELEMENT.getInstance().THORIUM, 3),
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().TANTALUM, 3)
 			});
 	
-	public static final Material CRYOLITE = new Material(
-			"Cryolite", //Material Name
+	//Samarskite_YB
+	public static final Material SAMARSKITE_YB = new Material(
+			"Samarskite (Yb)", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_SHINY, //Texture Set
-			new short[]{205, 205, 255, 0}, //Material Colour
+			TextureSets.ENRICHED.get(), //Texture Set
+			new short[]{95, 193, 194, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
-					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), //Y not YT/YB
+					new MaterialStack(ELEMENT.getInstance().IRON, 9),
+					new MaterialStack(ELEMENT.getInstance().URANIUM235, 3),
+					new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 3),
+					new MaterialStack(ELEMENT.getInstance().TANTALUM, 2)
 			});
-
-	//Iodine Source
-	public static final Material LAUTARITE = new Material(
-			"Lautarite", //Material Name
-			MaterialState.ORE, //State
-			TextureSet.SET_FINE, //Texture Set
-			new short[]{165, 105, 205, 0}, //Material Colour
-			-1,
-			-1,
-			-1,
-			-1,
-			-1, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().IODINE, 2),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 6)
-			});	
 	
-	//	Tl(Cl,Br)
-	public static final Material LAFOSSAITE = new Material(
-			"Lafossaite", //Material Name
+	public static final Material TITANITE = new Material(
+			"Titanite", //Material Name
 			MaterialState.ORE, //State
-			TextureSets.REFINED.get(), //Texture Set
-			new short[]{165, 105, 205, 0}, //Material Colour
+			TextureSet.SET_METALLIC, //Texture Set
+			new short[]{184, 198, 105, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
-					new MaterialStack(ELEMENT.getInstance().BROMINE, 1),
-					new MaterialStack(ELEMENT.getInstance().THALLIUM, 1)
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().SILICON, 2),
+					new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 10)
 			});
 	
-	//Demicheleite-(Br)
-	//	BiSBr
-	public static final Material DEMICHELEITE_BR = new Material(
-			"Demicheleite (Br)", //Material Name
+	public static final Material XENOTIME = new Material(
+			"Xenotime", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_SHINY, //Texture Set
-			new short[]{165, 75, 75, 0}, //Material Colour
+			TextureSet.SET_OPAL, //Texture Set
+			new short[]{235, 89, 199, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().BISMUTH, 13),
-					new MaterialStack(ELEMENT.getInstance().SULFUR, 11),
-					new MaterialStack(ELEMENT.getInstance().BROMINE, 1)
-			});
-	
-	//Comancheite
-	//Hg55N24(NH2,OH)4(Cl,Br)34
-	public static final Material COMANCHEITE = new Material(
-			"Comancheite", //Material Name
-			MaterialState.ORE, //State
-			TextureSets.REFINED.get(), //Texture Set
-			new short[]{65, 205, 105, 0}, //Material Colour
-			-1,
-			-1,
-			-1,
-			-1,
-			0, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().MERCURY, 54/4),
-					new MaterialStack(ELEMENT.getInstance().NITROGEN, 28/4),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12/4),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 8/4),
-					new MaterialStack(ELEMENT.getInstance().CHLORINE, 34/4),
-					new MaterialStack(ELEMENT.getInstance().BROMINE, 34/4)
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().EUROPIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
 			});
 	
-	//Perroudite
-	//Hg5Ag4S5(I,Br)2Cl2
-	public static final Material PERROUDITE = new Material(
-			"Perroudite", //Material Name
+	public static final Material YTTRIAITE = new Material( //TODO
+			"Yttriaite", //Material Name
 			MaterialState.ORE, //State
 			TextureSet.SET_METALLIC, //Texture Set
-			new short[]{77, 165, 174, 0}, //Material Colour
+			new short[]{255, 143, 84, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			0, //Radiation
+			-1, //Radiation
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
-					new MaterialStack(ELEMENT.getInstance().SILVER, 4),
-					new MaterialStack(ELEMENT.getInstance().IODINE, 2),
-					new MaterialStack(ELEMENT.getInstance().MERCURY, 5),
-					new MaterialStack(ELEMENT.getInstance().BROMINE, 2),
-					new MaterialStack(ELEMENT.getInstance().CHLORINE, 2)
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), //Y not YT/YB
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+					new MaterialStack(ELEMENT.getInstance().IRON, 4),
+					new MaterialStack(ELEMENT.getInstance().TIN, 1),
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 2)
 			});
 	
-	//Honeaite
-	//Au3TlTe2
-	public static final Material HONEAITE = new Material(
-			"Honeaite", //Material Name
+	public static final Material YTTRIALITE = new Material(
+			"Yttrialite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_FINE, //Texture Set
-			new short[]{165, 165, 5, 0}, //Material Colour
+			TextureSet.SET_RUBY, //Texture Set
+			new short[]{35, 189, 99, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			0, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().GOLD, 3),
-					new MaterialStack(ELEMENT.getInstance().THALLIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2)
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().SILICON, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 7),
 			});
 	
-	//Alburnite
-	//Ag8GeTe2S4
-	public static final Material ALBURNITE = new Material(
-			"Alburnite", //Material Name
+	public static final Material YTTROCERITE = new Material(
+			"Yttrocerite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_METALLIC, //Texture Set
-			new short[]{16, 5, 105, 0}, //Material Colour
+			TextureSet.SET_DIAMOND, //Texture Set
+			new short[]{35, 19, 199, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			0, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().GOLD, 8),
-					new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().SULFUR, 4)
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 5),
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
 			});
 	
-	//Miessiite
-	//Pd11Te2Se2
-	public static final Material MIESSIITE = new Material(
-			"Miessiite", //Material Name
+	public static final Material ZIMBABWEITE = new Material(
+			"Zimbabweite", //Material Name
 			MaterialState.ORE, //State
 			TextureSet.SET_FINE, //Texture Set
-			new short[]{75, 75, 75, 0}, //Material Colour
+			new short[]{193, 187, 131, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			0, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11),
-					new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().SELENIUM, 2)
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().LEAD, 1),
+					new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 4),
+					new MaterialStack(ELEMENT.getInstance().TANTALUM, 4),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 18)
 			});
 	
-	//Kashinite
-	//(Ir,Rh)2S3
-	public static final Material KASHINITE = new Material(
-			"Kashinite", //Material Name
+	public static final Material ZIRCON = new Material(
+			"Zircon", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_SHINY, //Texture Set
-			new short[]{75, 105, 75, 0}, //Material Colour
+			TextureSets.GEM_A.get(), //Texture Set
+			new short[]{195, 19, 19, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			0, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().RHODIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().SULFUR, 3)
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().SILICON, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 4),
 			});
 	
-	//Irarsite
-	//(Ir,Ru,Rh,Pt)AsS
-	public static final Material IRARSITE = new Material(
-			"Irarsite", //Material Name
+	public static final Material ZIRCONILITE = new Material(
+			"Zirconolite", //Material Name
 			MaterialState.ORE, //State
-			TextureSets.ENRICHED.get(), //Texture Set
-			new short[]{125, 105, 105, 0}, //Material Colour
+			TextureSet.SET_FINE, //Texture Set
+			new short[]{45, 26, 0, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			0, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().RHODIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().PLATINUM, 1),
-					new MaterialStack(ELEMENT.getInstance().ARSENIC, 1),
-					new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 14)
 			});
-	
-	//Radiobarite
-	//Radium, Barium, Barite?
-	public static final Material RADIOBARITE = new Material(
-			"Barite (Rd)", //Material Name
+
+	public static final Material ZIRCOPHYLLITE = new Material(
+			"Zircophyllite", //Material Name
 			MaterialState.ORE, //State
-			TextureSet.SET_FLINT, //Texture Set
-			new short[]{205, 205, 205, 0}, //Material Colour
+			TextureSets.REFINED.get(), //Texture Set
+			new short[]{30, 0, 6, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
-			0, //Radiation
-			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().BARIUM, 32),
-					new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().SULFUR, 16),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 15)
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3),
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
+					new MaterialStack(ELEMENT.getInstance().MANGANESE, 7),
+					new MaterialStack(ELEMENT.getInstance().IRON, 7),
+					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().SILICON, 8),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 13),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 7),
 			});
+	
 
-	public static final Material GREENOCKITE = new Material(
-			"Greenockite", //Material Name
+	public static final Material ZIRKELITE = new Material(
+			"Zirkelite", //Material Name
 			MaterialState.ORE, //State
 			TextureSets.GEM_A.get(), //Texture Set
-			new short[]{110, 193, 25, 0}, //Material Colour
+			new short[]{229, 208, 48, 0}, //Material Colour
 			-1,
 			-1,
 			-1,
 			-1,
 			-1, //Radiation
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().CADMIUM, 2),
-					new MaterialStack(ELEMENT.getInstance().SULFUR, 2),
+			new MaterialStack[]{// (Ca,Th,Ce)Zr(Ti,Nb)2O7
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 7)
 			});
-	
 
 	public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material(
 			"Radioactive Mineral Mix", //Material Name