diff options
| -rw-r--r-- | .github/workflows/build-and-test.yml | 2 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java | 11 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/main/GoodGenerator.java | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 3ee2f686fd..e998f68ac2 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,3 +11,5 @@ jobs: build-and-test: uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master secrets: inherit + with: + timeout: 240 diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 4af53be0d5..a1d109df5c 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -17,7 +17,6 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.*; import gregtech.common.items.CombType; import gregtech.loaders.misc.GT_Bees; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells; import java.lang.reflect.*; import java.util.HashSet; import net.minecraft.item.ItemStack; @@ -915,11 +914,11 @@ public class NaquadahReworkRecipeLoader { if (LoadedList.GTPP) { // For Multi Centrifuge // Blame alk. She made some shit in it, NEI will break down if anyone modify the hash list directly. - GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.clear(); - RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes, - GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT); - GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.reInit(); + // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.clear(); + // RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( + // GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes, + // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT); + // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.reInit(); // For Simple Washer for (GT_Recipe recipe : GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList) { diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java b/src/main/java/goodgenerator/main/GoodGenerator.java index 825af307d4..00a367e505 100644 --- a/src/main/java/goodgenerator/main/GoodGenerator.java +++ b/src/main/java/goodgenerator/main/GoodGenerator.java @@ -27,6 +27,7 @@ import net.minecraft.creativetab.CreativeTabs; + "required-after:bartworks; " + "required-after:tectech; " + "required-after:structurelib; " + + "before:miscutils; " + "after:dreamcraft;") public final class GoodGenerator { public static final String MOD_ID = "GRADLETOKEN_MODID"; |