Added more nuclear processing recipes.

Removed lots of useless nuclear generated items.
More NEI improvements.
Made Dehydrator and FFPP recipe handling more lenient.

5 files changed, 72 insertions, 72 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index e475f00451..b263f8ff52 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -447,17 +447,17 @@ public class RECIPES_GREGTECH {
 		//Hypogen Creation
 		GT_Values.RA.addFusionReactorRecipe(
 				Materials.Neutronium.getMolten(128),
-				ALLOY.QUANTUM.getFluid(256),
-				ELEMENT.STANDALONE.HYPOGEN.getFluid(4),
+				ALLOY.QUANTUM.getFluidStack(256),
+				ELEMENT.STANDALONE.HYPOGEN.getFluidStack(4),
 				2048 * 4,
 				(int) MaterialUtils.getVoltageForTier(9),
 				600000000 * 2);
 
 		//Rhugnor
 		GT_Values.RA.addFusionReactorRecipe(
-				GenericChem.TEFLON.getFluid(64),
-				ALLOY.PIKYONIUM.getFluid(128),
-				ELEMENT.STANDALONE.RHUGNOR.getFluid(8),
+				GenericChem.TEFLON.getFluidStack(64),
+				ALLOY.PIKYONIUM.getFluidStack(128),
+				ELEMENT.STANDALONE.RHUGNOR.getFluidStack(8),
 				2048 * 4,
 				(int) MaterialUtils.getVoltageForTier(7),
 				150000000 * 2);
@@ -499,10 +499,10 @@ public class RECIPES_GREGTECH {
 						aCoilWire[3]
 				}, 
 				new FluidStack[] {
-						ALLOY.NITINOL_60.getFluid(144 * 9 * (GTNH ? 4 : 2)),
-						ALLOY.ENERGYCRYSTAL.getFluid(144 * 9 * (GTNH ? 8 : 4)),
-						ALLOY.TUMBAGA.getFluid(144 * 9 * (GTNH ? 32 : 8)),
-						ALLOY.NICHROME.getFluid(144 * 1 * (GTNH ? 16 : 4)),
+						ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)),
+						ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * (GTNH ? 8 : 4)),
+						ALLOY.TUMBAGA.getFluidStack(144 * 9 * (GTNH ? 32 : 8)),
+						ALLOY.NICHROME.getFluidStack(144 * 1 * (GTNH ? 16 : 4)),
 
 				},
 				ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32), 
@@ -581,8 +581,8 @@ public class RECIPES_GREGTECH {
 						CI.getTieredFluid(8, 144 * 32),
 						CI.getAlternativeTieredFluid(7, 144 * 16),
 						CI.getTertiaryTieredFluid(7, 144 * 16),
-						ALLOY.BABBIT_ALLOY.getFluid(128 * 144),
-						ALLOY.ZERON_100.getFluid(144 * 64)
+						ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144),
+						ALLOY.ZERON_100.getFluidStack(144 * 64)
 
 				},
 				GregtechItemList.Hatch_Input_TurbineHousing.get(4), 
@@ -934,7 +934,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(1),
 						ELEMENT.getInstance().SILICON.getDust(4)
 				},
-				ALLOY.EGLIN_STEEL.getFluid(16 * 144),
+				ALLOY.EGLIN_STEEL.getFluidStack(16 * 144),
 				0, 
 				20 * 45,
 				120);
@@ -948,8 +948,8 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CALCIUM.getDust(2),
 						ELEMENT.getInstance().COPPER.getDust(3),
 				},
-				ELEMENT.getInstance().OXYGEN.getFluid(8000),
-				ALLOY.HG1223.getFluid(16 * 144),
+				ELEMENT.getInstance().OXYGEN.getFluidStack(8000),
+				ALLOY.HG1223.getFluidStack(16 * 144),
 				new ItemStack[] { 
 						CI.emptyCells(1)
 				},
@@ -964,7 +964,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().TITANIUM.getDust(3),
 						ELEMENT.getInstance().NICKEL.getDust(2)
 				},
-				ALLOY.NITINOL_60.getFluid(5 * 144),
+				ALLOY.NITINOL_60.getFluidStack(5 * 144),
 				0,
 				20 * 75,
 				7680);
@@ -981,7 +981,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(2000),
-				ELEMENT.getInstance().GERMANIUM.getFluid(288),
+				ELEMENT.getInstance().GERMANIUM.getFluidStack(288),
 				0,
 				20 * 300,
 				4000);
@@ -995,7 +995,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(2000),
-				ELEMENT.getInstance().RUTHENIUM.getFluid(288),
+				ELEMENT.getInstance().RUTHENIUM.getFluidStack(288),
 				0,
 				20 * 300,
 				8000);
@@ -1006,7 +1006,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(2000),
-				ELEMENT.getInstance().RUTHENIUM.getFluid(288),
+				ELEMENT.getInstance().RUTHENIUM.getFluidStack(288),
 				0,
 				20 * 300,
 				8000);
@@ -1017,7 +1017,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(2000),
-				ELEMENT.getInstance().RUTHENIUM.getFluid(288),
+				ELEMENT.getInstance().RUTHENIUM.getFluidStack(288),
 				0,
 				20 * 300,
 				8000);
@@ -1028,7 +1028,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(8000),
-				ELEMENT.getInstance().RUTHENIUM.getFluid(144),
+				ELEMENT.getInstance().RUTHENIUM.getFluidStack(144),
 				0,
 				20 * 300,
 				8000);
@@ -1041,7 +1041,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(10000),
-				ELEMENT.getInstance().RHENIUM.getFluid(144),
+				ELEMENT.getInstance().RHENIUM.getFluidStack(144),
 				0,
 				20 * 300,
 				4000);
@@ -1052,7 +1052,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(7500),
-				ELEMENT.getInstance().RHENIUM.getFluid(144),
+				ELEMENT.getInstance().RHENIUM.getFluidStack(144),
 				0,
 				20 * 300,
 				4000);
@@ -1063,7 +1063,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(32),
 				},
 				Materials.SulfuricAcid.getFluid(5000),
-				ELEMENT.getInstance().RHENIUM.getFluid(288),
+				ELEMENT.getInstance().RHENIUM.getFluidStack(288),
 				0,
 				20 * 300,
 				4000);
@@ -1077,7 +1077,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().CARBON.getDust(64),
 				},
 				Materials.SulfuricAcid.getFluid(5000),
-				ELEMENT.getInstance().THALLIUM.getFluid(288+144),
+				ELEMENT.getInstance().THALLIUM.getFluidStack(288+144),
 				0,
 				20 * 300,
 				8000);
@@ -1092,7 +1092,7 @@ public class RECIPES_GREGTECH {
 						ELEMENT.getInstance().ALUMINIUM.getDust(8),
 				},
 				null,
-				ELEMENT.getInstance().OXYGEN.getFluid(8000),
+				ELEMENT.getInstance().OXYGEN.getFluidStack(8000),
 				new ItemStack[] { 
 						ELEMENT.getInstance().ALUMINIUM.getIngot(8),
 						ELEMENT.getInstance().STRONTIUM.getIngot(8)
@@ -1822,7 +1822,7 @@ public class RECIPES_GREGTECH {
 		GT_Values.RA.addBlastRecipe(
 				CI.getNumberedCircuit(22),
 				ALLOY.SILICON_CARBIDE.getDust(16),
-				ELEMENT.getInstance().NITROGEN.getFluid(4000),
+				ELEMENT.getInstance().NITROGEN.getFluidStack(4000),
 				GT_Values.NF,
 				ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 8),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSilicon", 8),
@@ -1834,7 +1834,7 @@ public class RECIPES_GREGTECH {
 		GT_Values.RA.addBlastRecipe(
 				GregtechItemList.Bomb_Cast.get(4),
 				ALLOY.STEEL.getDust(16),
-				ELEMENT.getInstance().OXYGEN.getFluid(2000),
+				ELEMENT.getInstance().OXYGEN.getFluidStack(2000),
 				GT_Values.NF,
 				GregtechItemList.Bomb_Cast_Molten.get(4),
 				null,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index e7c0ce3f38..4998d4bdbd 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -311,7 +311,7 @@ public class RECIPES_Machines {
 						CI.getTieredComponentOfMaterial(Materials.CobaltBrass, OrePrefixes.dust, 16),
 						CI.getTieredComponent(OrePrefixes.frameGt, 2, 4),
 				}, 
-				ALLOY.STEEL.getFluid(2 * (144 * 4)), 
+				ALLOY.STEEL.getFluidStack(2 * (144 * 4)), 
 				GregtechItemList.ChemicalPlant_Controller.get(1), 
 				120 * 20, 
 				MaterialUtils.getVoltageForTier(2));
@@ -326,7 +326,7 @@ public class RECIPES_Machines {
 						CI.getTieredComponentOfMaterial(Materials.Lead, OrePrefixes.plate, 48),
 						CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16),
 				}, 
-				ALLOY.BRONZE.getFluid(2 * (144 * 4)), 
+				ALLOY.BRONZE.getFluidStack(2 * (144 * 4)), 
 				GregtechItemList.Bus_Catalysts.get(1), 
 				60 * 20, 
 				MaterialUtils.getVoltageForTier(2));
@@ -354,7 +354,7 @@ public class RECIPES_Machines {
 						CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.bolt, 16),
 						CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32),
 				}, 
-				ALLOY.POTIN.getFluid(2 * (144 * 4)), 
+				ALLOY.POTIN.getFluidStack(2 * (144 * 4)), 
 				GregtechItemList.AlgaeFarm_Controller.get(1), 
 				60 * 20, 
 				MaterialUtils.getVoltageForTier(1));	
@@ -372,10 +372,10 @@ public class RECIPES_Machines {
 						CI.getTieredComponent(OrePrefixes.circuit, 6, 8)
 				}, 
 				new FluidStack[] {
-						ALLOY.AQUATIC_STEEL.getFluid(144 * 32),
-						ALLOY.BABBIT_ALLOY.getFluid(144 * 16),
-						ALLOY.BRONZE.getFluid(144 * 64),
-						ALLOY.KANTHAL.getFluid(144 * 16),
+						ALLOY.AQUATIC_STEEL.getFluidStack(144 * 32),
+						ALLOY.BABBIT_ALLOY.getFluidStack(144 * 16),
+						ALLOY.BRONZE.getFluidStack(144 * 64),
+						ALLOY.KANTHAL.getFluidStack(144 * 16),
 				}, 
 				new ItemStack[] {
 						GregtechItemList.Machine_Adv_DistillationTower.get(1)
@@ -412,7 +412,7 @@ public class RECIPES_Machines {
 							CI.getTransmissionComponent(i - 1, 8),
 							CI.getTieredComponent(OrePrefixes.cableGt08, i, 16)
 					}, 
-					ALLOY.EGLIN_STEEL.getFluid(i * (144 * 4)), 
+					ALLOY.EGLIN_STEEL.getFluidStack(i * (144 * 4)), 
 					aOutputs[aIndex++].copy(), 
 					300 * 20, 
 					MaterialUtils.getVoltageForTier(i));			
@@ -552,7 +552,7 @@ public class RECIPES_Machines {
 							CI.machineHull_IV,
 							ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2)
 					}, 
-					ELEMENT.getInstance().TANTALUM.getFluid(144 * 16), 
+					ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16), 
 					GregtechItemList.Gregtech_Computer_Cube.get(1),
 					60 * 20 * 3, 
 					8000);
@@ -566,7 +566,7 @@ public class RECIPES_Machines {
 							ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2),
 							ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2)
 					}, 
-					ELEMENT.getInstance().IRON.getFluid(144 * 4), 
+					ELEMENT.getInstance().IRON.getFluidStack(144 * 4), 
 					ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
 					60 * 10 * 1, 
 					30);
@@ -579,7 +579,7 @@ public class RECIPES_Machines {
 							ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9),
 							ItemUtils.getSimpleStack(Blocks.chest)
 					}, 
-					ELEMENT.getInstance().LEAD.getFluid(144 * 16), 
+					ELEMENT.getInstance().LEAD.getFluidStack(144 * 16), 
 					ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest),
 					60 * 10 * 3, 
 					60);
@@ -594,7 +594,7 @@ public class RECIPES_Machines {
 							ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32),
 							ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 7 : 6), GTNH ? 5 : 4)
 					}, 
-					ALLOY.NIOBIUM_CARBIDE.getFluid(144 * 16), 
+					ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16), 
 					GregtechItemList.RTG.get(1),
 					60 * 20 * 10, 
 					8000);
@@ -607,7 +607,7 @@ public class RECIPES_Machines {
 							ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8),
 							ItemUtils.getSimpleStack(Blocks.jukebox)
 					}, 
-					ELEMENT.getInstance().COPPER.getFluid(144 * 2), 
+					ELEMENT.getInstance().COPPER.getFluidStack(144 * 2), 
 					ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox),
 					20 * 30, 
 					30);
@@ -624,7 +624,7 @@ public class RECIPES_Machines {
 							ALLOY.EGLIN_STEEL.getPlate(GTNH ? 8 : 4),
 							ALLOY.POTIN.getScrew(GTNH ? 12 : 6)
 					}, 
-					ALLOY.TUMBAGA.getFluid(144 * 4), 
+					ALLOY.TUMBAGA.getFluidStack(144 * 4), 
 					ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
 					20 * 60, 
 					30);
@@ -1058,9 +1058,9 @@ public class RECIPES_Machines {
 					CI.getGear(3, GTNH ? 4 : 2)
 			};
 			FluidStack[] aSemiFluidFluidInputs = new FluidStack[] {
-					ALLOY.BRONZE.getFluid(144 * 8),
-					ALLOY.STEEL.getFluid(144 * 8),
-					ELEMENT.getInstance().ALUMINIUM.getFluid(144 * 8),
+					ALLOY.BRONZE.getFluidStack(144 * 8),
+					ALLOY.STEEL.getFluidStack(144 * 8),
+					ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8),
 			};
 
 			//ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);			
@@ -1516,7 +1516,7 @@ public class RECIPES_Machines {
 								ALLOY.EGLIN_STEEL.getLongRod(GTNH ? 16 : 4),
 								CI.getElectricPiston(3, GTNH ? 4 : 2)
 						},					
-						ALLOY.ZIRCONIUM_CARBIDE.getFluid(144 * 8), //Input Fluid					
+						ALLOY.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8), //Input Fluid					
 						RECIPE_CyclotronOuterCasing,					
 						30 * 20 * 2, 
 						MaterialUtils.getVoltageForTier(4));
@@ -1532,7 +1532,7 @@ public class RECIPES_Machines {
 								ALLOY.INCOLOY_020.getScrew(GTNH ? 64 : 32),
 								CI.getFieldGenerator(4, GTNH ? 2 : 1)
 						},					
-						ALLOY.HG1223.getFluid(144 * 5), //Input Fluid					
+						ALLOY.HG1223.getFluidStack(144 * 5), //Input Fluid					
 						RECIPE_CyclotronInnerCoil,					
 						60 * 20 * 2, 
 						MaterialUtils.getVoltageForTier(5));
@@ -1548,7 +1548,7 @@ public class RECIPES_Machines {
 								ALLOY.INCOLOY_MA956.getScrew(GTNH ? 64 : 16),
 								ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 6 : 5), GTNH ? 8 : 16)
 						},					
-						ALLOY.INCOLOY_020.getFluid(144 * 9), //Input Fluid					
+						ALLOY.INCOLOY_020.getFluidStack(144 * 9), //Input Fluid					
 						RECIPE_CyclotronController,					
 						60 * 20 * 5, 
 						MaterialUtils.getVoltageForTier(5));
@@ -1855,8 +1855,8 @@ public class RECIPES_Machines {
 										GregtechItemList.Casing_Fusion_Internal.get(1)
 						},
 						new FluidStack[] {
-								ALLOY.PIKYONIUM.getFluid(32 * 144 * (GTNH ? 2 : 1)),
-								ALLOY.HG1223.getFluid(64 * 144)
+								ALLOY.PIKYONIUM.getFluidStack(32 * 144 * (GTNH ? 2 : 1)),
+								ALLOY.HG1223.getFluidStack(64 * 144)
 						},
 						GregtechItemList.FusionComputer_UV2.get(1),
 						(int) GT_Values.V[6],
@@ -1878,7 +1878,7 @@ public class RECIPES_Machines {
 						},
 						new FluidStack[] {
 								Materials.NaquadahAlloy.getMolten(576 * (GTNH ? 2 : 1)),
-								ALLOY.ZERON_100.getFluid(16 * 144)
+								ALLOY.ZERON_100.getFluidStack(16 * 144)
 						},
 						GregtechItemList.Casing_Fusion_External.get(1),
 						(int) GT_Values.V[5],
@@ -1900,8 +1900,8 @@ public class RECIPES_Machines {
 								ItemList.Casing_Fusion_Coil.get(1)
 						},
 						new FluidStack[] {
-								ALLOY.CINOBITE.getFluid(16 * 144 * (GTNH ? 2 : 1)),
-								ALLOY.ABYSSAL.getFluid(64 * 144)
+								ALLOY.CINOBITE.getFluidStack(16 * 144 * (GTNH ? 2 : 1)),
+								ALLOY.ABYSSAL.getFluidStack(64 * 144)
 						},
 						GregtechItemList.Casing_Fusion_Internal.get(1),
 						(int) GT_Values.V[5],
@@ -1935,7 +1935,7 @@ public class RECIPES_Machines {
 								ALLOY.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * (GTNH ? 2 : 1)),
 								ItemUtils.getSimpleStack((GTNH ? CI.machineHull_UV : CI.machineHull_LuV), 1 * (GTNH ? 2 : 1)),
 						},
-						ALLOY.MARAGING350.getFluid(144 * 16  * (GTNH ? 2 : 1)),
+						ALLOY.MARAGING350.getFluidStack(144 * 16  * (GTNH ? 2 : 1)),
 						GregtechItemList.Casing_BedrockMiner.get(1),
 						(int) GT_Values.V[4],
 						(int) GT_Values.V[6]);
@@ -2084,7 +2084,7 @@ public class RECIPES_Machines {
 						ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+(GTNH ? "2" : "1"), GTNH ? 4 : 2),
 						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 3 : 2), GTNH ? 10 : 5)
 				},					
-				aMat_B[3].getFluid(144 * 8), //Input Fluid					
+				aMat_B[3].getFluidStack(144 * 8), //Input Fluid					
 				GregtechItemList.Hatch_Control_Core.get(1),					
 				60 * 20 * 5, 
 				MaterialUtils.getVoltageForTier(3));
@@ -2455,7 +2455,7 @@ public class RECIPES_Machines {
 						ALLOY.INCONEL_625.getPlate(16),
 						ALLOY.ZERON_100.getBolt(16),
 				}, 
-				ALLOY.TUNGSTENSTEEL.getFluid(8 * 144), 
+				ALLOY.TUNGSTENSTEEL.getFluidStack(8 * 144), 
 				GregtechItemList.Casing_IsaMill_Gearbox.get(1), 
 				60 * 20 * 2, 
 				MaterialUtils.getVoltageForTier(6));
@@ -2470,7 +2470,7 @@ public class RECIPES_Machines {
 						CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.gearGtSmall, 4),
 						ALLOY.ZERON_100.getScrew(8),
 				}, 
-				ELEMENT.getInstance().TITANIUM.getFluid(4 * 144), 
+				ELEMENT.getInstance().TITANIUM.getFluidStack(4 * 144), 
 				GregtechItemList.Casing_IsaMill_Casing.get(1), 
 				60 * 20 * 2, 
 				MaterialUtils.getVoltageForTier(6));
@@ -2485,7 +2485,7 @@ public class RECIPES_Machines {
 						CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.plate, 8),
 						ALLOY.INCOLOY_MA956.getBolt(16),
 				}, 
-				ELEMENT.getInstance().ALUMINIUM.getFluid(8 * 144), 
+				ELEMENT.getInstance().ALUMINIUM.getFluidStack(8 * 144), 
 				GregtechItemList.Casing_IsaMill_Pipe.get(1), 
 				60 * 20 * 8, 
 				MaterialUtils.getVoltageForTier(4));	
@@ -2529,7 +2529,7 @@ public class RECIPES_Machines {
 						CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.plateDouble, 4),
 						ALLOY.HASTELLOY_N.getScrew(8),
 				}, 
-				ALLOY.STAINLESS_STEEL.getFluid(8 * 144), 
+				ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144), 
 				GregtechItemList.Casing_Flotation_Cell.get(1), 
 				60 * 20 * 2, 
 				MaterialUtils.getVoltageForTier(6));
@@ -2544,7 +2544,7 @@ public class RECIPES_Machines {
 						CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plate, 32),
 						CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16),
 				}, 
-				ELEMENT.getInstance().TUNGSTEN.getFluid(8 * 144), 
+				ELEMENT.getInstance().TUNGSTEN.getFluidStack(8 * 144), 
 				GregtechItemList.Bus_Milling_Balls.get(1), 
 				60 * 20 * 4, 
 				MaterialUtils.getVoltageForTier(5));
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
index d3c0b4c093..97636e9e65 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
@@ -51,7 +51,7 @@ public class RECIPES_RareEarthProcessing {
 		if (mSaltWater == null) {
 			Fluid f = SALT_WATER.generateFluid();
 			SALT_WATER.registerComponentForMaterial(FluidUtils.getFluidStack(f, 1000));
-			mSaltWater = SALT_WATER.getFluid(1000);
+			mSaltWater = SALT_WATER.getFluidStack(1000);
 		}
 		else {
 			SALT_WATER.registerComponentForMaterial(FluidUtils.getFluidStack(mSaltWater, 1000));    		
@@ -62,7 +62,7 @@ public class RECIPES_RareEarthProcessing {
 		if (mBrine == null) {
 			Fluid f = BRINE.generateFluid();
 			BRINE.registerComponentForMaterial(FluidUtils.getFluidStack(f, 1000));
-			mBrine = BRINE.getFluid(1000);
+			mBrine = BRINE.getFluidStack(1000);
 		}
 		else {
 			BRINE.registerComponentForMaterial(FluidUtils.getFluidStack(mBrine, 1000));    		
@@ -88,7 +88,7 @@ public class RECIPES_RareEarthProcessing {
 		mHydrogenChloride = FluidUtils.getFluidStack("hydrogenchloride", 1000);
 		if (mHydrogenChloride == null) {
 			HYDROGEN_CHLORIDE.generateFluid();
-			mHydrogenChloride = BRINE.getFluid(1000);
+			mHydrogenChloride = BRINE.getFluidStack(1000);
 		}
 		else {
 			HYDROGEN_CHLORIDE.registerComponentForMaterial(FluidUtils.getFluidStack(mHydrogenChloride, 1000));    		
@@ -98,7 +98,7 @@ public class RECIPES_RareEarthProcessing {
 		// Add Process for creating Brine
 		CORE.RA.addBrewingRecipe(
 				ItemUtils.getSimpleStack(mDustSalt, 16),
-				MISC_MATERIALS.SALT_WATER.getFluid(2000),
+				MISC_MATERIALS.SALT_WATER.getFluidStack(2000),
 				FluidUtils.getFluidStack(mBrine, 4000),
 				20 * 20,
 				120,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
index 0156031a95..9a2ea8bad0 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
@@ -23,10 +23,10 @@ public class RECIPES_SeleniumProcessing {
 		processCopperRecipes();
 
 		//Liquify the Dried Dioxide
-		AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), 13, FluidUtils.getSteam(500), null, MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(1000), 20, 1024);
+		AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), 13, FluidUtils.getSteam(500), null, MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(1000), 20, 1024);
 
 		// Produce Selenious Acid        
-		AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1), 14, FluidUtils.getHotWater(4000), CI.emptyCells(1), MISC_MATERIALS.SELENIOUS_ACID.getFluid(1000), 20, 2048);
+		AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1), 14, FluidUtils.getHotWater(4000), CI.emptyCells(1), MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(1000), 20, 2048);
 
 		// Make Selenium        
 		CORE.RA.addBlastSmelterRecipe(
@@ -35,8 +35,8 @@ public class RECIPES_SeleniumProcessing {
 						ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 8),
 						ELEMENT.getInstance().CARBON.getDust(16),
 				},
-				MISC_MATERIALS.SELENIOUS_ACID.getFluid(750),
-				ELEMENT.getInstance().SELENIUM.getFluid(144 * 1),
+				MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750),
+				ELEMENT.getInstance().SELENIUM.getFluidStack(144 * 1),
 				new ItemStack[] {
 						CI.emptyCells(8),
 						ELEMENT.getInstance().SELENIUM.getIngot(1),
@@ -93,7 +93,7 @@ public class RECIPES_SeleniumProcessing {
 						ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1), // Item Input
 				},
 				FluidUtils.getHotWater(1000), // Fluid
-				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(20), // Fluid
+				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(20), // Fluid
 				new ItemStack[] {
 						ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1),
 						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
@@ -126,7 +126,7 @@ public class RECIPES_SeleniumProcessing {
 						ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1), // Item Input
 				},
 				FluidUtils.getHotWater(1000), // Fluid
-				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
+				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid
 				new ItemStack[] {
 						ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1),
 						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
@@ -159,7 +159,7 @@ public class RECIPES_SeleniumProcessing {
 						ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), // Item Input
 				},
 				FluidUtils.getHotWater(1000), // Fluid
-				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
+				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid
 				new ItemStack[] {
 						ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1),
 						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
@@ -192,7 +192,7 @@ public class RECIPES_SeleniumProcessing {
 						ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1), // Item Input
 				},
 				FluidUtils.getHotWater(1000), // Fluid
-				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid
+				MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid
 				new ItemStack[] {
 						ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1),
 						MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 93ede378a8..35d0a0ec07 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -632,7 +632,7 @@ public class CI {
 		}*/		
 
 		// Modern Handling
-		FluidStack a = aMaster[aType][aTier].getFluid(aAmount);			
+		FluidStack a = aMaster[aType][aTier].getFluidStack(aAmount);			
 		if (a == null) {
 			ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1);
 			if (aCell != null) {