Merged in MultiFixes (pull request #11)

MultiFixes

4 files changed, 19 insertions, 19 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 37428b18d6..badd318414 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -5,7 +5,6 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
-import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
@@ -289,6 +288,7 @@ public class CoalTar extends ItemPackage {
 		FluidStack aGtAcid = FluidUtils.getFluidStack("phtalicacid", 500);
 		if (aMyAcid != null && aGtAcid != null) {
 			CORE.RA.addDistilleryRecipe(CI.getNumberedBioCircuit(8), aMyAcid, aGtAcid, null, 50, 16, false);
+			CORE.RA.addDistilleryRecipe(CI.getNumberedBioCircuit(9), aGtAcid, aMyAcid, null, 50, 16, false);
 		}
 	}
 
@@ -354,7 +354,7 @@ public class CoalTar extends ItemPackage {
 		Naphthalene = FluidUtils.generateFluidNonMolten("Naphthalene", "Naphthalene", 115, new short[]{210, 185, 135, 100}, null, null);
 		// v - Oxidize with mercury and nitric acid
 		//Create Phthalic Acid
-		Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phtalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
+		Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
 		// v - Dehydrate at 180C+
 		//Create Phthalic Anhydride
 		//ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O", Utils.rgbtoHexValue(175, 175, 175));
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 80a51d80cc..f61a2096b7 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -406,7 +406,7 @@ public class GenericChem extends ItemPackage {
 				}, 
 				20 *60,
 				120, 
-				2);
+				4);
 
 		//Sodium ethyl xanthate - CH3CH2ONa + CS2 → CH3CH2OCS2Na
 		CORE.RA.addChemicalPlantRecipe(
@@ -425,7 +425,7 @@ public class GenericChem extends ItemPackage {
 				}, 
 				20 *60,
 				120, 
-				2);
+				4);
 		
 	}
 
@@ -869,7 +869,7 @@ public class GenericChem extends ItemPackage {
 				}, 
 				20 * 30, 
 				500, 
-				3);
+				4);
 
 	}
 
@@ -891,7 +891,7 @@ public class GenericChem extends ItemPackage {
 				}, 
 				20 * 15, 
 				120, 
-				1);		
+				2);		
 
 		/*GT_Values.RA.addChemicalRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 4),
@@ -922,7 +922,7 @@ public class GenericChem extends ItemPackage {
 				}, 
 				20 * 40, 
 				120, 
-				1);	
+				2);	
 
 		/*GT_Values.RA.addChemicalRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("platePalladium", 0),
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
index 71bf2f3e6f..8c6e66fcb8 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
@@ -629,7 +629,7 @@ public class MilledOreProcessing extends ItemPackage {
 				},
 				20 * 60,
 				120, 
-				2);
+				3);
 
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
@@ -653,7 +653,7 @@ public class MilledOreProcessing extends ItemPackage {
 				},
 				20 * 45,
 				120, 
-				3);
+				4);
 
 	}
 
@@ -683,7 +683,7 @@ public class MilledOreProcessing extends ItemPackage {
 				aChances,
 				aTime * 20,
 				aEU, 
-				1);
+				3);
 	}
 
 	public static ItemStack[] cleanArray(ItemStack[] input) {
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 719e5145e9..86088fe8c6 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -100,7 +100,7 @@ public class RocketFuels extends ItemPackage {
 		
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 16),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 12),
 						ItemUtils.getSimpleStack(GenericChem.mOrangeCatalyst, 0),
 				},
 				new FluidStack[] {
@@ -118,7 +118,7 @@ public class RocketFuels extends ItemPackage {
 				new int[]{100, 100, 50, 50}, 
 				20*30, 
 				MaterialUtils.getVoltageForTier(3),
-				2);
+				3);
 
 		
 	}
@@ -276,7 +276,7 @@ public class RocketFuels extends ItemPackage {
 				},
 				20 * 60, 
 				120, 
-				2);
+				3);
 
 	}
 
@@ -388,7 +388,7 @@ public class RocketFuels extends ItemPackage {
 				},
 				20 * 30, 
 				240, 
-				3);	
+				4);	
 
 
 		// Monomethylhydrazine_Plus_Nitric_Acid
@@ -397,19 +397,19 @@ public class RocketFuels extends ItemPackage {
 						CI.getNumberedCircuit(3),
 				}, 
 				new FluidStack[] {
-						FluidUtils.getFluidStack(Monomethylhydrazine, 1000),
+						FluidUtils.getFluidStack(Monomethylhydrazine, 2000),
 						FluidUtils.getFluidStack("nitricacid", 1000),
 				}, 
 				new ItemStack[] {
 
 				}, 
 				new FluidStack[] {
-						FluidUtils.getFluidStack(Monomethylhydrazine_Plus_Nitric_Acid, 3000),
+						FluidUtils.getFluidStack(Monomethylhydrazine_Plus_Nitric_Acid, 2000),
 
 				},
 				20 * 45, 
 				480, 
-				3);
+				5);
 
 
 		// Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide
@@ -425,12 +425,12 @@ public class RocketFuels extends ItemPackage {
 
 				}, 
 				new FluidStack[] {
-						FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide, 4000),
+						FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide, 5000),
 
 				},
 				20 * 60, 
 				480, 
-				3);	
+				6);	
 
 	}