diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-11-25 22:49:00 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-11-28 18:56:46 +0100 |
| commit | 05dbd0487328e71cd5278c3f621c94afe97ea854 (patch) | |
| tree | 659d7a9482fd342884c2e390292f4e5a8e9a5909 /src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | |
| parent | 0510f7e9944057d4a89c631256687a0fdcd194f6 (diff) | |
| download | GT5-Unofficial-05dbd0487328e71cd5278c3f621c94afe97ea854.tar.gz GT5-Unofficial-05dbd0487328e71cd5278c3f621c94afe97ea854.tar.bz2 GT5-Unofficial-05dbd0487328e71cd5278c3f621c94afe97ea854.zip | |
cherry pick
Commit: f9c8159f0985b04a50ce3a085f5849d908450eea [f9c8159]
Default off config for GalacticraftOil compat
Diffstat (limited to 'src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 2 |
1 files changed, 1 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 0af682ba71..09d66cbf06 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -799,7 +799,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addUniversalDistillationRecipe(Materials.OilMedium.getFluid(100), new FluidStack[]{Materials.SulfuricGas.getGas(60), Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricLightFuel.getFluid(50), Materials.SulfuricHeavyFuel.getFluid(15)}, null, 32, 64); GT_Values.RA.addUniversalDistillationRecipe(Materials.Oil.getFluid(50L), new FluidStack[]{Materials.SulfuricGas.getGas(60), Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricLightFuel.getFluid(50), Materials.SulfuricHeavyFuel.getFluid(15)}, null, 32, 64); - if (FluidRegistry.getFluid("oilgc") != null) { + if (GregTech_API.sSpecialFile.get("general", "EnableLagencyOilGalactiCraft", false) && FluidRegistry.getFluid("oilgc") != null) { GT_Values.RA.addUniversalDistillationRecipe(new FluidStack(FluidRegistry.getFluid("oilgc"), 50), new FluidStack[]{Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50), Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60)}, null, 20, 96); } GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), new FluidStack(ItemList.sOilExtraHeavy,10), Materials.OilHeavy.getFluid(15), 16, 24, false); |