aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/recipe
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-01-07 16:59:22 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-01-07 16:59:22 +0000
commitf5c94fb03a6a0558fc42853fcde7fe17a2eb98c6 (patch)
treed46935d5ee50ad148daf0bd0a6cafa94188df1bb /src/Java/gtPlusPlus/core/recipe
parent05d2066fd364ddff525b9ac4b38771d196641a5e (diff)
downloadGT5-Unofficial-f5c94fb03a6a0558fc42853fcde7fe17a2eb98c6.tar.gz
GT5-Unofficial-f5c94fb03a6a0558fc42853fcde7fe17a2eb98c6.tar.bz2
GT5-Unofficial-f5c94fb03a6a0558fc42853fcde7fe17a2eb98c6.zip
+ Added several new Materials and Alloys. (Nitinol 60, Adv. Nitinol, Hypogen, Titansteel, Arcanite, Octiron, Tungsten Titanium Carbide, Astral Titanium, Celestial Tungsten, Chronomatic Glass).
+ Added Carbon nanotubes, Carbyne and associated materials required to create them. + Added Hypervisor Matrix (Fusion), a core component for the MK4. % Tweaked recipes for the MK4 Fusion Reactor and components, making it significantly harder. $ Fixed some base elements not generating correctly due to inverted logic for detection. $ Fixed rare chance for an invalid compressor recipe to generate. $ Fixed Voltages and tiering of all materials, resolves many recipe issues within the EBF and ABS. $ Fixed invalid compound tooltips on all ore materials.
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 1a83b74691..4ce4bb3da6 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1396,15 +1396,15 @@ public class RECIPES_Machines {
new ItemStack[] {
ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(9), 4 * (CORE.GTNH ? 2 : 1)),
ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 32 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getItemStackOfAmountFromOreDict("wireGt16Superconductor", 8 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNeutronium", 2 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getSimpleStack(CI.fieldGenerator_ZPM, 6 * (CORE.GTNH ? 2 : 1)),
- ItemList.Energy_LapotronicOrb2.get(1 * (CORE.GTNH ? 2 : 1)),
- ItemList.FusionComputer_UV.get(1),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireGt16Superconductor", 8 * (CORE.GTNH ? 4 : 2)),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNeutronium", 2 * (CORE.GTNH ? 5 : 1)),
+ ItemUtils.getSimpleStack((CORE.GTNH ? CI.fieldGenerator_MAX : CI.fieldGenerator_ZPM), 5),
+ ItemList.Energy_LapotronicOrb2.get(1 * (CORE.GTNH ? 64 : 8)),
+ CORE.GTNH ? GregtechItemList.Compressed_Fusion_Reactor.get(1) : ItemList.FusionComputer_UV.get(1),
GregtechItemList.Casing_Fusion_Internal.get(1)
},
new FluidStack[] {
- ALLOY.PIKYONIUM.getFluid(32 * 144),
+ ALLOY.PIKYONIUM.getFluid(32 * 144 * (CORE.GTNH ? 2 : 1)),
ALLOY.HG1223.getFluid(64 * 144)
},
GregtechItemList.FusionComputer_UV2.get(1),
@@ -1420,9 +1420,9 @@ public class RECIPES_Machines {
ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 16 * (CORE.GTNH ? 2 : 1)),
ItemUtils.getItemStackOfAmountFromOreDict("blockTungstenCarbide", 4 * (CORE.GTNH ? 2 : 1)),
ItemUtils.getItemStackOfAmountFromOreDict("plateNeutronium", 2 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getSimpleStack(CI.electricMotor_ZPM, 3 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getSimpleStack(CI.electricPiston_LuV, 4 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getSimpleStack(CI.machineHull_ZPM, 1 * (CORE.GTNH ? 2 : 1)),
+ ItemUtils.getSimpleStack((CORE.GTNH ? CI.electricMotor_MAX : CI.electricMotor_ZPM), 3 * (CORE.GTNH ? 2 : 1)),
+ ItemUtils.getSimpleStack((CORE.GTNH ? CI.electricPiston_UV : CI.electricPiston_LuV), 4 * (CORE.GTNH ? 2 : 1)),
+ ItemUtils.getSimpleStack((CORE.GTNH ? CI.machineHull_MAX : CI.machineHull_ZPM), 1 * (CORE.GTNH ? 2 : 1)),
ItemList.Casing_Fusion2.get(1)
},
new FluidStack[] {
@@ -1440,12 +1440,12 @@ public class RECIPES_Machines {
new ItemStack[] {
ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 4 * (CORE.GTNH ? 2 : 1)),
ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 8 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getItemStackOfAmountFromOreDict("plateNeutronium", 2 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getSimpleStack(CI.emitter_ZPM, 2 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getSimpleStack(CI.sensor_ZPM, 2 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getSimpleStack(CI.fieldGenerator_LuV, 2 * (CORE.GTNH ? 2 : 1)),
- ItemUtils.getSimpleStack(CI.getDataOrb(), 8 * (CORE.GTNH ? 2 : 1)),
- ItemList.Energy_LapotronicOrb2.get(2 * (CORE.GTNH ? 2 : 1)),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateNeutronium", 2 * (CORE.GTNH ? 3 : 1)),
+ ItemUtils.getSimpleStack((CORE.GTNH ? CI.emitter_MAX : CI.emitter_ZPM), 2 * (CORE.GTNH ? 2 : 1)),
+ ItemUtils.getSimpleStack((CORE.GTNH ? CI.sensor_MAX : CI.sensor_ZPM), 2 * (CORE.GTNH ? 2 : 1)),
+ ItemUtils.getSimpleStack((CORE.GTNH ? CI.fieldGenerator_MAX : CI.fieldGenerator_LuV), 2 * (CORE.GTNH ? 2 : 1)),
+ ItemUtils.getSimpleStack((CORE.GTNH ? ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 8) : CI.getDataOrb()), 8 * (CORE.GTNH ? 2 : 1)),
+ ItemList.Energy_LapotronicOrb2.get(2 * (CORE.GTNH ? 16 : 1)),
ItemList.Casing_Fusion_Coil.get(1)
},
new FluidStack[] {