aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-11-17 22:16:25 +0100
committerDream-Master <dream-master@gmx.net>2018-11-17 22:16:25 +0100
commit9aac317f919e2fc4cee633b8789a585e82fe7bef (patch)
treee5cdb4a76585891cf61866f1861d0de27c961d0e /src/main/java/gregtech
parent8dc005cc7eee5f4cfae63c9c0996b886c39f70f6 (diff)
downloadGT5-Unofficial-9aac317f919e2fc4cee633b8789a585e82fe7bef.tar.gz
GT5-Unofficial-9aac317f919e2fc4cee633b8789a585e82fe7bef.tar.bz2
GT5-Unofficial-9aac317f919e2fc4cee633b8789a585e82fe7bef.zip
normal rubber allowed in luv pump #3834
https://github.com/GTNewHorizons/NewHorizons/issues/3834
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index f0b27a2495..2495abc64b 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -2236,7 +2236,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NiobiumTitanium, 2L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2L),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.HSSS, 8L),
- new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.Rubber), 8L), GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.StyreneButadieneRubber), 4L), GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.Silicone), 4L)},
+ new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.StyreneButadieneRubber), 4L), GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.Silicone), 4L)},
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.HSSS, 2L),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(144),
@@ -2247,7 +2247,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 2L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2L),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 8L),
- new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.Rubber), 16L), GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.StyreneButadieneRubber), 8L), GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.Silicone), 8L)},
+ new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.StyreneButadieneRubber), 8L), GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.Silicone), 8L)},
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 2L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(288),
@@ -2258,7 +2258,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 8L),
- new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.Rubber), 32L), GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.StyreneButadieneRubber), 16L), GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.Silicone), 16L)},
+ new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.StyreneButadieneRubber), 16L), GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.Silicone), 16L)},
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 2L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2L)}, new FluidStack[]{
Materials.Naquadria.getMolten(1296),
@@ -2614,7 +2614,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Circuit_Parts_DiodeSMD.get(8, o),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32)},
new FluidStack[]{
- Materials.SolderingAlloy.getMolten(2880), GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)},
+ Materials.SolderingAlloy.getMolten(2880), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)},
ItemList.Energy_Module.get(1, o), 2000, 100000);
GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1, o), 288000, new ItemStack[]{