2 files changed, 85 insertions, 26 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 642e402917..975a035628 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -35,9 +35,8 @@ public final class ALLOY {
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.URANIUM, 45),
-					new MaterialStack(ELEMENT.URANIUM, 45),
-					new MaterialStack(ELEMENT.TITANIUM, 10)
+					new MaterialStack(ELEMENT.URANIUM, 9),
+					new MaterialStack(ELEMENT.TITANIUM, 1)
 			});
 
 	public static final Material TANTALLOY_60 = new Material(
@@ -50,8 +49,7 @@ public final class ALLOY {
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.TUNGSTEN, 8),
-					new MaterialStack(ELEMENT.TANTALUM, 46),
+					new MaterialStack(ELEMENT.TUNGSTEN, 4),
 					new MaterialStack(ELEMENT.TANTALUM, 46)
 			});
 
@@ -70,17 +68,6 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.YTTRIUM, 8)
 			});
 
-	public static final Material QUANTUM = new Material(
-			"Quantum", //Material Name
-			new short[]{128, 128, 128, 0}, //Material Colour
-			9999, //Melting Point in C
-			0, //Boiling Point in C
-			100, //Protons
-			100, //Neutrons
-			true, //Uses Blast furnace?
-			//Material Stacks with Percentage of required elements.
-			null);
-
 	public static final Material BRONZE = new Material(
 			"Bronze", //Material Name
 			new short[]{128, 128, 128, 0}, //Material Colour
@@ -522,5 +509,59 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.HYDROGEN, 10)
 			});	//Material Stacks with Percentage of required elements.
 
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	//Quantum
+	public static final Material QUANTUM = new Material(
+			"Quantum", //Material Name
+			new short[]{128, 128, 255, 50}, //Material Colour
+			9999, //Melting Point in C
+			25000, //Boiling Point in C
+			150, //Protons
+			200, //Neutrons
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ALLOY.LEAGRISIUM, 25),
+					new MaterialStack(ALLOY.ENERGYCRYSTAL, 25),
+					new MaterialStack(ALLOY.ZIRCONIUM_CARBIDE, 25),
+					new MaterialStack(ELEMENT.MANGANESE, 5),
+					new MaterialStack(ELEMENT.MOLYBDENUM, 5),
+					new MaterialStack(ELEMENT.TUNGSTEN, 5),
+					new MaterialStack(ELEMENT.BERYLLIUM, 5),
+					new MaterialStack(ELEMENT.BISMUTH, 5)
+			});
+	
+	
 
 }
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 104414ee4c..e8de7166c2 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -168,22 +168,40 @@ public class Material {
 			this.vChemicalFormula = "??";
 		}
 
-		this.vMoltenFluid = generateFluid();
+		Materials isValid = Materials.get(getLocalizedName());
+		if (isValid == Materials._NULL){
+			this.vMoltenFluid = generateFluid();
+		}
+		else {
+			if (isValid.mFluid != null){
+				this.vMoltenFluid = isValid.mFluid;
+			}
+			else if (isValid.mGas != null){
+				this.vMoltenFluid = isValid.mGas;
+			}
+			else if (isValid.mPlasma != null){
+				this.vMoltenFluid = isValid.mPlasma;
+			}
+			else {
+				this.vMoltenFluid = generateFluid();
+			}
+		}
+		
 
 
-		dataVar = MathUtils.generateSingularRandomHexValue();
+		//dataVar = MathUtils.generateSingularRandomHexValue();
 
 		String ratio = "";
 		if (vSmallestRatio != null)
-		for (int hu=0;hu<vSmallestRatio.length;hu++){
-			if (ratio.equals("")){
-				ratio = String.valueOf(vSmallestRatio[hu]);
+			for (int hu=0;hu<vSmallestRatio.length;hu++){
+				if (ratio.equals("")){
+					ratio = String.valueOf(vSmallestRatio[hu]);
+				}
+				else {
+					ratio = ratio + ":" +vSmallestRatio[hu];
+				}		
 			}
-			else {
-				ratio = ratio + ":" +vSmallestRatio[hu];
-			}		
-		}
-		
+
 		Utils.LOG_INFO("Creating a Material instance for "+materialName);
 		Utils.LOG_INFO("Formula: "+vChemicalFormula + " Smallest Stack: "+smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio);
 		Utils.LOG_INFO("Protons: "+vProtons);