% 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.

2 files changed, 91 insertions, 2 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index 8da9699c8e..2e1e259b4e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -3,8 +3,7 @@ package gtPlusPlus.xmod.gregtech.loaders;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.material.*;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 
@@ -30,6 +29,19 @@ public class RecipeGen_BlastSmelter  implements Runnable{
 		//Add a Blast Smelting Recipe, Let's go!			
 		ItemStack tStack;
 		if (null != (tStack = M.getDust(1))) {
+			
+			Material[] badMaterials = {
+				ALLOY.THORIUM_HEXAFLUORIDE,
+				ALLOY.THORIUM_TETRAFLUORIDE,
+				ALLOY.BLOODSTEEL,
+				ALLOY.LiFBeF2ThF4UF4,
+				ALLOY.LiFBeF2ZrF4U235
+			};
+			for (Material R : badMaterials){
+				if (M == R){
+					return;
+				}
+			}
 
 			//Prepare some Variables
 			ItemStack[] components;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index c0122cbcf5..6f0697365d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
@@ -90,6 +91,82 @@ public class RecipeGen_DustGeneration  implements Runnable{
 		else {
 			Utils.LOG_WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");			
 		}
+		
+		//Melting Shapes to fluid
+		if (GT_Values.RA.addFluidExtractionRecipe(normalDust, //Input
+				null, //Input 2
+				material.getFluid(144), //Fluid Output
+				0, //Chance
+				1*20, //Duration
+				16 //Eu Tick
+				)){
+			Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+		}
+		else {
+			Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");			
+		}	
+		if (GT_Values.RA.addFluidExtractionRecipe(material.getPlate(1), //Input
+				null, //Input 2
+				material.getFluid(144), //Fluid Output
+				0, //Chance
+				1*20, //Duration
+				16 //Eu Tick
+				)){
+			Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Success");
+		}
+		else {
+			Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Failed");			
+		}	
+		if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), //Input
+				null, //Input 2
+				material.getFluid(16), //Fluid Output
+				0, //Chance
+				1*20, //Duration
+				16 //Eu Tick
+				)){
+			Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Success");
+		}
+		else {
+			Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");			
+		}
+		
+		//Making Shapes from fluid
+		if (GT_Values.RA.addFluidSolidifierRecipe(
+				ItemList.Shape_Mold_Ingot.get(1), //Item Shape		
+				material.getFluid(144), //Fluid Input
+				material.getIngot(1), //output				
+				1*20, //Duration
+				16 //Eu Tick
+				)){
+			Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Success");
+		}
+		else {
+			Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");			
+		}	
+		if (GT_Values.RA.addFluidSolidifierRecipe(
+				ItemList.Shape_Mold_Plate.get(1), //Item Shape		
+				material.getFluid(144), //Fluid Input
+				material.getPlate(1), //output				
+				1*20, //Duration
+				16 //Eu Tick
+				)){
+			Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Success");
+		}
+		else {
+			Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Failed");			
+		}
+		if (GT_Values.RA.addFluidSolidifierRecipe(
+				ItemList.Shape_Mold_Nugget.get(1), //Item Shape		
+				material.getFluid(16), //Fluid Input
+				material.getNugget(1), //output				
+				1*20, //Duration
+				16 //Eu Tick
+				)){
+			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Success");
+		}
+		else {
+			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");			
+		}
 
 		//Is this a composite?
 		if (inputStacks != null){