Merged in MillingRecipes (pull request #7)

Milling Recipes & many other misc fixes

3 files changed, 28 insertions, 9 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 1561f4b475..ea1bcdb9de 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -120,7 +120,7 @@ public class RECIPES_GREGTECH {
 		// Advanced method for Nitric Acid Production
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
-						CI.getNumberedBioCircuit(17),
+						CI.getNumberedAdvancedCircuit(17),
 						CI.getPinkCatalyst(0),
 				},
 				new FluidStack[] {
@@ -140,7 +140,7 @@ public class RECIPES_GREGTECH {
 		
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
-						CI.getNumberedBioCircuit(16),
+						CI.getNumberedAdvancedCircuit(16),
 						CI.getPinkCatalyst(0),
 				},
 				new FluidStack[] {
@@ -161,7 +161,7 @@ public class RECIPES_GREGTECH {
 		// Produce Boric Acid
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
-						CI.getNumberedCircuit(21),
+						CI.getNumberedAdvancedCircuit(21),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 4),
 				}, 
 				new FluidStack[] {
@@ -182,7 +182,7 @@ public class RECIPES_GREGTECH {
 		// Produce Th232
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
-						CI.getNumberedCircuit(22),
+						CI.getNumberedAdvancedCircuit(22),
 						ELEMENT.getInstance().THORIUM.getDust(16)
 				}, 
 				new FluidStack[] {
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index ebc2c07a63..387f7bef65 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -265,6 +265,21 @@ public class RECIPES_Machines {
 				GregtechItemList.ChemicalPlant_Controller.get(1), 
 				120 * 20, 
 				MaterialUtils.getVoltageForTier(2));
+		
+
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(15),
+						CI.getTieredGTPPMachineCasing(1, 2),
+						ItemList.Hatch_Input_Bus_MV.get(1),
+						CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.gearGt, 8),
+						CI.getTieredComponentOfMaterial(Materials.Lead, OrePrefixes.plate, 48),
+						CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16),
+				}, 
+				ALLOY.BRONZE.getFluid(2 * (144 * 4)), 
+				GregtechItemList.Bus_Catalysts.get(1), 
+				60 * 20, 
+				MaterialUtils.getVoltageForTier(2));
 
 	}
 
@@ -301,7 +316,7 @@ public class RECIPES_Machines {
 
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
-						CI.getNumberedBioCircuit(19),
+						CI.getNumberedAdvancedCircuit(19),
 						ItemList.Distillation_Tower.get(2),
 						GregtechItemList.GTPP_Casing_IV.get(16),
 						CI.getTieredComponent(OrePrefixes.circuit, 6, 8)
@@ -340,7 +355,7 @@ public class RECIPES_Machines {
 			}			
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
-							CI.getNumberedBioCircuit(21),
+							CI.getNumberedAdvancedCircuit(21),
 							CI.getElectricPiston(i, 10),
 							CI.getFieldGenerator(i + 1, 6),
 							CI.getPlate(i, 16),
@@ -917,7 +932,7 @@ public class RECIPES_Machines {
 					CI.getGear(1, GTNH ? 4 : 2)
 			};
 			aSemiFluidInputs[1] = new ItemStack[]{
-					CI.getNumberedBioCircuit(14),
+					CI.getNumberedCircuit(14),
 					CI.getTieredMachineHull(2, 1),
 					CI.getElectricPiston(2, GTNH ? 4 : 2),
 					CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 4 : 2),
@@ -925,7 +940,7 @@ public class RECIPES_Machines {
 					CI.getGear(2, GTNH ? 4 : 2)
 			};
 			aSemiFluidInputs[2] = new ItemStack[]{
-					CI.getNumberedBioCircuit(14),
+					CI.getNumberedAdvancedCircuit(14),
 					CI.getTieredMachineHull(3, 1),
 					CI.getElectricPiston(3, GTNH ? 4 : 2),
 					CI.getTieredComponent(OrePrefixes.circuit, 3, GTNH ? 4 : 2),
@@ -2268,7 +2283,7 @@ public class RECIPES_Machines {
 
 		CORE.RA.addSixSlotAssemblingRecipe(				
 				new ItemStack[] {
-						GregtechItemList.Casing_Vacuum_Furnace.get(Casing_Amount),
+						GregtechItemList.Casing_Vacuum_Furnace.get(aCostMultiplier),
 						CI.getTieredComponent(OrePrefixes.wireGt16, 7, 4 * aCostMultiplier),
 						CI.getEnergyCore(6, 1 * aCostMultiplier),
 						CI.getRobotArm(4, 4 * aCostMultiplier),
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index d67a372572..93ede378a8 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -1235,6 +1235,10 @@ public class CI {
 		return ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, i, 0);
 	}
 
+	public static ItemStack getNumberedAdvancedCircuit(int i) {
+		return ItemUtils.simpleMetaStack(GenericChem.mAdvancedCircuit, i, 0);
+	}
+
 	public static ItemStack getTieredGTPPMachineCasing(int aTier, int aAmount) {
 		GregtechItemList[] aHulls = new GregtechItemList[] {
 				GregtechItemList.GTPP_Casing_ULV,