$ Finished my periodic table of elements, it's now 100% accurate.

1 files changed, 29 insertions, 86 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 2af55ab0dd..8d42279e5a 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -25,11 +25,7 @@ public final class ELEMENT {
 	public final Material NITROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Nitrogen);
 	public final Material OXYGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Oxygen);
 	public final Material FLUORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Fluorine);
-	
-	
-	public final Material NEON = new Material("Neon", 25600, new short[]{220, 75, 75}, -248, -246, 10, 10, false, "Ne", 0);//Not a GT Inherited Material
-	
-	
+	public final Material NEON = new Material("Neon", 12800, new short[]{255, 255, 255}, -248, -246, 10, 10, false, "Ne", 0);//Not a GT Inherited Material
 	public final Material SODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium);
 	public final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium);
 	public final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium);
@@ -51,49 +47,29 @@ public final class ELEMENT {
 	public final Material COPPER = MaterialUtils.generateMaterialFromGtENUM(Materials.Copper);
 	public final Material ZINC = MaterialUtils.generateMaterialFromGtENUM(Materials.Zinc);
 	public final Material GALLIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Gallium);
-	
-	
-	public final Material GERMANIUM = new Material("Germanium", 51200, new short[]{255, 250, 205}, 937, 2830, 32, 41, false, "Ge", 0);//Not a GT Inherited Material
-	
-	
+	public final Material GERMANIUM = new Material("Germanium", 51200, new short[]{200, 200, 200}, 937, 2830, 32, 41, false, "Ge", 0);//Not a GT Inherited Material
 	public final Material ARSENIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Arsenic);
-	
-	
-	public final Material SELENIUM = new Material("Selenium", 51200, new short[]{255, 250, 205}, 217, 685, 34, 45, false, "Se", 0);//Not a GT Inherited Material
-	public final Material BROMINE = new Material("Bromine", 51200, new short[]{255, 250, 205}, -7, 58, 35, 45, false, "Br", 0);//Not a GT Inherited Material
-	public final Material KRYPTON = new Material("Krypton", 51200, new short[]{255, 250, 205}, -157, -153, 36, 48, false, "Kr", 0);//Not a GT Inherited Material
-	
-	
+	public final Material SELENIUM = new Material("Selenium", 51200, new short[]{190, 190, 190}, 217, 685, 34, 45, false, "Se", 0);//Not a GT Inherited Material
+	public final Material BROMINE = new Material("Bromine", 51200, new short[]{200, 25, 25}, -7, 58, 35, 45, false, "Br", 0);//Not a GT Inherited Material
+	public final Material KRYPTON = new Material("Krypton", 12800, new short[]{255, 255, 255}, -157, -153, 36, 48, false, "Kr", 0);//Not a GT Inherited Material
 	public final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium);
 	public final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Strontium);
 	public final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium);
-	public final Material ZIRCONIUM = new Material("Zirconium", 25600, new short[]{255, 250, 205}, 1855, 4377, 40, 51, false, "Zr", 0);//Not a GT Inherited Material
+	public final Material ZIRCONIUM = new Material("Zirconium", 51200, new short[]{255, 250, 205}, 1855, 4377, 40, 51, false, "Zr", 0);//Not a GT Inherited Material
 	public final Material NIOBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Niobium);
 	public final Material MOLYBDENUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Molybdenum);
-	
-	
-	public final Material TECHNETIUM = new Material("Technetium", 25600, new short[]{255, 250, 205}, 2200, 4877, 43, 55, false, "Tc", 0);//Not a GT Inherited Material
-	public final Material RUTHENIUM  = new Material("Ruthenium", 25600, new short[]{255, 250, 205}, 2250, 3900, 44, 57, false, "Ru", 0);//Not a GT Inherited Material
-	public final Material RHODIUM = new Material("Rhodium", 25600, new short[]{255, 250, 205}, 1966, 3727, 45, 58, false, "Rh", 0);//Not a GT Inherited Material
-	
-	
+	public final Material TECHNETIUM = new Material("Technetium", 25600, new short[]{220, 220, 220}, 2200, 4877, 43, 55, false, "Tc", 2);//Not a GT Inherited Material
+	public final Material RUTHENIUM  = new Material("Ruthenium", 25600, new short[]{220, 220, 220}, 2250, 3900, 44, 57, false, "Ru", 0);//Not a GT Inherited Material
+	public final Material RHODIUM = new Material("Rhodium", 25600, new short[]{220, 220, 220}, 1966, 3727, 45, 58, false, "Rh", 0);//Not a GT Inherited Material
 	public final Material PALLADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Palladium);
 	public final Material SILVER = MaterialUtils.generateMaterialFromGtENUM(Materials.Silver);
 	public final Material CADMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cadmium);
 	public final Material INDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Indium);
 	public final Material TIN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tin);
-
-
-	//Antimony - to the end
-
 	public final Material ANTIMONY = MaterialUtils.generateMaterialFromGtENUM(Materials.Antimony);
-	
-	
-	public final Material TELLURIUM = new Material("Tellurium", 25600, new short[]{255, 250, 205}, 449, 989, 52, 76, false, "Te", 0);//Not a GT Inherited Material
-	public final Material IODINE = new Material("Iodine", 25600, new short[]{255, 250, 205}, 114, 184, 53, 74, false, "I", 0);//Not a GT Inherited Material
-	public final Material XENON = new Material("Xenon", 25600, new short[]{255, 250, 205}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material
-	
-	
+	public final Material TELLURIUM = new Material("Tellurium", 25600, new short[]{210, 210, 210}, 449, 989, 52, 76, false, "Te", 0);//Not a GT Inherited Material
+	public final Material IODINE = new Material("Iodine", 25600, new short[]{96, 96, 96}, 114, 184, 53, 74, false, "I", 0);//Not a GT Inherited Material
+	public final Material XENON = new Material("Xenon", 12800, new short[]{255, 255, 255}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material
 	public final Material CESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium);	
 	public final Material BARIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Barium);
 	public final Material LANTHANUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lanthanum);
@@ -105,79 +81,46 @@ public final class ELEMENT {
 	public final Material EUROPIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Europium);
 	public final Material GADOLINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Gadolinium);
 	public final Material TERBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Terbium);
-	
-	public final Material DYSPROSIUM = new Material("Dysprosium", 25600, new short[]{255, 250, 205}, 1412, 2562, 66, 97, false, "Dy", 0);//Not a GT Inherited Material
-	
+	public final Material DYSPROSIUM = new Material("Dysprosium", 25600, new short[]{180, 180, 180}, 1412, 2562, 66, 97, false, "Dy", 0);//Not a GT Inherited Material
 	public final Material HOLMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Holmium);
 	public final Material ERBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Erbium);
 	public final Material THULIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thulium);
 	public final Material YTTERBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Ytterbium);
 	public final Material LUTETIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lutetium);
-	
-	public final Material HAFNIUM = new Material("Hafnium", 25600, new short[]{255, 250, 205}, 2150, 5400, 72, 106, false, "Hf", 0);//Not a GT Inherited Material
-
-
-
-
-
+	public final Material HAFNIUM = new Material("Hafnium", 25600, new short[]{128, 128, 128}, 2150, 5400, 72, 106, false, "Hf", 0);//Not a GT Inherited Material
 
 	//Second 50 elements
 	public final Material TANTALUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Tantalum);
 	public final Material TUNGSTEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tungsten);
-	
-	
-	public final Material RHENIUM = new Material("Rhenium", 25600, new short[]{255, 250, 205}, 3180, 3627, 75, 111, false, "Re", 0);//Not a GT Inherited Material
-	
-	
+	public final Material RHENIUM = new Material("Rhenium", 25600, new short[]{150, 150, 150}, 3180, 3627, 75, 111, false, "Re", 0);//Not a GT Inherited Material
 	public final Material OSMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmium);
 	public final Material IRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Iridium);	
 	public final Material PLATINUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum);	
 	public final Material GOLD = MaterialUtils.generateMaterialFromGtENUM(Materials.Gold);	
 	public final Material MERCURY = MaterialUtils.generateMaterialFromGtENUM(Materials.Mercury); //Mercury
-	
-	
-	public final Material THALLIUM = new Material("Thallium", 25600, new short[]{255, 250, 205}, 304, 1457, 81, 123, false, "tl", 0);//Not a GT Inherited Material
-	
-	
+	public final Material THALLIUM = new Material("Thallium", 25600, new short[]{175, 175, 175}, 304, 1457, 81, 123, false, "tl", 0);//Not a GT Inherited Material
 	public final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead);	
 	public final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth);
-	
-	
-	public final Material POLONIUM = new Material("Polonium", 25600, new short[]{255, 250, 205}, 254, 962, 84, 125, false, "Po", 0);//Not a GT Inherited Material
-	public final Material ASTATINE = new Material("Astatine", 25600, new short[]{255, 250, 205}, 302, 337, 85, 125, false, "At", 0);//Not a GT Inherited Material
-	
-	
+	public final Material POLONIUM = new Material("Polonium", 25600, new short[]{180, 170, 180}, 254, 962, 84, 125, false, "Po", 1);//Not a GT Inherited Material
+	public final Material ASTATINE = new Material("Astatine", 25600, new short[]{170, 180, 170}, 302, 337, 85, 125, false, "At", 1);//Not a GT Inherited Material
 	public final Material RADON = MaterialUtils.generateMaterialFromGtENUM(Materials.Radon);
-	
-	
-	public final Material FRANCIUM = new Material("Francium", 25600, new short[]{255, 250, 205}, 27, 677, 87, 136, false, "Fr", 0);//Not a GT Inherited Material
-	public final Material RADIUM = new Material("Radium", 25600, new short[]{255, 250, 205}, 700, 1737, 88, 138, false, "Ra", 0);//Not a GT Inherited Material
-	public final Material ACTINIUM = new Material("Actinium", 25600, new short[]{255, 250, 205}, 1050, 3200, 89, 138, false, "Ac", 0);//Not a GT Inherited Material
-	
-	public final Material THORIUM = new Material("Thorium", 51200, Materials.Thorium.mRGBa, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("Th"), 1);
-			
-	public final Material PROTACTINIUM = new Material("Protactinium", 25600, new short[]{255, 250, 205}, 1568, 4027, 91, 140, false, "Pa", 0);//Not a GT Inherited Material
-	
+	public final Material FRANCIUM = new Material("Francium", 25600, new short[]{170, 160, 170}, 27, 677, 87, 136, false, "Fr", 1);//Not a GT Inherited Material
+	public final Material RADIUM = new Material("Radium", 25600, new short[]{165, 165, 165}, 700, 1737, 88, 138, false, "Ra", 1);//Not a GT Inherited Material
+	public final Material ACTINIUM = new Material("Actinium", 25600, new short[]{150, 165, 165}, 1050, 3200, 89, 138, false, "Ac", 1);//Not a GT Inherited Material
+	public final Material THORIUM = new Material("Thorium", 51200, Materials.Thorium.mRGBa, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("Th"), 1);	
+	public final Material PROTACTINIUM = new Material("Protactinium", 25600, new short[]{190, 150, 170}, 1568, 4027, 91, 140, false, "Pa", 1);//Not a GT Inherited Material
 	public final Material URANIUM238 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium);
 	public final Material URANIUM235 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium235);
-
-	public final Material NEPTUNIUM = new Material("Neptunium", 25600, new short[]{255, 250, 205}, 640, 3902, 93, 144, false, "Np", 0);//Not a GT Inherited Material
-	
+	public final Material NEPTUNIUM = new Material("Neptunium", 25600, new short[]{200, 220, 205}, 640, 3902, 93, 144, false, "Np", 2);//Not a GT Inherited Material
 	public final Material PLUTONIUM244 = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium);
 	public final Material PLUTONIUM241 = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium241);
 	public final Material AMERICIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Americium); //Americium
+	public final Material CURIUM = new Material("Curium", 25600, new short[]{175, 85, 110}, 1340, 3110, 96, 151, false, "Cm", 3);//Not a GT Inherited Material
+	public final Material BERKELIUM = new Material("Berkelium", 25600, new short[]{110, 250, 85}, 985, 710, 97, 150, false, "Bk", 4);//Not a GT Inherited Material
+	public final Material CALIFORNIUM = new Material("Californium", 25600, new short[]{85, 110, 205}, 899, 1472, 98, 153, false, "Cf", 4);//Not a GT Inherited Material
+	public final Material EINSTEINIUM = new Material("Einsteinium", 25600, new short[]{255, 85, 110}, 860, 3500, 99, 153, false, "Es", 5);//Not a GT Inherited Material //Boiling Point is made up
+	public final Material FERMIUM = new Material("Fermium", 25600, new short[]{75, 90, 25}, 1527, 3850, 100, 157, false, "Fm", 5);//Not a GT Inherited Material //Boiling Point is made up
 	
-	
-	public final Material CURIUM = new Material("Curium", 25600, new short[]{255, 250, 205}, 1340, 3110, 96, 151, false, "Cm", 0);//Not a GT Inherited Material
-	public final Material BERKELIUM = new Material("Berkelium", 25600, new short[]{255, 250, 205}, 985, 710, 97, 150, false, "Bk", 0);//Not a GT Inherited Material
-	public final Material CALIFORNIUM = new Material("Californium", 25600, new short[]{255, 250, 205}, 899, 1472, 98, 153, false, "Cf", 0);//Not a GT Inherited Material
-	public final Material EINSTEINIUM = new Material("Einsteinium", 25600, new short[]{255, 250, 205}, 860, 3500, 99, 153, false, "Es", 0);//Not a GT Inherited Material //Boiling Point is made up
-	public final Material FERMIUM = new Material("Fermium", 25600, new short[]{255, 250, 205}, 1527, 3850, 100, 157, false, "Fm", 0);//Not a GT Inherited Material //Boiling Point is made up
-	
-	
-	
-
-
 	//Misc
 	public final Material AER = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedAir);
 	public final Material IGNIS = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire);