diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-08-21 18:43:15 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-08-21 18:43:15 +0200 |
| commit | 53c829b2cf42f11afa40f6efd6d005d121201204 (patch) | |
| tree | 09df420f9a2c7448c68e398d2dfeb2397c7cf941 /src/main/java/gregtech/loaders/postload | |
| parent | d52744b96bb0e0fbe1ea5afcb463ffcc5555c3e6 (diff) | |
| download | GT5-Unofficial-53c829b2cf42f11afa40f6efd6d005d121201204.tar.gz GT5-Unofficial-53c829b2cf42f11afa40f6efd6d005d121201204.tar.bz2 GT5-Unofficial-53c829b2cf42f11afa40f6efd6d005d121201204.zip | |
cherry pick
Commit: 262951068334a5cd18a046d360eb7aa26a507934 [2629510]
Fixed collision between Acetic Acid and Vinyl Chloride recipes
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 52e922759c..f738626f54 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2771,7 +2771,8 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalRecipe(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(9), Materials.Ethylene.getGas(1000), Materials.AceticAcid.getFluid(1000), Materials.Empty.getCells(2), 100); GT_Values.RA.addChemicalRecipe(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(19), Materials.Oxygen.getGas(2000), GT_Values.NF, Materials.AceticAcid.getCells(1), 100); GT_Values.RA.addChemicalRecipe(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(19), Materials.Ethylene.getGas(1000), GT_Values.NF, Materials.AceticAcid.getCells(1), Materials.Empty.getCells(1), 100); - GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Oxygen.getCells(2), Materials.Ethylene.getCells(1), GT_Values.NF, Materials.AceticAcid.getFluid(1000), Materials.Empty.getCells(3), GT_Values.NI, 100, 30); + //This recipe collides with one for Vinyl Chloride + //GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Oxygen.getCells(2), Materials.Ethylene.getCells(1), GT_Values.NF, Materials.AceticAcid.getFluid(1000), Materials.Empty.getCells(3), GT_Values.NI, 100, 30); GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{Materials.Carbon.getDust(2), GT_Utility.getIntegratedCircuit(24)}, new FluidStack[]{Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(2000)}, new FluidStack[]{Materials.AceticAcid.getFluid(1000)}, null, 480, 30); GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(24)}, new FluidStack[]{Materials.CarbonMonoxide.getGas(2000), Materials.Hydrogen.getGas(4000)}, new FluidStack[]{Materials.AceticAcid.getFluid(1000)}, null, 320, 30); |