+ Added new Radioactive ore.

+ Added Custom Nuclear Texture Set.
% More material work.
$ Fixed issue allowing Multiblocks to have > 1 Control Core Hatch.
$ Fixed Broken Ore texture for ENRICHED TextureSet.
$ Fixed a few fluid recipes broken in the refactor.

18 files changed, 693 insertions, 592 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 7c099f49ef..38e5681bdc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -755,8 +755,17 @@ GT_MetaTileEntity_MultiBlockBase {
 	}
 
 	//mControlCoreBus
-	public boolean addControlCoreToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) {
-		return addToMachineList(aTileEntity, aBaseCasingIndex);
+	public boolean addControlCoreToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) {		
+		log("Found GT_MetaTileEntity_Hatch_ControlCore");
+		final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
+		if (aMetaTileEntity == null) {
+			return false;
+		}
+		if (!mControlCoreBus.isEmpty()) {
+			return false;
+		}
+		
+		return addToMachineListInternal(mControlCoreBus, aMetaTileEntity, aBaseCasingIndex);		
 	}
 
 	@Override
@@ -775,7 +784,7 @@ GT_MetaTileEntity_MultiBlockBase {
 		//Handle Custom Hustoms
 		if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_ControlCore) {
 			log("Found GT_MetaTileEntity_Hatch_ControlCore");
-			aDidAdd = addToMachineListInternal(mControlCoreBus, aMetaTileEntity, aBaseCasingIndex);
+			aDidAdd = addControlCoreToMachineList(aTileEntity, aBaseCasingIndex);
 		}
 		else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBattery) {
 			log("Found GT_MetaTileEntity_Hatch_InputBattery");
@@ -917,9 +926,13 @@ GT_MetaTileEntity_MultiBlockBase {
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-		resetRecipeMapForAllInputHatches();
+	public final void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
+		onModeChangeByScrewdriver(aSide, aPlayer, aX, aY, aZ);
+	}
+	
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+		resetRecipeMapForAllInputHatches();
 	}
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
index 0bc9014f01..43f317d25c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
@@ -447,7 +447,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase {
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		mMode = Utils.invertBoolean(mMode);		
 		this.mInRange.clear();
 		if (mMode){
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
index 83984c1286..b2b4cdfda5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
@@ -339,8 +339,7 @@ extends GregtechMeta_MultiBlockBase {
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		if (this.mSize > 3) {
 			this.mPlasmaMode = Utils.invertBoolean(mPlasmaMode);
 			if (mPlasmaMode) {
@@ -349,7 +348,8 @@ extends GregtechMeta_MultiBlockBase {
 			else {
 				PlayerUtils.messagePlayer(aPlayer, "["+EnumChatFormatting.RED+"MODE"+EnumChatFormatting.RESET+"] "+EnumChatFormatting.YELLOW+"Electric"+EnumChatFormatting.RESET);			
 			}
-		}		
+		}	
+		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);	
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
index 3c99a74052..9a23567022 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
@@ -195,15 +195,15 @@ extends GregtechMeta_MultiBlockBase {
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);		
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		this.mIsAnimated = Utils.invertBoolean(mIsAnimated);
 		if (this.mIsAnimated) {
 			PlayerUtils.messagePlayer(aPlayer, "Using Animated Turbine Texture.");
 		}
 		else {
 			PlayerUtils.messagePlayer(aPlayer, "Using Static Turbine Texture.");			
-		}		
+		}	
+		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);			
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
index 7e14604266..cf780cbedf 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
@@ -843,7 +843,7 @@ extends GregtechMeta_MultiBlockBase {
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		if (mInternalMode < 2) {
 			mInternalMode++;
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
index aa13c8d712..36a880633f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
@@ -186,7 +186,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends GregtechMeta_Mu
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		mFormingMode = Utils.invertBoolean(mFormingMode);		
 		if (mFormingMode){
 			PlayerUtils.messagePlayer(aPlayer, "Now running in Forming Press Mode.");
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
index e7b2a9c4a5..c6ba185e77 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
@@ -358,7 +358,7 @@ extends GregtechMeta_MultiBlockBase {
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		mChemicalMode = Utils.invertBoolean(mChemicalMode);		
 		if (mChemicalMode){
 			PlayerUtils.messagePlayer(aPlayer, "Wash Plant is now running in Chemical Bath Mode.");
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
index 64b64981e7..bb6a3c9631 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
@@ -224,7 +224,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase {
 	private boolean isModernGT = true;
 	
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {		
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {		
 		if (isModernGT && !CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
 			isModernGT = false;
 		}
@@ -232,13 +232,13 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase {
 		if (isModernGT && !CORE.GTNH) {
 			mMachineMode = mMachineMode.nextMode();
 			if (mMachineMode == MODE.CRAFTING) {
-				PlayerUtils.messagePlayer(aPlayer, "Running the Auto-Crafter in mode: §dAuto-Crafting");
+				PlayerUtils.messagePlayer(aPlayer, "Running the Auto-Crafter in mode: �dAuto-Crafting");
 			} else if (mMachineMode == MODE.ASSEMBLY) {
-				PlayerUtils.messagePlayer(aPlayer, "Running the Auto-Crafter in mode: §aAssembly");
+				PlayerUtils.messagePlayer(aPlayer, "Running the Auto-Crafter in mode: �aAssembly");
 			} else if (mMachineMode == MODE.DISASSEMBLY) {
-				PlayerUtils.messagePlayer(aPlayer, "Running the Auto-Crafter in mode: §cDisassembly");
+				PlayerUtils.messagePlayer(aPlayer, "Running the Auto-Crafter in mode: �cDisassembly");
 			} else {
-				PlayerUtils.messagePlayer(aPlayer, "Running the Auto-Crafter in mode: §eCircuit Assembly");
+				PlayerUtils.messagePlayer(aPlayer, "Running the Auto-Crafter in mode: �eCircuit Assembly");
 			}
 		}
 		//5.08 support
@@ -251,11 +251,11 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase {
 			}
 			
 			if (mMachineMode == MODE.CRAFTING) {
-				PlayerUtils.messagePlayer(aPlayer, "You are now running the Auto-Crafter in mode: §dAuto-Crafting");
+				PlayerUtils.messagePlayer(aPlayer, "You are now running the Auto-Crafter in mode: �dAuto-Crafting");
 			} else if (mMachineMode == MODE.ASSEMBLY) {
-				PlayerUtils.messagePlayer(aPlayer, "You are now running the Auto-Crafter in mode: §aAssembly");
+				PlayerUtils.messagePlayer(aPlayer, "You are now running the Auto-Crafter in mode: �aAssembly");
 			} else {
-				PlayerUtils.messagePlayer(aPlayer, "You are now running the Auto-Crafter in mode: §cDisassembly");
+				PlayerUtils.messagePlayer(aPlayer, "You are now running the Auto-Crafter in mode: �cDisassembly");
 			}
 		}		
 		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java
index 6e233f9035..04bdbd9647 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java
@@ -249,7 +249,7 @@ extends GregtechMeta_MultiBlockBase {
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
 		if (this.mHeight > 3) {}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
index e3405f37b8..e4016e6650 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
@@ -128,11 +128,12 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
     }
 
     @Override
-    public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+    public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aSide == getBaseMetaTileEntity().getFrontFacing()) {
             looseFit^=true;
             GT_Utility.sendChatToPlayer(aPlayer, looseFit ? "Fitting: Loose - More Flow" : "Fitting: Tight - More Efficiency");
         }
+		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);	
     }
 
     @Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
index 7a0ba50b52..ce30f92466 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
@@ -136,11 +136,12 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
     }
 
     @Override
-    public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+    public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aSide == getBaseMetaTileEntity().getFrontFacing()) {
             looseFit^=true;
             GT_Utility.sendChatToPlayer(aPlayer, looseFit ? "Fitting: Loose - More Flow" : "Fitting: Tight - More Efficiency");
         }
+		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);	
     }
 
     @Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
index 27181a792e..575e8d9b73 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
@@ -481,7 +481,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends GregtechM
 
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		if (!KeyboardUtils.isShiftKeyDown()) {
 			super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);		
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index 2bbe6e96f5..e925dc388b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -568,7 +568,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+	public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		mIsOutputtingPower = Utils.invertBoolean(mIsOutputtingPower);
 		if (mIsOutputtingPower) {
 			PlayerUtils.messagePlayer(aPlayer, "Sub-Station is now outputting power from the controller.");
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java
index f0a816d405..6ed5eecd38 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java
@@ -31,6 +31,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base {
 		final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15;
 
 		//Nuggets
+		if (material.getIngot(1) != null && material.getNugget(1) != null)
 		GT_Values.RA.addAlloySmelterRecipe(
 				material.getIngot(1),
 				ItemList.Shape_Mold_Nugget.get(0),
@@ -39,6 +40,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base {
 				2 * tVoltageMultiplier);
 
 		//Gears
+		if (material.getIngot(1) != null && material.getGear(1) != null)
 		GT_Values.RA.addAlloySmelterRecipe(
 				material.getIngot(8),
 				ItemList.Shape_Mold_Gear.get(0),
@@ -47,6 +49,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base {
 				2 * tVoltageMultiplier);
 		
 		//Ingot
+		if (material.getIngot(1) != null && material.getNugget(1) != null)
 		GT_Values.RA.addAlloySmelterRecipe(
 				material.getNugget(9),
 				ItemList.Shape_Mold_Ingot.get(0),
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
index 08008994ea..2fd7f93c2d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
@@ -35,7 +35,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 
 		final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15;
 		final ItemStack itemIngot = material.getIngot(1);
-		final ItemStack plate_Single = material.getPlate(1);
+		final ItemStack itemPlate = material.getPlate(1);
 		final ItemStack itemGear = material.getGear(1);
 
 		final ItemStack shape_Plate = ItemList.Shape_Extruder_Plate.get(0);
@@ -49,6 +49,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 		Logger.WARNING("Generating Extruder recipes for "+material.getLocalizedName());
 
 		//Ingot Recipe
+		if (material.getIngot(1) != null && material.getBlock(1) != null)
 		if (addExtruderRecipe(
 				material.getBlock(1),
 				shape_Ingot,
@@ -62,6 +63,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 		}
 
 		//Block Recipe
+		if (material.getIngot(1) != null && material.getBlock(1) != null)
 		if (addExtruderRecipe(
 				material.getIngot(9),
 				shape_Block,
@@ -75,10 +77,11 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 		}
 
 		//Plate Recipe
+		if (material.getIngot(1) != null && material.getPlate(1) != null)
 		if (addExtruderRecipe(
 				itemIngot,
 				shape_Plate,
-				plate_Single,
+				itemPlate,
 				10, 4 * tVoltageMultiplier)){
 			Logger.WARNING("Extruder Plate Recipe: "+material.getLocalizedName()+" - Success");
 		}
@@ -87,6 +90,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 		}
 
 		//Ring Recipe
+		if (material.getIngot(1) != null && material.getRing(1) != null)
 		if (!material.isRadioactive){
 			if (addExtruderRecipe(
 					itemIngot,
@@ -103,6 +107,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 
 
 		//Gear Recipe
+		if (material.getIngot(1) != null && material.getGear(1) != null)
 		if (!material.isRadioactive){
 			if (addExtruderRecipe(
 					material.getIngot(4),
@@ -119,6 +124,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 
 
 		//Rod Recipe
+		if (material.getIngot(1) != null && material.getRod(1) != null)
 		if (addExtruderRecipe(
 				itemIngot,
 				shape_Rod,
@@ -133,6 +139,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
 
 
 		//Bolt Recipe
+		if (material.getIngot(1) != null && material.getBolt(1) != null)
 		if (!material.isRadioactive){
 			if (addExtruderRecipe(
 					itemIngot,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index 1f3c91c9cb..5e2675689b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -18,11 +18,11 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 		MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
 	}
 
-	public RecipeGen_Fluids(final Material M){
+	public RecipeGen_Fluids(final Material M) {
 		this(M, false);
 	}
-	
-	public RecipeGen_Fluids(final Material M, final boolean dO){
+
+	public RecipeGen_Fluids(final Material M, final boolean dO) {
 		this.toGenerate = M;
 		this.disableOptional = dO;
 		mRecipeGenMap.add(this);
@@ -33,263 +33,269 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 		generateRecipes(this.toGenerate, this.disableOptional);
 	}
 
-	private void generateRecipes(final Material material, final boolean dO){
+	private void generateRecipes(final Material material, final boolean dO) {
 
 		if (material == null) {
 			return;
 		}
-		
-		//Melting Shapes to fluid
-		if (material.getFluid(1) != null && !material.getFluid(1).getUnlocalizedName().toLowerCase().contains("plasma")){
-			
+
+		// Melting Shapes to fluid
+		if (material.getFluid(1) != null
+				&& !material.getFluid(1).getUnlocalizedName().toLowerCase().contains("plasma")) {
+
 			if (!material.requiresBlastFurnace()) {
 
-				//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
-						)){
-					Logger.WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Success");
-				}
-				else {
-					Logger.WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");
-				}
+				// Ingot
+				if (material.getIngot(1) != null)
+					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
+					)) {
+						Logger.WARNING("144l fluid extractor from 1 ingot Recipe: " + material.getLocalizedName()
+								+ " - Success");
+					} else {
+						Logger.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
-						)){
-					Logger.WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Success");
-				}
-				else {
-					Logger.WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Failed");
-				}
+				// Plate
+				if (material.getPlate(1) != null)
+					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
+					)) {
+						Logger.WARNING("144l fluid extractor from 1 plate Recipe: " + material.getLocalizedName()
+								+ " - Success");
+					} else {
+						Logger.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
-						)){
-					Logger.WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Success");
-				}
-				else {
-					Logger.WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed");
-				}
+				// Double Plate
+				if (material.getPlateDouble(1) != null)
+					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
+					)) {
+						Logger.WARNING("144l fluid extractor from 1 double plate Recipe: " + material.getLocalizedName()
+								+ " - Success");
+					} else {
+						Logger.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
-						)){
-					Logger.WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Success");
-				}
-				else {
-					Logger.WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");
-				}
+				// Nugget
+				if (material.getNugget(1) != null)
+					if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), // Input
+							null, // Input 2
+							material.getFluid(16), // Fluid Output
+							0, // Chance
+							16, // Duration
+							8 // Eu Tick
+					)) {
+						Logger.WARNING("16l fluid extractor from 1 nugget Recipe: " + material.getLocalizedName()
+								+ " - Success");
+					} else {
+						Logger.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
-						)){
-					Logger.WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Success");
-				}
-				else {
-					Logger.WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed");
-				}
+				// Block
+				if (material.getBlock(1) != null)
+					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
+					)) {
+						Logger.WARNING((144 * 9) + "l fluid extractor from 1 block Recipe: "
+								+ material.getLocalizedName() + " - Success");
+					} else {
+						Logger.WARNING((144 * 9) + "l fluid extractor from 1 block Recipe: "
+								+ material.getLocalizedName() + " - Failed");
+					}
 
 			}
 
+			// Making Shapes from fluid
 
+			// Ingot
+			if (material.getIngot(1) != null)
+				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
+				)) {
+					Logger.WARNING(
+							"144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Success");
+				} else {
+					Logger.WARNING(
+							"144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Failed");
+				}
 
+			// Plate
+			if (material.getPlate(1) != null)
+				if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Plate.get(0), // Item Shape
+						material.getFluid(144), // Fluid Input
+						ma