% Changed the Autogenerated Fluid textures again.

+ Created Thorium-232, a step towards ThF4.
+ Added centrifuge recipe for Th->Th232(Bonus U232 0.10%).
+ Added THORIUM_HEXAFLUORIDE & THORIUM_TETRAFLUORIDE into ALLOY.java
% Fixed fluid extractor recipes not being added for every dust.
+ Added more fluid extractor and fluid solidifier recipes for each material.

- Removed old "uraniumHexafluoride", "uraniumTetrafluoride", "thoriumTetrafluoride" fluids and IC2 cells.

% Changed Multitank Controller Logic, maybe broke things.

+ Added getNugget and getCell to Material.java
% Changed MaterialGenerator.java to use the materials radioactivity level, not the old method based on name.
% Moved material blacklist for BlastSmelting Recipe generation out of material/MaterialGenerator.java.

3 files changed, 37 insertions, 20 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 2657af18fa..2f0d9969a1 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -25,6 +25,7 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.debug.DEBUG_INIT;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.materials.MaterialUtils;
 import net.minecraft.item.*;
 import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.util.EnumChatFormatting;
@@ -172,6 +173,11 @@ public final class ModItems {
 	public static Item dustCookedZrCl4;
 	public static Item dustZrF4;
 
+	public static Item dustNaBF4NaF;
+	public static Item dustLiFBeF2ZrF4UF4;
+	public static Item dustLiFBeF2ZrF4U235;
+	public static Item dustLiFBeF2ThF4UF4;
+
 
 
 	//@SuppressWarnings("unused")
@@ -242,6 +248,8 @@ public final class ModItems {
 			//neutron cross-section of lithium-7 (about 45 millibarns) makes high separation of lithium-7 from natural lithium a 
 			//strong requirement for the possible use in lithium fluoride reactors.
 			MaterialGenerator.generate(ELEMENT.getInstance().LITHIUM7, false);
+			//Thorium-232 is the most stable isotope of Thorium, purified for nuclear fuel use in this case.
+			MaterialGenerator.generate(ELEMENT.getInstance().THORIUM232, false);
 			//Production of 233U (through the neutron irradiation of 232Th) invariably produces small amounts of 232U as an impurity
 			//because of parasitic (n,2n) reactions on uranium-233 itself, or on protactinium-233, or on thorium-232:
 			MaterialGenerator.generate(ELEMENT.getInstance().URANIUM232);
@@ -251,7 +259,6 @@ public final class ModItems {
 			MaterialGenerator.generate(ELEMENT.getInstance().ZIRCONIUM);
 
 
-
 			//Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though
 			if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 				MaterialGenerator.generate(ALLOY.TUNGSTEN_CARBIDE);
@@ -262,6 +269,14 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE);	
 
 
+			//Generate Fluorides
+			MaterialGenerator.generate(ALLOY.THORIUM_HEXAFLUORIDE, false);
+			MaterialGenerator.generate(ALLOY.THORIUM_TETRAFLUORIDE, false);
+			
+			//Generate Reactor Fuel Salts
+			MaterialGenerator.generate(ALLOY.LiFBeF2ZrF4U235, false);
+			MaterialGenerator.generate(ALLOY.LiFBeF2ThF4UF4, false);
+			
 
 			//Generate some Alloys
 
@@ -375,15 +390,26 @@ public final class ModItems {
 
 		//Zirconium
 		//Cinter Pellet.
-		itemZirconiumChlorideCinterPellet = new CoreItem("itemZirconiumPellet", "Zirconium Pellet", tabMisc).setTextureName(CORE.MODID + ":itemShard");
+		itemZirconiumChlorideCinterPellet = new CoreItem("itemZirconiumPellet", "Zirconium Pellet ["+MaterialUtils.subscript("ZrCl4")+"]", tabMisc).setTextureName(CORE.MODID + ":itemShard");
 		GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet));
 		//Zirconium Chloride
 		dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
 		dustCookedZrCl4 = ItemUtils.generateSpecialUseDusts("CookedZrCl4", "Cooked ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
 		//Zirconium Tetrafluoride
 		dustZrF4 = ItemUtils.generateSpecialUseDusts("ZrF4", "ZrF4", Utils.rgbtoHexValue(170, 170, 170))[0]; //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
+
+		//Coolant Salt
+		//NaBF4 - NaF - 621C
+		dustNaBF4NaF = ItemUtils.generateSpecialUseDusts("NaBF4NaF", "NaBF4NaF", Utils.rgbtoHexValue(170, 170, 170))[0]; //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
+		//Fuel Salt
+		//7LiF - BeF2 - ZrF4 - UF4 - 650C
+		dustLiFBeF2ZrF4UF4 = ItemUtils.generateSpecialUseDusts("LiFBeF2ZrF4UF4", "LiFBeF2ZrF4UF4", Utils.rgbtoHexValue(170, 170, 170))[0]; //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
+		//7LiF - BeF2 - ZrF4 - U235 - 590C
+		dustLiFBeF2ZrF4U235 = ItemUtils.generateSpecialUseDusts("LiFBeF2ZrF4U235", "LiFBeF2ZrF4U235", Utils.rgbtoHexValue(170, 170, 170))[0]; //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
+		//7liF - BeF2 - ThF4 - UF4 - 566C
+		dustLiFBeF2ThF4UF4 = ItemUtils.generateSpecialUseDusts("LiFBeF2ThF4UF4", "LiFBeF2ThF4UF4", Utils.rgbtoHexValue(170, 170, 170))[0]; //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
 		
-		
+
 		//Test items
 		metaItem2 = new BaseEuItem();
 		metaItem2.registerItem(0, EnumChatFormatting.BLACK+"Test Item 0", 0, 0, "I am 0.");
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 7a7ebd0eb8..69d5363240 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -8,7 +8,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.entity.EntityUtils;
-import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 
@@ -75,15 +74,6 @@ public class BaseItemDust extends Item{
 		}
 		addFurnaceRecipe();
 		addMacerationRecipe();
-		
-		GT_Values.RA.addFluidExtractionRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(materialName), 1), //Input
-				null, //Input 2
-				FluidUtils.getFluidStack("molten."+Utils.sanitizeString(materialName), 144), //Fluid Output
-				0, //Chance
-				1*20, //Duration
-				16 //Eu Tick
-				);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index d5dd78a49b..eaccd31f30 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -6,6 +6,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 
 import java.util.List;
@@ -69,13 +70,13 @@ public class BaseItemDustUnique extends Item{
 	public String getItemStackDisplayName(ItemStack iStack) {
 
 		if (getUnlocalizedName().contains("DustTiny")){
-			name = "Tiny Pile of "+materialName + " Dust";
+			name = "Tiny Pile of "+MaterialUtils.subscript(materialName) + " Dust";
 		}
 		else if (getUnlocalizedName().contains("DustSmall")){
-			name = "Small Pile of "+materialName + " Dust";
+			name = "Small Pile of "+MaterialUtils.subscript(materialName) + " Dust";
 		}
 		else {
-			name = materialName + " Dust";
+			name = MaterialUtils.subscript(materialName) + " Dust";
 		}
 		return name;
 	}
@@ -90,13 +91,13 @@ public class BaseItemDustUnique extends Item{
 	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
 		//if (pileType != null && materialName != null && pileType != "" && materialName != "" && !pileType.equals("") && !materialName.equals("")){
 		if (getUnlocalizedName().contains("DustTiny")){
-			list.add(EnumChatFormatting.GRAY+"A tiny pile of " + materialName + " dust.");	
+			list.add(EnumChatFormatting.GRAY+"A tiny pile of " + MaterialUtils.subscript(materialName) + " dust.");	
 		}
 		else if (getUnlocalizedName().contains("DustSmall")){
-			list.add(EnumChatFormatting.GRAY+"A small pile of " + materialName + " dust.");	
+			list.add(EnumChatFormatting.GRAY+"A small pile of " + MaterialUtils.subscript(materialName) + " dust.");	
 		}
 		else {
-			list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust.");
+			list.add(EnumChatFormatting.GRAY+"A pile of " + MaterialUtils.subscript(materialName) + " dust.");
 		}
 		if (sRadiation > 0){
 			list.add(CORE.GT_Tooltip_Radioactive);
@@ -106,7 +107,7 @@ public class BaseItemDustUnique extends Item{
 	}
 
 	public final String getMaterialName() {
-		return materialName;
+		return MaterialUtils.subscript(materialName);
 	}
 
 	@Override