diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 24 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 9 |
2 files changed, 27 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 c747f50b72..32aa0f36ac 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -616,8 +616,20 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.getDust(Materials.TungstenSteel, 2L * OrePrefixes.dust.mMaterialAmount), - (int) (200L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 500); + (int) (50L * OrePrefixes.dust.mMaterialAmount / 3628800L), + 1920); + GT_Values.RA.addMixerRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L), + GT_Values.NI, + GT_Values.NI, + GT_Utility.getIntegratedCircuit(1), + GT_Values.NF, + GT_Values.NF, + GT_OreDictUnificator.getDust(Materials.TPV, 7L * OrePrefixes.dust.mMaterialAmount), + (int) (175L * OrePrefixes.dust.mMaterialAmount / 3628800L), + 1920); GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 5L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), @@ -9796,7 +9808,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_TungstenSteel.get(1L), new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5) }, @@ -9807,7 +9819,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Casing_Coil_HSSG.get(1L), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6) }, null, @@ -9907,7 +9919,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_TungstenSteel.get(1L), new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 8), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 5) }, @@ -9918,7 +9930,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Casing_Coil_HSSG.get(1L), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 6) }, null, diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 3ae4e51cd6..75829f0014 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -12960,6 +12960,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC gregtech.api.enums.GT_Values.V[8], true, false); + makeWires( + Materials.TPV, + 1840, + bEC ? 2L : 14L, + bEC ? 4L : 28L, + 1L, + gregtech.api.enums.GT_Values.V[4], + true, + false); // Superconductor base. makeWires( |