aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-02-05 19:45:02 +0900
committerGitHub <noreply@github.com>2022-02-05 11:45:02 +0100
commit803fad9e8b5509dcd09c374d5ee9312e89617b7a (patch)
tree3f3c2d20347120485621908c8bc921f3102bbd3a /src
parentb0d3533c5e412d54295f720ebd527e3c14248081 (diff)
downloadGT5-Unofficial-803fad9e8b5509dcd09c374d5ee9312e89617b7a.tar.gz
GT5-Unofficial-803fad9e8b5509dcd09c374d5ee9312e89617b7a.tar.bz2
GT5-Unofficial-803fad9e8b5509dcd09c374d5ee9312e89617b7a.zip
Fix recipe conflict with ULV Magneto Resonatic Circuit (#85)
Former-commit-id: b2482ad25df9325db4ae77ee3920aba1476226ff
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java
index 73cdeb8a4b..a8af99b104 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java
@@ -314,7 +314,23 @@ public class AdditionalRecipes {
//GT_Values.RA.addFusionReactorRecipe(WerkstoffLoader.Californium.getMolten(16), Materials.Milk.getFluid(12000), WerkstoffLoader.Oganesson.getFluidOrGas(16), 500, 49152, 600000000);
GT_Values.RA.addCentrifugeRecipe(GT_Utility.getIntegratedCircuit(1), GT_Values.NI, Materials.Milk.getFluid(10000), Materials.Water.getFluid(8832), Materials.Sugar.getDustSmall(21), Materials.Calcium.getDustTiny(1), Materials.Magnesium.getDustTiny(1), Materials.Potassium.getDustTiny(1), Materials.Sodium.getDustTiny(4), Materials.Phosphor.getDustTiny(1), new int[]{10000, 10000, 1000, 10000, 1000, 1000}, 50, 120);
- for (int i = 0; i <= 6; i++) {
+ GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.add(
+ new BWRecipes.DynamicGTRecipe(false,
+ new ItemStack[]{
+ BW_Meta_Items.getNEWCIRCUITS().getStack(3),
+ WerkstoffLoader.MagnetoResonaticDust.get(gem),
+ ItemList.NandChip.get(1),
+ ItemList.Circuit_Parts_DiodeSMD.get(4),
+ ItemList.Circuit_Parts_CapacitorSMD.get(4),
+ ItemList.Circuit_Parts_TransistorSMD.get(4)
+ },
+ new ItemStack[]{
+ BW_Meta_Items.getNEWCIRCUITS().getStack(4)
+ }, null, null,
+ new FluidStack[]{
+ Materials.SolderingAlloy.getMolten(36)
+ }, null, 750, BW_Util.getMachineVoltageFromTier(1), CLEANROOM));
+ for (int i = 1; i <= 6; i++) {
GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.add(
new BWRecipes.DynamicGTRecipe(false,
new ItemStack[]{