aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-10-05 22:52:53 +0200
committerDream-Master <dream-master@gmx.net>2018-10-05 22:52:53 +0200
commit7afd4ca647a9bb00f6d66a193f6d7300de02df8c (patch)
treeaabfb18eb3d969495134fe4457b6f7ba0dd62558 /src/main/java/gregtech
parent6dde97a446fd67b2dca35016d9afff9cf1800497 (diff)
parentc491d08d131ad125aeb71b7396a2be04dce4159b (diff)
downloadGT5-Unofficial-7afd4ca647a9bb00f6d66a193f6d7300de02df8c.tar.gz
GT5-Unofficial-7afd4ca647a9bb00f6d66a193f6d7300de02df8c.tar.bz2
GT5-Unofficial-7afd4ca647a9bb00f6d66a193f6d7300de02df8c.zip
Merge branch 'experimental' into GT_Bees_dev
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index b5484af35d..1298673760 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -3105,7 +3105,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.RA.addPyrolyseRecipe(Materials.Sugar.getDust(23), Materials.Nitrogen.getGas(500), 2, Materials.Charcoal.getDust(12), Materials.Water.getFluid(1500), 160, 96);
GT_Values.RA.addUniversalDistillationRecipe(Materials.CharcoalByproducts.getGas(1000),
- new FluidStack[]{Materials.WoodTar.getFluid(250), Materials.WoodVinegar.getFluid(500), Materials.WoodGas.getGas(250)},
+ new FluidStack[]{Materials.WoodTar.getFluid(250), Materials.WoodVinegar.getFluid(400), Materials.WoodGas.getGas(250), Materials.Dimethylbenzene.getFluid(100)},
Materials.Charcoal.getDustSmall(1), 40, 256);
GT_Values.RA.addUniversalDistillationRecipe(Materials.WoodGas.getGas(1000),
new FluidStack[]{Materials.CarbonDioxide.getGas(490), Materials.Ethylene.getGas(20), Materials.Methane.getGas(130), Materials.CarbonMonoxide.getGas(340), Materials.Hydrogen.getGas(20)},
@@ -3114,7 +3114,7 @@ public class GT_MachineRecipeLoader implements Runnable {
new FluidStack[]{Materials.AceticAcid.getFluid(100), Materials.Water.getFluid(500), Materials.Ethanol.getFluid(10), Materials.Methanol.getFluid(300), Materials.Acetone.getFluid(50), Materials.MethylAcetate.getFluid(10)},
GT_Values.NI, 40, 256);
GT_Values.RA.addUniversalDistillationRecipe(Materials.WoodTar.getFluid(1000),
- new FluidStack[]{Materials.Creosote.getFluid(500), Materials.Phenol.getFluid(75), Materials.Benzene.getFluid(350), Materials.Toluene.getFluid(75)},
+ new FluidStack[]{Materials.Creosote.getFluid(300), Materials.Phenol.getFluid(75), Materials.Benzene.getFluid(350), Materials.Toluene.getFluid(75), Materials.Dimethylbenzene.getFluid(200)},
GT_Values.NI, 40, 256);
GT_Values.RA.addChemicalRecipe(Materials.Ethylene.getCells(1), Materials.AceticAcid.getCells(1), Materials.Oxygen.getGas(1000), Materials.VinylAcetate.getFluid(1000),Materials.Water.getCells(1), Materials.Empty.getCells(1), 180);
@@ -3732,7 +3732,7 @@ public class GT_MachineRecipeLoader implements Runnable {
//Dimethylbenzene
GT_Values.RA.addDistilleryRecipe(5, Materials.WoodTar.getFluid(200), Materials.Dimethylbenzene.getFluid(40), 100, 120, false);
- GT_Values.RA.addDistilleryRecipe(5, Materials.CharcoalByproducts.getFluid(200), Materials.Dimethylbenzene.getFluid(20), 100, 120, false);
+ GT_Values.RA.addDistilleryRecipe(5, Materials.CharcoalByproducts.getGas(200), Materials.Dimethylbenzene.getFluid(20), 100, 120, false);
GT_Values.RA.addChemicalRecipe(Materials.Methane.getCells(1), GT_Utility.getIntegratedCircuit(11), Materials.Benzene.getFluid(1000), GT_Values.NF,Materials.Dimethylbenzene.getCells(1), 4000, 120);
GT_Values.RA.addChemicalRecipe(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(12), Materials.Methane.getGas(1000), GT_Values.NF, Materials.Dimethylbenzene.getCells(1), 4000, 120);