aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2022-07-30 23:45:56 +0100
committerGitHub <noreply@github.com>2022-07-30 23:45:56 +0100
commit19f950e6dd9d23a2dcd5a4cac9de78f6272bbaff (patch)
treec895c6283cef64d2006387e08073cd92a1dd82a1 /src
parent9b3e91be8feadc3d908b997c028a6d39cf119fc1 (diff)
parentf81943e90592e65db4c0944c8f33d03b302fb871 (diff)
downloadGT5-Unofficial-19f950e6dd9d23a2dcd5a4cac9de78f6272bbaff.tar.gz
GT5-Unofficial-19f950e6dd9d23a2dcd5a4cac9de78f6272bbaff.tar.bz2
GT5-Unofficial-19f950e6dd9d23a2dcd5a4cac9de78f6272bbaff.zip
Merge pull request #66 from chochem/better-xsmd
Allow xsmds for wetwaremainframe
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 1cb00e1d2e..664200fd7c 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -953,16 +953,16 @@ public class DreamCraftRecipeLoader {
Materials.UUMatter.getFluid(32000L)},
getItemContainer("Hatch_Dynamo_UMV").get(1L), 1000, 32000000);
- //UHV Circuit ASMD
+ //UHV Circuit Wetwaremainframe
TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Wetwaresupercomputer.get(1L),
24000, 64, 50000, 4, new Object[]{
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 2),
ItemList.Circuit_Wetwaresupercomputer.get(2L),
ItemList.ZPM_Coil.get(16L),
- ItemList.Circuit_Parts_CapacitorASMD.get(16L),
- ItemList.Circuit_Parts_ResistorASMD.get(16L),
- ItemList.Circuit_Parts_TransistorASMD.get(16L),
- ItemList.Circuit_Parts_DiodeASMD.get(16L),
+ new ItemStack[]{ItemList.Circuit_Parts_CapacitorASMD.get(16L), ItemList.Circuit_Parts_CapacitorXSMD.get(4L)},
+ new ItemStack[]{ItemList.Circuit_Parts_ResistorASMD.get(16L), ItemList.Circuit_Parts_ResistorXSMD.get(4L)},
+ new ItemStack[]{ItemList.Circuit_Parts_TransistorASMD.get(16L), ItemList.Circuit_Parts_TransistorXSMD.get(4L)},
+ new ItemStack[]{ItemList.Circuit_Parts_DiodeASMD.get(16L), ItemList.Circuit_Parts_DiodeXSMD.get(4L)},
ItemList.Circuit_Chip_Ram.get(48L),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64L),
new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L},