diff options
| author | Serenibyss <10861407+serenibyss@users.noreply.github.com> | 2023-07-12 06:31:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-12 13:31:26 +0200 |
| commit | 76566c04a14f7e57e843cd9d3d976b1dd680385b (patch) | |
| tree | 2cbfac01d6f481dd654c8155f7eb921c145a091a /src/main/java/gtPlusPlus/core/item | |
| parent | 395eec3625db2819f61953aaa268106cb3c4045a (diff) | |
| download | GT5-Unofficial-76566c04a14f7e57e843cd9d3d976b1dd680385b.tar.gz GT5-Unofficial-76566c04a14f7e57e843cd9d3d976b1dd680385b.tar.bz2 GT5-Unofficial-76566c04a14f7e57e843cd9d3d976b1dd680385b.zip | |
Fix some recipe conflicts (#688)
* Rope conflict
* Ethylbenzene conflict
* Rock Salt, Potash conflicts
* spotless apply
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index d335281fd9..b542cd392e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -98,10 +98,18 @@ public class CoalTar extends ItemPackage { // C2H4 + C6H6 = C8H10 GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), + ItemUtils.getGregtechCircuit(1), + FluidUtils.getFluidStack("benzene", 2000), + FluidUtils.getFluidStack("fluid.ethylbenzene", 2000), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), + 300); + + GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), - null, + ItemUtils.getGregtechCircuit(1), + FluidUtils.getFluidStack("ethylene", 2000), FluidUtils.getFluidStack("fluid.ethylbenzene", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 4), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), 300); } |