diff options
| author | Technus <daniel112092@gmail.com> | 2016-10-19 14:57:15 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-10-19 14:57:15 +0200 |
| commit | 6e713952ddbe727d727c81719f157960eb07ea6f (patch) | |
| tree | b47fe40b32d675c17a2b6c5629d99cadd83e541f /src/main/java/gregtech/loaders | |
| parent | 2d2786b7dc9e28130a521c846eac6351625a8800 (diff) | |
| download | GT5-Unofficial-6e713952ddbe727d727c81719f157960eb07ea6f.tar.gz GT5-Unofficial-6e713952ddbe727d727c81719f157960eb07ea6f.tar.bz2 GT5-Unofficial-6e713952ddbe727d727c81719f157960eb07ea6f.zip | |
Trinium added, removed ez-mode Naquadah alloy, added recipes for duranium and tritanium
Diffstat (limited to 'src/main/java/gregtech/loaders')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 2 |
2 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 01b365fbcc..be5b0ccd5c 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -896,7 +896,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_Values.NI, Materials.Oxygen.getGas(1000L), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.AnnealedCopper, 1L), GT_Values.NI, 500, 120, 1200); GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectricalSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L), GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DarkSteel, 1L), GT_Values.NI, 4000, 120, 2000); GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 3L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), Materials.Helium.getGas(1000), null, GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Osmiridium, 4L), null, 500, 1920, 2900); - GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmiridium, 1L), Materials.Argon.getGas(1000), null, GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.NaquadahAlloy, 2L), null, 500, 30720, Materials.NaquadahAlloy.mBlastFurnaceTemp); + //GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmiridium, 1L), Materials.Argon.getGas(1000), null, GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.NaquadahAlloy, 2L), null, 500, 30720, Materials.NaquadahAlloy.mBlastFurnaceTemp); GT_Values.RA.addCannerRecipe(GT_ModHandler.getIC2Item("fuelRod", 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 1L), GT_ModHandler.getIC2Item("reactorLithiumCell", 1, 1), null, 16, 64); GT_Values.RA.addFluidExtractionRecipe(GT_ModHandler.getIC2Item("TritiumCell", 1), GT_ModHandler.getIC2Item("fuelRod", 1), Materials.Tritium.getGas(32), 10000, 16, 64); @@ -931,7 +931,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFusionReactorRecipe(Materials.Vanadium.getMolten(16), Materials.Hydrogen.getGas(125), Materials.Chrome.getMolten(16), 64, 24576, 140000000); //FT1 - utility GT_Values.RA.addFusionReactorRecipe(Materials.Gallium.getMolten(16),Materials.Radon.getGas(125),Materials.Duranium.getMolten(16),64,16384,140000000); - GT_Values.RA.addFusionReactorRecipe(Materials.Titanium.getMolten(16),Materials.Duranium.getMolten(16),Materials.Tritanium.getMolten(16),64,32768,200000000); + GT_Values.RA.addFusionReactorRecipe(Materials.Titanium.getMolten(16),Materials.Duranium.getMolten(16),Materials.Tritanium.getMolten(16),64,32700,200000000); //NEW RECIPES FOR FUSION GT_Values.RA.addFusionReactorRecipe(Materials.Magnesium.getMolten(125), Materials.Carbon.getMolten(125), Materials.Argon.getPlasma(125), 16, 24576, 180000000);//FT1+ - utility diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 983d43cf58..2956303e5b 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -212,7 +212,7 @@ public class GT_Loader_Item_Block_And_Fluid Materials.Manganese, Materials.MeteoricIron, Materials.MeteoricSteel, - Materials.Midasium, + Materials.Trinium, Materials.Mithril, Materials.Molybdenum, Materials.Naquadah, |