% Tweaked recipe creation for materials due to states.

% Tweaked items generated for materials due to states.
% Tweaked tooltips of cells, now they are cleaner.
% Changed max progress time of LFTR to be 500x what it was.

2 files changed, 167 insertions, 166 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
index 40c6a2eada..9b11e82dbd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
@@ -375,7 +375,7 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 							if(depleteInput(tLiquid)) { //Deplete that amount
 								Utils.LOG_INFO("Depleted some FLiBe fluid");
 
-								this.mMaxProgresstime = 1;
+								this.mMaxProgresstime = 500;
 								
 								if(tFluids.contains(NUCLIDE.LiFBeF2ThF4UF4.getFluid(1)) ||
 										tFluids.contains(NUCLIDE.LiFBeF2ZrF4UF4.getFluid(2)) ||
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index 84c006a90e..eac2cba20f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -8,184 +8,185 @@ import gtPlusPlus.core.util.Utils;
 public class RecipeGen_Fluids  implements Runnable{
 
 	final Material toGenerate;
-	
+
 	public RecipeGen_Fluids(final Material M){
 		this.toGenerate = M;
 	}
-	
+
 	@Override
 	public void run() {
 		generateRecipes(toGenerate);		
 	}
-	
+
 	public static void generateRecipes(final Material material){
 		generateRecipes(material, false);
 	}
 
 	public static void generateRecipes(final Material material, boolean disableOptional){
-				
+
 		//Melting Shapes to fluid
-		
-		//Dust
-		if (GT_Values.RA.addFluidExtractionRecipe(material.getDust(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 Dust Recipe: "+material.getLocalizedName()+" - Success");
-		}
-		else {
-			Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");			
-		}	
-		
-		//Ingot
-		if (GT_Values.RA.addFluidExtractionRecipe(material.getIngot(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 ingot Recipe: "+material.getLocalizedName()+" - Success");
-		}
-		else {
-			Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");			
-		}
-		
-		//Plate
-		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");			
-		}	
-		
-		//Double Plate
-		if (GT_Values.RA.addFluidExtractionRecipe(material.getPlateDouble(1), //Input
-				null, //Input 2
-				material.getFluid(288), //Fluid Output
-				0, //Chance
-				1*20, //Duration
-				16 //Eu Tick
-				)){
-			Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Success");
-		}
-		else {
-			Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed");			
-		}
-		
-		//Nugget
-		if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), //Input
-				null, //Input 2
-				material.getFluid(16), //Fluid Output
-				0, //Chance
-				16, //Duration
-				8 //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");			
-		}
-		
-		//Block
-		if (GT_Values.RA.addFluidExtractionRecipe(material.getBlock(1), //Input
-				null, //Input 2
-				material.getFluid(144*9), //Fluid Output
-				0, //Chance
-				288, //Duration
-				16 //Eu Tick
-				)){
-			Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Success");
-		}
-		else {
-			Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed");			
-		}
-		
-		
-		
-		
-		
-		
-		
-		//Making Shapes from fluid
-		
-		//Ingot
-		if (GT_Values.RA.addFluidSolidifierRecipe(
-				ItemList.Shape_Mold_Ingot.get(0), //Item Shape		
-				material.getFluid(144), //Fluid Input
-				material.getIngot(1), //output				
-				32, //Duration
-				8 //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");			
-		}	
-		
-		//Plate
-		if (GT_Values.RA.addFluidSolidifierRecipe(
-				ItemList.Shape_Mold_Plate.get(1), //Item Shape		
-				material.getFluid(144), //Fluid Input
-				material.getPlate(1), //output				
-				32, //Duration
-				8 //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");			
-		}
-		
-		//Nugget
-		if (GT_Values.RA.addFluidSolidifierRecipe(
-				ItemList.Shape_Mold_Nugget.get(0), //Item Shape		
-				material.getFluid(16), //Fluid Input
-				material.getNugget(1), //output				
-				16, //Duration
-				4 //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");			
-		}
-		
-		//Gears
-		if (GT_Values.RA.addFluidSolidifierRecipe(
-				ItemList.Shape_Mold_Gear.get(0), //Item Shape		
-				material.getFluid(576), //Fluid Input
-				material.getGear(1), //output				
-				128, //Duration
-				8 //Eu Tick
-				)){
-			Utils.LOG_WARNING("576l fluid molder for 1 gear Recipe: "+material.getLocalizedName()+" - Success");
-		}
-		else {
-			Utils.LOG_WARNING("576l fluid molder for 1 gear Recipe: "+material.getLocalizedName()+" - Failed");			
-		}
-		
-		//Blocks
-		if (GT_Values.RA.addFluidSolidifierRecipe(
-				ItemList.Shape_Mold_Block.get(0), //Item Shape		
-				material.getFluid(144*9), //Fluid Input
-				material.getBlock(1), //output				
-				288, //Duration
-				16 //Eu Tick
-				)){
-			Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Success");
-		}
-		else {
-			Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Failed");			
+		if (!material.getFluid(1).getUnlocalizedName().toLowerCase().contains("plasma")){
+			//Dust
+			if (GT_Values.RA.addFluidExtractionRecipe(material.getDust(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 Dust Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");			
+			}	
+
+			//Ingot
+			if (GT_Values.RA.addFluidExtractionRecipe(material.getIngot(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 ingot Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");			
+			}
+
+			//Plate
+			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");			
+			}	
+
+			//Double Plate
+			if (GT_Values.RA.addFluidExtractionRecipe(material.getPlateDouble(1), //Input
+					null, //Input 2
+					material.getFluid(288), //Fluid Output
+					0, //Chance
+					1*20, //Duration
+					16 //Eu Tick
+					)){
+				Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed");			
+			}
+
+			//Nugget
+			if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), //Input
+					null, //Input 2
+					material.getFluid(16), //Fluid Output
+					0, //Chance
+					16, //Duration
+					8 //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");			
+			}
+
+			//Block
+			if (GT_Values.RA.addFluidExtractionRecipe(material.getBlock(1), //Input
+					null, //Input 2
+					material.getFluid(144*9), //Fluid Output
+					0, //Chance
+					288, //Duration
+					16 //Eu Tick
+					)){
+				Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed");			
+			}
+
+
+
+
+
+
+
+			//Making Shapes from fluid
+
+			//Ingot
+			if (GT_Values.RA.addFluidSolidifierRecipe(
+					ItemList.Shape_Mold_Ingot.get(0), //Item Shape		
+					material.getFluid(144), //Fluid Input
+					material.getIngot(1), //output				
+					32, //Duration
+					8 //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");			
+			}	
+
+			//Plate
+			if (GT_Values.RA.addFluidSolidifierRecipe(
+					ItemList.Shape_Mold_Plate.get(1), //Item Shape		
+					material.getFluid(144), //Fluid Input
+					material.getPlate(1), //output				
+					32, //Duration
+					8 //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");			
+			}
+
+			//Nugget
+			if (GT_Values.RA.addFluidSolidifierRecipe(
+					ItemList.Shape_Mold_Nugget.get(0), //Item Shape		
+					material.getFluid(16), //Fluid Input
+					material.getNugget(1), //output				
+					16, //Duration
+					4 //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");			
+			}
+
+			//Gears
+			if (GT_Values.RA.addFluidSolidifierRecipe(
+					ItemList.Shape_Mold_Gear.get(0), //Item Shape		
+					material.getFluid(576), //Fluid Input
+					material.getGear(1), //output				
+					128, //Duration
+					8 //Eu Tick
+					)){
+				Utils.LOG_WARNING("576l fluid molder for 1 gear Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Utils.LOG_WARNING("576l fluid molder for 1 gear Recipe: "+material.getLocalizedName()+" - Failed");			
+			}
+
+			//Blocks
+			if (GT_Values.RA.addFluidSolidifierRecipe(
+					ItemList.Shape_Mold_Block.get(0), //Item Shape		
+					material.getFluid(144*9), //Fluid Input
+					material.getBlock(1), //output				
+					288, //Duration
+					16 //Eu Tick
+					)){
+				Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Failed");			
+			}
 		}
 	}
 }