$ Fixed Fluids properly and finally.

$ Changed Alloy Boiling points.
$ Rewrote the dust recipe handlers.

5 files changed, 97 insertions, 128 deletions

diff --git a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
index 1e76e5d5e1..ebd84f9654 100644
--- a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
+++ b/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
@@ -32,7 +32,7 @@ public class BlockFluidBase extends BlockFluidClassic {
             short[] tempColour = material.getRGBA(); 
             this.colour = Utils.rgbtoHexValue(tempColour[0], tempColour[1], tempColour[2]);
             this.fluidMaterial = material;
-            setCreativeTab(AddToCreativeTab.tabMisc);
+            setCreativeTab(AddToCreativeTab.tabOther);
             this.displayName = material.getLocalizedName();
             LanguageRegistry.addName(this, "Molten "+displayName+" ["+MathUtils.celsiusToKelvin(fluidMaterial.getBoilingPoint_C())+"K]");
     		this.setBlockName(GetProperName());
@@ -43,7 +43,7 @@ public class BlockFluidBase extends BlockFluidClassic {
             super(fluid, net.minecraft.block.material.Material.water);
             short[] tempColour = colour; 
             this.colour = Utils.rgbtoHexValue(tempColour[0], tempColour[1], tempColour[2]);
-            setCreativeTab(AddToCreativeTab.tabMisc);
+            setCreativeTab(AddToCreativeTab.tabOther);
             this.displayName = fluidName;
             LanguageRegistry.addName(this, "Molten "+displayName);
     		this.setBlockName(GetProperName());
@@ -100,4 +100,8 @@ public class BlockFluidBase extends BlockFluidClassic {
 		return tempIngot;
 	}
     
+    public Material getFluidMaterial(){
+    	return fluidMaterial;
+    }
+    
 }		
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index b94b7759da..0342f7f104 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -30,6 +30,7 @@ public class BaseItemDust extends Item{
 	String name = "";
 	private int mTier;
 	private Material dustInfo;
+	private String oredictName;
 
 	public BaseItemDust(String unlocalizedName, String materialName, Material matInfo, int colour, String pileSize, boolean blastFurnaceRequired, int tier, int sRadioactivity) {
 		setUnlocalizedName(unlocalizedName);
@@ -70,6 +71,7 @@ public class BaseItemDust extends Item{
 			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
 		}		
 		if (temp != null && temp != ""){
+			oredictName = temp;
 			GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this));
 		}
 		addMixerRecipe();
@@ -133,120 +135,75 @@ public class BaseItemDust extends Item{
 
 
 	private void addMixerRecipe(){
-		ItemStack tempStack = UtilsItems.getSimpleStack(this);
-		ItemStack tempOutput = null;
+		
+		ItemStack thisItem;		
+		ItemStack normalDust = dustInfo.getDust(1);
+		ItemStack smallDust = dustInfo.getSmallDust(1);
+		ItemStack tinyDust = dustInfo.getTinyDust(1);
+		
 		ItemStack[] inputStacks = dustInfo.getMaterialComposites();
-		ItemStack[] outputStacks = {dustInfo.getDust(10)};
-		String temp = "";
-		Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName());
-		if (getUnlocalizedName().toLowerCase().contains("item.")){
-			temp = getUnlocalizedName().replace("item.", "");
-			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
-		}
-		else {
-			temp = getUnlocalizedName();
-		}
-		if (temp.toLowerCase().contains("dusttiny")){
-			temp = temp.replace("itemDustTiny", "dust");
-			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+		ItemStack outputStacks = dustInfo.getDust(10);
+		
+		if (oredictName.contains("dustTiny")){
+			thisItem = tinyDust;
+			ItemStack normalStack = dustInfo.getDust(1);
+			ItemStack tinyStack = dustInfo.getTinyDust(9);
+			Utils.LOG_INFO("Generating a 9 Tiny dust to 1 Dust recipe for "+materialName);
+			UtilsRecipe.recipeBuilder(
+					thisItem,	thisItem, thisItem, 
+					thisItem, thisItem, thisItem, 
+					thisItem, thisItem, thisItem,
+					normalStack);
+			
+			Utils.LOG_INFO("Generating a 9 Tiny dust from 1 Dust recipe for "+materialName);
+			UtilsRecipe.recipeBuilder(
+					normalStack, null, null, 
+					null, null, null, 
+					null, null, null,
+					tinyStack);
+			
 		}
-		else if (temp.toLowerCase().contains("dustsmall")){
-			temp = temp.replace("itemDustSmall", "dust");
-			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+		else if (oredictName.contains("dustSmall")){
+			thisItem = smallDust;
+			ItemStack normalStack = dustInfo.getDust(1);
+			ItemStack smallStack = dustInfo.getSmallDust(4);
+			
+			Utils.LOG_INFO("Generating a 4 Small dust to 1 Dust recipe for "+materialName);
+			UtilsRecipe.recipeBuilder(
+					thisItem, thisItem, null, 
+					thisItem, thisItem, null, 
+					null, null, null,
+					normalStack);
+			
+			Utils.LOG_INFO("Generating a 4 Small dust from 1 Dust recipe for "+materialName);
+			UtilsRecipe.recipeBuilder(
+					null, normalStack, null, 
+					null, null, null, 
+					null, null, null,
+					smallStack);
+			
 		}
 		else {
-			temp = temp.replace("itemD", "d");
-			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
-		}		
-		if (temp != null && temp != "" && !temp.equals("")){
+			thisItem = normalDust;
+		}			
 
-			if (getUnlocalizedName().toLowerCase().contains("dusttiny") || getUnlocalizedName().toLowerCase().contains("dustsmall")){
-				tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
-			}
-			else {				
-				if (outputStacks[0] != null){
-					Utils.LOG_WARNING("Getting output dusts for mixer recipe. Checking ENUM, got: "+outputStacks[0].toString());
-					tempOutput = outputStacks[0];
-				}
-				else {
-					Utils.LOG_WARNING("Getting output dusts for mixer recipe. Enum check failed, failback item is: "+temp);
-					tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
-				}
-			}
-
-		}
-		
-		if (tempOutput == null){
-			tempOutput = dustInfo.getDust(1);
-		}
-
-		if (tempOutput != null){
-			if (getUnlocalizedName().contains("DustTiny")){
-				Utils.LOG_WARNING("Generating a 9 Tiny dust to 1 Dust recipe for "+materialName);
-				UtilsRecipe.addShapelessGregtechRecipe(tempOutput,
-						tempStack, tempStack, tempStack,
-						tempStack, tempStack, tempStack,
-						tempStack, tempStack, tempStack);
-			}
-			else if (getUnlocalizedName().contains("DustSmall")){
-				Utils.LOG_WARNING("Generating a 4 Small dust to 1 Dust recipe for "+materialName);
-				UtilsRecipe.addShapelessGregtechRecipe(tempOutput,
-						tempStack, tempStack, null,
-						tempStack, tempStack, null,
-						null, null, null);
-			}
-			else {
-				Utils.LOG_WARNING("Generating a Dust recipe for "+materialName+" in the mixer.");		
-
-
-				int i = 0;
-				if (inputStacks.length >= 2){
-					for (ItemStack is : inputStacks){
-						if (is != null){
-							Utils.LOG_WARNING("Found "+is.getDisplayName()+" as an input for mixer recipe.");		
-							if (is.getDisplayName().toLowerCase().contains("tell alkalus")){
-								ItemStack tempStackForAName = inputStacks[i];
-								String[] inputList = UtilsItems.getArrayStackNamesAsArray(dustInfo.getMaterialComposites());
-								int[] inputSizes = dustInfo.getMaterialCompositeStackSizes();
-								inputStacks[i] = UtilsItems.getItemStackOfAmountFromOreDict(inputList[i], 1);
-								Utils.LOG_WARNING("Swapping input slot "+i+" which contains "+tempStackForAName.getDisplayName()+" with "+inputStacks[i].getDisplayName()+".");	
-							}
-
-						}
-
-						else {
-							Utils.LOG_WARNING("Input "+i+" was null.");						
-						}
-
-						i++;
-					}
-				}
+		if (thisItem == normalDust){				
+				Utils.LOG_WARNING("Generating a Dust recipe for "+materialName+" in the mixer.");
 
 				if (inputStacks.length != 0){
 					GT_Values.RA.addMixerRecipe(
 							inputStacks[0], inputStacks[1],
 							inputStacks[2], inputStacks[3],
 							null, null,
-							tempOutput,
+							outputStacks,
 							8*mTier*20, 8*mTier*2);
 				}
 				else {
 					return;
 				}
-
-
-
-				/*GT_Values.RA.addMixerRecipe(
-						GT_Utility.copyAmount(inputStacks[0].stackSize, new Object[]{inputStacks[0]}), GT_Utility.copyAmount(inputStacks[1].stackSize, new Object[]{inputStacks[1]}),
-						GT_Utility.copyAmount(inputStacks[2].stackSize, new Object[]{inputStacks[2]}), GT_Utility.copyAmount(inputStacks[3].stackSize, new Object[]{inputStacks[3]}), 
-						null, null,
-						tempOutput,
-						8*mTier*20, 8*mTier*2);*/
-
 			}
 		}
 
-	}
 
 	private void addMacerationRecipe(){
 		Utils.LOG_WARNING("Adding recipe for "+materialName+" Dusts");
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index b46c84d2ba..a4cdd77d59 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -29,7 +29,7 @@ public final class ALLOY {
 			"Staballoy", //Material Name
 			new short[]{68, 75, 66, 0}, //Material Colour
 			3450, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.URANIUM.getBoilingPoint_C()*9)+(ELEMENT.TITANIUM.getBoilingPoint_C()*1))/10, //Boiling Point in C
 			((ELEMENT.URANIUM.getProtons()*9)+ELEMENT.TITANIUM.getProtons())/10, //Protons
 			((ELEMENT.URANIUM.getNeutrons()*9)+ELEMENT.TITANIUM.getNeutrons())/10, //Neutrons
 			true, //Uses Blast furnace?
@@ -43,7 +43,7 @@ public final class ALLOY {
 			"Tantalloy-60", //Material Name
 			new short[]{66, 75, 166, 0}, //Material Colour
 			3025, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.TUNGSTEN.getBoilingPoint_C()*1)+(ELEMENT.TANTALUM.getBoilingPoint_C()*8)+(ELEMENT.TITANIUM.getBoilingPoint_C()*1))/10, //Boiling Point in C
 			((ELEMENT.TUNGSTEN.getProtons()*1)+(ELEMENT.TANTALUM.getProtons()*8)+(ELEMENT.TITANIUM.getProtons()*1))/10, //Protons
 			((ELEMENT.TUNGSTEN.getNeutrons()*1)+(ELEMENT.TANTALUM.getNeutrons()*8)+(ELEMENT.TITANIUM.getNeutrons()*1))/10, //Neutrons
 			true, //Uses Blast furnace?
@@ -58,7 +58,7 @@ public final class ALLOY {
 			"Tantalloy-61", //Material Name
 			new short[]{122, 135, 196, 0}, //Material Colour
 			3030, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.TUNGSTEN.getBoilingPoint_C()*1)+(ELEMENT.TANTALUM.getBoilingPoint_C()*7)+(ELEMENT.TITANIUM.getBoilingPoint_C()*1)+(ELEMENT.YTTRIUM.getBoilingPoint_C()*1))/10, //Boiling Point in C
 			((ELEMENT.TUNGSTEN.getProtons()*1)+(ELEMENT.TANTALUM.getProtons()*7)+(ELEMENT.TITANIUM.getProtons()*1)+(ELEMENT.YTTRIUM.getProtons()*1))/10, //Protons
 			((ELEMENT.TUNGSTEN.getNeutrons()*1)+(ELEMENT.TANTALUM.getNeutrons()*7)+(ELEMENT.TITANIUM.getNeutrons()*1)+(ELEMENT.YTTRIUM.getNeutrons()*1))/10, //Neutrons
 			true, //Uses Blast furnace?
@@ -85,7 +85,7 @@ public final class ALLOY {
 			"Bronze", //Material Name
 			new short[]{128, 128, 128, 0}, //Material Colour
 			((ELEMENT.TIN.getMeltingPoint_C()*1)+(ELEMENT.COPPER.getMeltingPoint_C()*3))/4, //Melting point in C
-			0, //Boiling Point in C
+			((ELEMENT.TIN.getBoilingPoint_C()*1)+(ELEMENT.COPPER.getBoilingPoint_C()*3))/4, //Boiling Point in C
 			((ELEMENT.TIN.getProtons()*1)+(ELEMENT.COPPER.getProtons()*3))/4, //Protons
 			((ELEMENT.TIN.getNeutrons()*1)+(ELEMENT.COPPER.getNeutrons()*3))/4, //Neutrons
 			false, //Uses Blast furnace?
@@ -99,7 +99,7 @@ public final class ALLOY {
 			"Tumbaga", //Material Name
 			new short[]{255,178,15, 0}, //Material Colour
 			((ELEMENT.GOLD.getMeltingPoint_C()*7)+(ELEMENT.COPPER.getMeltingPoint_C()*3))/10, //Melting point in C
-			0, //Boiling Point in C
+			((ELEMENT.GOLD.getBoilingPoint_C()*7)+(ELEMENT.COPPER.getBoilingPoint_C()*3))/10, //Boiling Point in C
 			((ELEMENT.GOLD.getProtons()*7)+(ELEMENT.COPPER.getProtons()*3))/10, //Protons
 			((ELEMENT.GOLD.getNeutrons()*7)+(ELEMENT.COPPER.getNeutrons()*3))/10, //Neutrons
 			false, //Uses Blast furnace?
@@ -113,7 +113,7 @@ public final class ALLOY {
 			"Potin", //Material Name
 			new short[]{201,151,129, 0}, //Material Colour
 			((ELEMENT.LEAD.getMeltingPoint_C()*4)+(ALLOY.BRONZE.getMeltingPoint_C()*4)+(ELEMENT.TIN.getMeltingPoint_C()*2))/10, //Melting point in C
-			0, //Boiling Point in C
+			((ELEMENT.LEAD.getBoilingPoint_C()*4)+(ALLOY.BRONZE.getBoilingPoint_C()*4)+(ELEMENT.TIN.getBoilingPoint_C()*2))/10, //Boiling Point in C
 			((ELEMENT.LEAD.getProtons()*4)+(ALLOY.BRONZE.getProtons()*4)+(ELEMENT.TIN.getProtons()*2))/10, //Protons
 			((ELEMENT.LEAD.getNeutrons()*4)+(ALLOY.BRONZE.getNeutrons()*4)+(ELEMENT.TIN.getNeutrons()*2))/10, //Neutrons
 			false, //Uses Blast furnace?
@@ -139,7 +139,7 @@ public final class ALLOY {
 			"Inconel-625", //Material Name
 			new short[]{128, 200, 128, 0}, //Material Colour
 			1425, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.NICKEL.getBoilingPoint_C()*6)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*2)+(ELEMENT.IRON.getBoilingPoint_C()*1)+(ELEMENT.MOLYBDENUM.getBoilingPoint_C()*1))/10, //Boiling Point in C
 			((ELEMENT.NICKEL.getProtons()*6)+(ELEMENT.CHROMIUM.getProtons()*2)+(ELEMENT.IRON.getProtons()*1)+(ELEMENT.MOLYBDENUM.getProtons()*1))/10, //Protons
 			((ELEMENT.NICKEL.getNeutrons()*6)+(ELEMENT.CHROMIUM.getNeutrons()*2)+(ELEMENT.IRON.getNeutrons()*1)+(ELEMENT.MOLYBDENUM.getNeutrons()*1))/10, //Neutrons
 			true, //Uses Blast furnace?
@@ -155,7 +155,7 @@ public final class ALLOY {
 			"Inconel-690", //Material Name
 			new short[]{118, 220, 138, 0}, //Material Colour
 			1425, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.NICKEL.getBoilingPoint_C()*6)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*2)+(ELEMENT.NIOBIUM.getBoilingPoint_C()*1)+(ELEMENT.MOLYBDENUM.getBoilingPoint_C()*1))/10, //Boiling Point in C
 			((ELEMENT.NICKEL.getProtons()*6)+(ELEMENT.CHROMIUM.getProtons()*2)+(ELEMENT.NIOBIUM.getProtons()*1)+(ELEMENT.MOLYBDENUM.getProtons()*1))/10, //Protons
 			((ELEMENT.NICKEL.getNeutrons()*6)+(ELEMENT.CHROMIUM.getNeutrons()*2)+(ELEMENT.NIOBIUM.getNeutrons()*1)+(ELEMENT.MOLYBDENUM.getNeutrons()*1))/10, //Neutrons
 			true, //Uses Blast furnace?
@@ -171,7 +171,7 @@ public final class ALLOY {
 			"Inconel-792", //Material Name
 			new short[]{108, 240, 118, 0}, //Material Colour
 			1425, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.NICKEL.getBoilingPoint_C()*6)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*1)+(ELEMENT.IRON.getBoilingPoint_C()*1)+(ELEMENT.ALUMINIUM.getBoilingPoint_C()*2))/10, //Boiling Point in C
 			((ELEMENT.NICKEL.getProtons()*6)+(ELEMENT.CHROMIUM.getProtons()*1)+(ELEMENT.IRON.getProtons()*1)+(ELEMENT.ALUMINIUM.getProtons()*2))/10, //Protons
 			((ELEMENT.NICKEL.getNeutrons()*6)+(ELEMENT.CHROMIUM.getNeutrons()*1)+(ELEMENT.IRON.getNeutrons()*1)+(ELEMENT.ALUMINIUM.getNeutrons()*2))/10, //Neutrons
 			true, //Uses Blast furnace?
@@ -187,7 +187,7 @@ public final class ALLOY {
 			"Steel", //Material Name
 			new short[]{180, 180, 20, 0}, //Material Colour
 			((ELEMENT.CARBON.getMeltingPoint_C()*5)+(ELEMENT.IRON.getMeltingPoint_C()*95))/100, //Melting point in C
-			0, //Boiling Point in C
+			((ELEMENT.CARBON.getBoilingPoint_C()*5)+(ELEMENT.IRON.getBoilingPoint_C()*95))/100, //Boiling Point in C
 			((ELEMENT.CARBON.getProtons()*5)+(ELEMENT.IRON.getProtons()*95))/100, //Protons
 			((ELEMENT.CARBON.getNeutrons()*5)+(ELEMENT.IRON.getNeutrons()*95))/100, //Neutrons
 			true, //Uses Blast furnace?
@@ -200,8 +200,8 @@ public final class ALLOY {
 	public static final Material ZERON_100 = new Material(
 			"Zeron-100", //Material Name
 			new short[]{180, 180, 20, 0}, //Material Colour
-			(((ELEMENT.CHROMIUM.getMeltingPoint_C()*25)+(ELEMENT.NICKEL.getMeltingPoint_C()*6)+(ELEMENT.COBALT.getMeltingPoint_C()*9)+(ALLOY.STEEL.getMeltingPoint_C()*60))/100), //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.CHROMIUM.getMeltingPoint_C()*25)+(ELEMENT.NICKEL.getMeltingPoint_C()*6)+(ELEMENT.COBALT.getMeltingPoint_C()*9)+(ALLOY.STEEL.getMeltingPoint_C()*60))/100, //Melting Point in C
+			((ELEMENT.CHROMIUM.getBoilingPoint_C()*25)+(ELEMENT.NICKEL.getBoilingPoint_C()*6)+(ELEMENT.COBALT.getBoilingPoint_C()*9)+(ALLOY.STEEL.getBoilingPoint_C()*60))/100, //Boiling Point in C
 			((ELEMENT.CHROMIUM.getProtons()*25)+(ELEMENT.NICKEL.getProtons()*6)+(ELEMENT.COBALT.getProtons()*9)+(ALLOY.STEEL.getProtons()*60))/100, //Protons
 			((ELEMENT.CHROMIUM.getNeutrons()*25)+(ELEMENT.NICKEL.getNeutrons()*6)+(ELEMENT.COBALT.getNeutrons()*9)+(ALLOY.STEEL.getNeutrons()*60))/100, //Neutrons
 			true, //Uses Blast furnace?
@@ -217,7 +217,7 @@ public final class ALLOY {
 			"Maraging Steel 250", //Material Name
 			new short[]{140, 140, 140, 0}, //Material Colour
 			1413, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.TITANIUM.getBoilingPoint_C()*5)+(ELEMENT.NICKEL.getBoilingPoint_C()*16)+(ELEMENT.COBALT.getBoilingPoint_C()*9)+(ALLOY.STEEL.getBoilingPoint_C()*70))/100, //Boiling Point in C
 			((ELEMENT.TITANIUM.getProtons()*5)+(ELEMENT.NICKEL.getProtons()*16)+(ELEMENT.COBALT.getProtons()*9)+(ALLOY.STEEL.getProtons()*70))/100, //Protons
 			((ELEMENT.TITANIUM.getNeutrons()*5)+(ELEMENT.NICKEL.getNeutrons()*16)+(ELEMENT.COBALT.getNeutrons()*9)+(ALLOY.STEEL.getNeutrons()*70))/100, //Neutrons
 			true, //Uses Blast furnace?
@@ -233,7 +233,7 @@ public final class ALLOY {
 			"Maraging Steel 300", //Material Name
 			new short[]{150, 150, 150, 0}, //Material Colour
 			1413, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.TITANIUM.getBoilingPoint_C()*10)+(ELEMENT.NICKEL.getBoilingPoint_C()*21)+(ELEMENT.COBALT.getBoilingPoint_C()*14)+(ALLOY.STEEL.getBoilingPoint_C()*55))/100, //Boiling Point in C
 			((ELEMENT.TITANIUM.getProtons()*10)+(ELEMENT.NICKEL.getProtons()*21)+(ELEMENT.COBALT.getProtons()*14)+(ALLOY.STEEL.getProtons()*55))/100, //Protons
 			((ELEMENT.TITANIUM.getNeutrons()*10)+(ELEMENT.NICKEL.getNeutrons()*21)+(ELEMENT.COBALT.getNeutrons()*14)+(ALLOY.STEEL.getNeutrons()*55))/100, //Neutrons
 			true, //Uses Blast furnace?
@@ -249,7 +249,7 @@ public final class ALLOY {
 			"Maraging Steel 350", //Material Name
 			new short[]{160, 160, 160, 0}, //Material Colour
 			1413, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.TITANIUM.getBoilingPoint_C()*15)+(ELEMENT.NICKEL.getBoilingPoint_C()*21)+(ELEMENT.COBALT.getBoilingPoint_C()*9)+(ALLOY.STEEL.getBoilingPoint_C()*55))/100, //Boiling Point in C
 			((ELEMENT.TITANIUM.getProtons()*15)+(ELEMENT.NICKEL.getProtons()*21)+(ELEMENT.COBALT.getProtons()*9)+(ALLOY.STEEL.getProtons()*55))/100, //Protons
 			((ELEMENT.TITANIUM.getNeutrons()*15)+(ELEMENT.NICKEL.getNeutrons()*21)+(ELEMENT.COBALT.getNeutrons()*9)+(ALLOY.STEEL.getNeutrons()*55))/100, //Neutrons
 			true, //Uses Blast furnace?
@@ -265,7 +265,7 @@ public final class ALLOY {
 			"Stellite", //Material Name
 			new short[]{129, 75, 120, 0}, //Material Colour
 			1310, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.TITANIUM.getBoilingPoint_C()*10)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*35)+(ELEMENT.COBALT.getBoilingPoint_C()*35)+(ELEMENT.MANGANESE.getBoilingPoint_C()*20))/100, //Boiling Point in C
 			((ELEMENT.TITANIUM.getProtons()*10)+(ELEMENT.CHROMIUM.getProtons()*35)+(ELEMENT.COBALT.getProtons()*35)+(ELEMENT.MANGANESE.getProtons()*20))/100, //Protons
 			((ELEMENT.TITANIUM.getNeutrons()*10)+(ELEMENT.CHROMIUM.getNeutrons()*35)+(ELEMENT.COBALT.getNeutrons()*35)+(ELEMENT.MANGANESE.getNeutrons()*20))/100, //Neutrons
 			true, //Uses Blast furnace?
@@ -281,7 +281,7 @@ public final class ALLOY {
 			"Talonite", //Material Name
 			new short[]{228, 75, 120, 0}, //Material Colour
 			1454, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.MOLYBDENUM.getBoilingPoint_C()*10)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*30)+(ELEMENT.COBALT.getBoilingPoint_C()*40)+(ELEMENT.PHOSPHORUS.getBoilingPoint_C()*20))/100, //Boiling Point in C
 			((ELEMENT.MOLYBDENUM.getProtons()*10)+(ELEMENT.CHROMIUM.getProtons()*30)+(ELEMENT.COBALT.getProtons()*40)+(ELEMENT.PHOSPHORUS.getProtons()*20))/100, //Protons
 			((ELEMENT.MOLYBDENUM.getNeutrons()*10)+(ELEMENT.CHROMIUM.getNeutrons()*30)+(ELEMENT.COBALT.getNeutrons()*40)+(ELEMENT.PHOSPHORUS.getNeutrons()*20))/100, //Neutrons
 			false, //Uses Blast furnace?
@@ -297,7 +297,7 @@ public final class ALLOY {
 			"Hastelloy-W", //Material Name
 			new short[]{218, 165, 32, 0}, //Material Colour
 			1350, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.IRON.getBoilingPoint_C()*6)+(ELEMENT.MOLYBDENUM.getBoilingPoint_C()*24)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*5)+(ELEMENT.NICKEL.getBoilingPoint_C()*65))/100, //Boiling Point in C
 			((ELEMENT.IRON.getProtons()*6)+(ELEMENT.MOLYBDENUM.getProtons()*24)+(ELEMENT.CHROMIUM.getProtons()*5)+(ELEMENT.NICKEL.getProtons()*65))/100, //Protons
 			((ELEMENT.IRON.getNeutrons()*6)+(ELEMENT.MOLYBDENUM.getNeutrons()*24)+(ELEMENT.CHROMIUM.getNeutrons()*5)+(ELEMENT.NICKEL.getNeutrons()*65))/100, //Neutrons
 			false, //Uses Blast furnace?
@@ -313,7 +313,7 @@ public final class ALLOY {
 			"Hastelloy-X", //Material Name
 			new short[]{255, 193, 37, 0}, //Material Colour
 			1350, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.IRON.getBoilingPoint_C()*18)+(ELEMENT.MOLYBDENUM.getBoilingPoint_C()*9)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*22)+(ELEMENT.NICKEL.getBoilingPoint_C()*51))/100, //Boiling Point in C
 			((ELEMENT.IRON.getProtons()*18)+(ELEMENT.MOLYBDENUM.getProtons()*9)+(ELEMENT.CHROMIUM.getProtons()*22)+(ELEMENT.NICKEL.getProtons()*51))/100, //Protons
 			((ELEMENT.IRON.getNeutrons()*18)+(ELEMENT.MOLYBDENUM.getNeutrons()*9)+(ELEMENT.CHROMIUM.getNeutrons()*22)+(ELEMENT.NICKEL.getNeutrons()*51))/100, //Neutrons
 			false, //Uses Blast furnace?
@@ -329,7 +329,7 @@ public final class ALLOY {
 			"Hastelloy-N", //Material Name
 			new short[]{236, 213, 48, 0}, //Material Colour
 			1350, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.YTTRIUM.getBoilingPoint_C()*5)+(ELEMENT.MOLYBDENUM.getBoilingPoint_C()*16)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*7)+(ELEMENT.NICKEL.getBoilingPoint_C()*72))/100, //Boiling Point in C
 			((ELEMENT.YTTRIUM.getProtons()*5)+(ELEMENT.MOLYBDENUM.getProtons()*16)+(ELEMENT.CHROMIUM.getProtons()*7)+(ELEMENT.NICKEL.getProtons()*72))/100, //Protons
 			((ELEMENT.YTTRIUM.getNeutrons()*5)+(ELEMENT.MOLYBDENUM.getNeutrons()*16)+(ELEMENT.CHROMIUM.getNeutrons()*7)+(ELEMENT.NICKEL.getNeutrons()*72))/100, //Neutrons
 			true, //Uses Blast furnace?
@@ -345,7 +345,7 @@ public final class ALLOY {
 			"Hastelloy-C276", //Material Name
 			new short[]{238, 180, 34, 0}, //Material Colour
 			1350, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.COBALT.getBoilingPoint_C()*2)+(ELEMENT.MOLYBDENUM.getBoilingPoint_C()*16)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*16)+(ELEMENT.NICKEL.getBoilingPoint_C()*66))/100, //Boiling Point in C
 			((ELEMENT.COBALT.getProtons()*2)+(ELEMENT.MOLYBDENUM.getProtons()*16)+(ELEMENT.CHROMIUM.getProtons()*16)+(ELEMENT.NICKEL.getProtons()*66))/100, //Protons
 			((ELEMENT.COBALT.getNeutrons()*2)+(ELEMENT.MOLYBDENUM.getNeutrons()*16)+(ELEMENT.CHROMIUM.getNeutrons()*16)+(ELEMENT.NICKEL.getNeutrons()*66))/100, //Neutrons
 			true, //Uses Blast furnace?
@@ -361,7 +361,7 @@ public final class ALLOY {
 			"Incoloy-020", //Material Name
 			new short[]{101, 81, 71, 0}, //Material Colour
 			1425, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.IRON.getBoilingPoint_C()*40)+(ELEMENT.COPPER.getBoilingPoint_C()*4)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*20)+(ELEMENT.NICKEL.getBoilingPoint_C()*36))/100, //Boiling Point in C
 			((ELEMENT.IRON.getProtons()*40)+(ELEMENT.COPPER.getProtons()*4)+(ELEMENT.CHROMIUM.getProtons()*20)+(ELEMENT.NICKEL.getProtons()*36))/100, //Protons
 			((ELEMENT.IRON.getNeutrons()*40)+(ELEMENT.COPPER.getNeutrons()*4)+(ELEMENT.CHROMIUM.getNeutrons()*20)+(ELEMENT.NICKEL.getNeutrons()*36))/100, //Neutrons
 			false, //Uses Blast furnace?
@@ -377,7 +377,7 @@ public final class ALLOY {
 			"Incoloy-DS", //Material Name
 			new short[]{71, 101, 81, 0}, //Material Colour
 			1425, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.IRON.getBoilingPoint_C()*46)+(ELEMENT.COBALT.getBoilingPoint_C()*18)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*18)+(ELEMENT.NICKEL.getBoilingPoint_C()*18))/100, //Boiling Point in C
 			((ELEMENT.IRON.getProtons()*46)+(ELEMENT.COBALT.getProtons()*18)+(ELEMENT.CHROMIUM.getProtons()*18)+(ELEMENT.NICKEL.getProtons()*18))/100, //Protons
 			((ELEMENT.IRON.getNeutrons()*46)+(ELEMENT.COBALT.getNeutrons()*18)+(ELEMENT.CHROMIUM.getNeutrons()*18)+(ELEMENT.NICKEL.getNeutrons()*18))/100, //Neutrons
 			false, //Uses Blast furnace?
@@ -393,7 +393,7 @@ public final class ALLOY {
 			"Incoloy-MA956", //Material Name
 			new short[]{81, 71, 101, 0}, //Material Colour
 			1425, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.IRON.getBoilingPoint_C()*75)+(ELEMENT.ALUMINIUM.getBoilingPoint_C()*4)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*20)+(ELEMENT.YTTRIUM.getBoilingPoint_C()*1))/100, //Boiling Point in C
 			((ELEMENT.IRON.getProtons()*75)+(ELEMENT.ALUMINIUM.getProtons()*4)+(ELEMENT.CHROMIUM.getProtons()*20)+(ELEMENT.YTTRIUM.getProtons()*1))/100, //Protons
 			((ELEMENT.IRON.getNeutrons()*75)+(ELEMENT.ALUMINIUM.getNeutrons()*4)+(ELEMENT.CHROMIUM.getNeutrons()*20)+(ELEMENT.YTTRIUM.getNeutrons()*1))/100, //Neutrons
 			true, //Uses Blast furnace?
@@ -409,7 +409,7 @@ public final class ALLOY {
 			"Tungsten Carbide", //Material Name
 			new short[]{44, 44, 44, 0}, //Material Colour
 			3422, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.TUNGSTEN.getBoilingPoint_C()*5)+(ELEMENT.CARBON.getBoilingPoint_C()*5))/10, //Boiling Point in C
 			((ELEMENT.TUNGSTEN.getProtons()*5)+(ELEMENT.CARBON.getProtons()*5))/10, //Protons
 			((ELEMENT.TUNGSTEN.getNeutrons()*5)+(ELEMENT.CARBON.getNeutrons()*5))/10, //Neutrons
 			true, //Uses Blast furnace?
@@ -423,7 +423,7 @@ public final class ALLOY {
 			"Silicon Carbide", //Material Name
 			new short[]{40, 48, 36, 0}, //Material Colour
 			1414, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.SILICON.getBoilingPoint_C()*5)+(ELEMENT.CARBON.getBoilingPoint_C()*5))/10, //Boiling Point in C
 			((ELEMENT.SILICON.getProtons()*5)+(ELEMENT.CARBON.getProtons()*5))/10, //Protons
 			((ELEMENT.SILICON.getNeutrons()*5)+(ELEMENT.CARBON.getNeutrons()*5))/10, //Neutrons
 			false, //Uses Blast furnace?
@@ -437,7 +437,7 @@ public final class ALLOY {
 			"Tantalum Carbide", //Material Name
 			new short[]{139, 136, 120, 0}, //Material Colour
 			2980, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.TANTALUM.getBoilingPoint_C()*5)+(ELEMENT.CARBON.getBoilingPoint_C()*5))/10, //Boiling Point in C
 			((ELEMENT.TANTALUM.getProtons()*5)+(ELEMENT.CARBON.getProtons()*5))/10, //Protons
 			((ELEMENT.TANTALUM.getNeutrons()*5)+(ELEMENT.CARBON.getNeutrons()*5))/10, //Neutrons
 			true, //Uses Blast furnace?
@@ -451,7 +451,7 @@ public final class ALLOY {
 			"Zirconium Carbide", //Material Name
 			new short[]{222, 202, 180, 0}, //Material Colour
 			1855, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.ZIRCONIUM.getBoilingPoint_C()*5)+(ELEMENT.CARBON.getBoilingPoint_C()*5))/10, //Boiling Point in C
 			((ELEMENT.ZIRCONIUM.getProtons()*5)+(ELEMENT.CARBON.getProtons()*5))/10, //Protons
 			((ELEMENT.ZIRCONIUM.getNeutrons()*5)+(ELEMENT.CARBON.getNeutrons()*5))/10, //Neutrons
 			true, //Uses Blast furnace?
@@ -465,7 +465,7 @@ public final class ALLOY {
 			"Niobium Carbide", //Material Name
 			new short[]{205, 197, 191, 0}, //Material Colour
 			2477, //Melting Point in C
-			0, //Boiling Point in C
+			((ELEMENT.NIOBIUM.getBoilingPoint_C()*5)+(ELEMENT.CARBON.getBoilingPoint_C()*5))/10, //Boiling Point in C
 			((ELEMENT.NIOBIUM.getProtons()*5)+(ELEMENT.CARBON.getProtons()*5))/10, //Protons
 			((ELEMENT.NIOBIUM.getNeutrons()*5)+(ELEMENT.CARBON.getNeutrons()*5))/10, //Neutrons
 			true, //Uses Blast furnace?
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 857e403ada..2939016798 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -100,6 +100,14 @@ public class Material {
 	public ItemStack getDust(int stacksize){
 		return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dust"+unlocalizedName, stacksize);
 	}
+	
+	public ItemStack getSmallDust(int stacksize){
+		return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dustSmall"+unlocalizedName, stacksize);
+	}
+	
+	public ItemStack getTinyDust(int stacksize){
+		return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dustTiny"+unlocalizedName, stacksize);
+	}
 
 	public ItemStack[] getValidInputStacks(){
 		return UtilsItems.validItemsForOreDict(unlocalizedName);
diff --git a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
index 877f75cea6..7a70b41f96 100644
--- a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
+++ b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
@@ -256,7 +256,7 @@ public class UtilsItems {
 		if (returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass() || returnValue.getItem() != ModItems.AAA_Broken){		
 		return returnValue;
 		}
-		
+	Utils.LOG_INFO(oredictName+" was not valid.");	
 	 return null;
 	}
 	
@@ -320,7 +320,7 @@ public class UtilsItems {
 			temp = new BaseItemGear("itemGear"+unlocalizedName, materialName, Colour, materialTier);
 		}		
 
-		FluidUtils.generateFluid(matInfo, sRadiation);
+		FluidUtils.generateFluid(matInfo, 1);
 		
 	}