diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-09-25 06:48:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-25 12:48:46 +0200 |
| commit | 683e0970aea98b5d59fb0de928d130cd8e44360e (patch) | |
| tree | 40bad7e9bb301f56a4ae0f9b1d08b2175b066668 /src/main/java/goodgenerator/loader | |
| parent | 00b6c43af283b0a7a33e039718a63826d635576e (diff) | |
| download | GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.gz GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.bz2 GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.zip | |
So, so, so many collisions (#3278)
Diffstat (limited to 'src/main/java/goodgenerator/loader')
| -rw-r--r-- | src/main/java/goodgenerator/loader/RecipeLoader.java | 10 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/loader/RecipeLoader2.java | 5 |
2 files changed, 2 insertions, 13 deletions
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 @@ -1272,16 +1272,6 @@ public class RecipeLoader { .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)) .duration(20 * SECONDS) 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)) |