From 683e0970aea98b5d59fb0de928d130cd8e44360e Mon Sep 17 00:00:00 2001
From: Mary <33456283+FourIsTheNumber@users.noreply.github.com>
Date: Wed, 25 Sep 2024 06:48:46 -0400
Subject: So, so, so many collisions (#3278)

---
 src/main/java/goodgenerator/loader/RecipeLoader.java  | 10 ----------
 src/main/java/goodgenerator/loader/RecipeLoader2.java |  5 ++---
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'src/main/java/goodgenerator/loader')

diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
index c43ffb58c6..2b4d79c3f0 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -1271,16 +1271,6 @@ public class RecipeLoader {
             .metadata(COIL_HEAT, 4600)
             .addTo(blastFurnaceRecipes);
 
-        GTValues.RA.stdBuilder()
-            .itemInputs(
-                GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 1),
-                GTUtility.getIntegratedCircuit(1))
-            .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot))
-            .duration(6 * MINUTES + 40 * SECONDS)
-            .eut(TierEU.RECIPE_ZPM)
-            .metadata(COIL_HEAT, 7000)
-            .addTo(blastFurnaceRecipes);
-
         GTValues.RA.stdBuilder()
             .itemInputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot, 1))
             .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot, 1))
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java
index 707c6fc11a..1301ac97f5 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader2.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader2.java
@@ -104,14 +104,12 @@ public class RecipeLoader2 {
             .eut(TierEU.RECIPE_UHV)
             .addTo(assemblerRecipes);
 
+        CrackRecipeAdder.reAddBlastRecipe(GGMaterial.extremelyUnstableNaquadah, 8000, 122880, 7000, false);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 500, 480, 2800, true);
-        CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 513, 480, 2800, false);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 500, 480, 2800, true);
-        CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 513, 480, 2800, false);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.incoloy903, 1200, 1920, 3700, true);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.adamantiumAlloy, 2500, 1920, 5500, true);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 200, 7680, 5000, true);
-        CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 220, 7680, 5000, false);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.signalium, 1600, 30720, 4000, true);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.lumiium, 1600, 30720, 4000, true);
         CrackRecipeAdder.reAddBlastRecipe(GGMaterial.artheriumSn, 500, 122880, 6500, true);
@@ -1334,6 +1332,7 @@ public class RecipeLoader2 {
                     GTOreDictUnificator.get(OrePrefixes.cableGt02, Materials.Osmiridium, 2),
                     GGMaterial.marM200.get(OrePrefixes.plateDouble, 2),
                     GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1),
+
                     MaterialsElements.getInstance().RUTHENIUM.getBolt(32),
                     GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 8))
                 .fluidInputs(GGMaterial.zircaloy4.getMolten(576))
-- 
cgit