diff options
| author | Technus <daniel112092@gmail.com> | 2019-07-13 22:10:51 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2019-07-13 22:10:51 +0200 |
| commit | e711f6821aa8bc076420700548f5cf0ec6175ec1 (patch) | |
| tree | 125e8026137d7537b0cedeffcbc0de6caf7c7a1d /src | |
| parent | 199de28b7ed2f07c8eea00b13695211c5738c4a8 (diff) | |
| parent | 827325cbda53dbfedf9f01a804f36908ea0b0149 (diff) | |
| download | GT5-Unofficial-e711f6821aa8bc076420700548f5cf0ec6175ec1.tar.gz GT5-Unofficial-e711f6821aa8bc076420700548f5cf0ec6175ec1.tar.bz2 GT5-Unofficial-e711f6821aa8bc076420700548f5cf0ec6175ec1.zip | |
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 3d682b8eb6..6886fbef2d 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2443,9 +2443,9 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8L), ItemList.QuantumStar.get(2, new Object(){}), new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 4}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7L)}, new FluidStack[]{ Materials.SolderingAlloy.getMolten(1152)}, ItemList.Emitter_ZPM.get(1), 600, 24000); @@ -2485,9 +2485,9 @@ public class GT_MachineRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8L), ItemList.QuantumStar.get(2, new Object(){}), new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 4}, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 64L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7L)}, new FluidStack[]{ Materials.SolderingAlloy.getMolten(1152)}, ItemList.Sensor_ZPM.get(1), 600, 24000); |