GTModpackTeam · tier940 · Dec 8, 2023 · Dec 8, 2023 · Dec 9, 2023 · Dec 13, 2023
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -31,12 +31,6 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Apply patch to settings.gradle
-        run: |
-          if [ -f settings.gradle.patch ]; then
-            patch -p0 < settings.gradle.patch
-          fi
-
       - name: Apply patch to gradle.properties
         run: sed -i 's/debug_all = false/debug_all = true/g' gradle.properties
 
@@ -64,7 +58,7 @@ jobs:
         if: ${{ failure() && steps.build_mod.conclusion == 'failure' && github.event_name == 'pull_request' && !github.event.pull_request.draft }}
         run: |
           git reset --hard
-          git checkout "${PR_BRANCH}"
+          git checkout "${github.ref_name}"
           ./gradlew --info spotlessApply || exit 1
           git diff --exit-code && exit 1
           git config user.name "GitHub Actions"
@@ -74,15 +68,14 @@ jobs:
           git push --force-with-lease origin "${FIXED_BRANCH}"
           gh pr create \
             --head "${FIXED_BRANCH}" \
-            --base "${PR_BRANCH}" \
+            --base "${github.ref_name}" \
             --title "Spotless apply for branch ${{ github.event.pull_request.head.ref }} for #${{ github.event.pull_request.number }}" \
             --body "Automatic spotless apply to fix formatting errors, applies to PR #${{ github.event.pull_request.number }}" \
             2>&1 | tee pr-message.log || true
-          gh pr comment "${PR_BRANCH}" -F pr-message.log || true
+          gh pr comment "${github.ref_name}" -F pr-message.log || true
         shell: bash # ensures set -eo pipefail
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_BRANCH: ${{ github.head_ref }}
           FIXED_BRANCH: ${{ github.head_ref }}-spotless-fixes
 
       - name: Run server for ${{ inputs.timeout }} seconds

diff --git a/.github/workflows/format_java.yml b/.github/workflows/format_java.yml
@@ -36,7 +36,7 @@ jobs:
         run: ./gradlew --info spotlessCheck
 
       - name: Attempt to make a PR fixing spotless errors
-        if: failure()
+        if: failure() && steps.build.conclusion == 'failure'
         run: |
           git reset --hard
           git checkout "${PR_BRANCH}"

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -82,15 +82,16 @@ jobs:
           modrinth-id: ${{ env.MODRINTH_PROJECT_ID }}
           modrinth-token: "${{ secrets.MODRINTH_API_KEY }}"
           modrinth-dependencies: |
-            8PB5NZf9(required)
-            vaQ5bJYU(required)
-            MeXYT7nJ(required)
+            G1ckZuWK(required)
+            tULldUx4(required)
+            tZiutdLG(required)
           curseforge-id: ${{ env.CURSEFORGE_PROJECT_ID }}
           curseforge-token: "${{ secrets.CURSEFORGE_API_KEY }}"
           curseforge-dependencies: |
             mixin-booter(required)
             gregtech-ce-unofficial(required)
             gregicality-multiblocks(required)
+            implosionnobomb(recommended)
             ae2-extended-life(recommended)
             ae-additions-extra-cells-2-fork(recommended)
             nae2(recommended)
@@ -105,7 +106,7 @@ jobs:
             draconic-evolution(recommended)
             draconicadditions(recommended)
             project-red-illumination(recommended)
-            avaritia-1-1x-kedition(recommended)
+            avaritia-1-1x-unofficial(recommended)
             thaumcraft(recommended)
             forestry(recommended)
             gendustry(recommended)

diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml
@@ -22,12 +22,6 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Apply patch to settings.gradle
-        run: |
-          if [ -f settings.gradle.patch ]; then
-            patch -p0 < settings.gradle.patch
-          fi
-
       - name: Apply patch to build.gradle
         run: sed -i 's/debug_all = false/debug_all = true/g' gradle.properties
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,64 @@
+# 2.4.5
+- Separate to [GTBeesMatrix](https://github.com/GTModpackTeam/GTBeesMatrix). [#320](https://github.com/GTModpackTeam/GTExpert-Core/pull/320)
+    - The following mods have been separated into separate mods to improve maintainability.
+        - [Forestry](https://www.curseforge.com/minecraft/mc-mods/forestry)
+        - [Gendustry](https://www.curseforge.com/minecraft/mc-mods/gendustry)
+        - [Binnie's Mods Patched](https://www.curseforge.com/minecraft/mc-mods/binnies-mods-patched)
+
+* * *
+
+# 2.4.4
+- Fix Wyvern tool recipe. [#319](https://github.com/GTModpackTeam/GTExpert-Core/pull/319)
+
+* * *
+
+# v2.4.3
+- Add BrokenSpawer recipe to SoulBinder. [#315](https://github.com/GTModpackTeam/GTExpert-Core/pull/315)
+
+* * *
+
+# v2.4.2
+- Delete unused steam machines. [#309](https://github.com/GTModpackTeam/GTExpert-Core/pull/309)
+- Advanced Chemical Plant to be compatible with PerfectOC. [#310](https://github.com/GTModpackTeam/GTExpert-Core/pull/314)
+
+* * *
+
+# v2.4.1
+- A recipe for processing FluixAlloy Molten in AlloyBlastFurnace into Ingot using Mold has been added. [#307](https://github.com/GTModpackTeam/GTExpert-Core/pull/307)
+
+* * *
+
+# v2.4.0
+- Disable automatic meal function for helmets [#300](https://github.com/GTModpackTeam/GTExpert-Core/pull/300)
+- Removed conflicts with GTWP [#303](https://github.com/GTModpackTeam/GTExpert-Core/pull/303)
+
+* * *
+
+# v2.3.2
+- Fix BlastTemperature of Vacuum Freezer Extended Recipes.
+
+* * *
+
+# v2.3.1
+- Hotfix a mistake when splitting into INBs [#296](https://github.com/GTModpackTeam/GTExpert-Core/pull/296)
+
+* * *
+
+# v2.3.0
+- Separate Electric Implosion Compressor changes to [ImplosionNoBomb](https://www.curseforge.com/minecraft/mc-mods/implosionnobomb)
+    - Thanks to @MrKono for his support!!
+
+* * *
+
+# v2.2.14
+## Ender IO
+- Fix Black Paper
+
+## GregTech Food Options
+- Kitchen Recipe
+
+* * *
+
 # v2.2.13
 - Fix upgrade recipe to Nano Boots from Piston Boots.
 
@@ -25,7 +86,7 @@
 
 # v2.2.8
 - Electric Implosion Compressor is converted to no explosive items. [#284](https://github.com/GTModpackTeam/GTExpert-Core/pull/284)
-    - Thanks to @MrKono for his support!! 
+    - Thanks to @MrKono and @sysnote8main for his support!! 
 
 * * *
 

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
-//version: 1723428048
+//version: 1725973221
 /*
  * DO NOT CHANGE THIS FILE!
  * Also, you may replace this file at any time if there is an update available.
- * Please check https://github.com/GregTechCEu/Buildscripts/blob/master/build.gradle for updates.
+ * Please check https://github.com/GTModpackTeam/Buildscripts/blob/master/build.gradle for updates.
  * You can also run ./gradlew updateBuildScript to update your buildscript.
  */
 
@@ -1423,11 +1423,11 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA
 }
 
 static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GregTechCEu/Buildscripts/master/build.gradle")
+    new URL("https://raw.githubusercontent.com/GTModpackTeam/Buildscripts/master/build.gradle")
 }
 
 static URL availableSettingsGradleUrl() {
-    new URL("https://raw.githubusercontent.com/GregTechCEu/Buildscripts/master/settings.gradle")
+    new URL("https://raw.githubusercontent.com/GTModpackTeam/Buildscripts/master/settings.gradle")
 }
 
 boolean performBuildScriptUpdate() {
@@ -1476,8 +1476,8 @@ tasks.register('faq') {
                 "To add new repositories to your project, place them in 'repositories.gradle'.\n" +
                 "If you need additional gradle code to run, you can place it in a file named 'addon.gradle' (or either of the above, up to you for organization).\n\n" +
                 "If your build fails to recognize the syntax of newer Java versions, enable Jabel in your 'gradle.properties' under the option name 'enableModernJavaSyntax'.\n" +
-                "To see information on how to configure your IDE properly for Java 17, see https://github.com/GregTechCEu/Buildscripts/blob/master/docs/jabel.md\n\n" +
-                "Report any issues or feature requests you have for this build script to https://github.com/GregTechCEu/Buildscripts/issues\n")
+                "To see information on how to configure your IDE properly for Java 17, see https://github.com/GTModpackTeam/Buildscripts/blob/master/docs/jabel.md\n\n" +
+                "Report any issues or feature requests you have for this build script to https://github.com/GTModpackTeam/Buildscripts/issues\n")
     }
 }
 
@@ -1495,7 +1495,7 @@ def getFile(String relativePath) {
 
 def checkPropertyExists(String propertyName) {
     if (!project.hasProperty(propertyName)) {
-        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GregTechCEu/Buildscripts/blob/main/gradle.properties")
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTModpackTeam/Buildscripts/blob/main/gradle.properties")
     }
 }
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -21,7 +21,7 @@
  *
  *  - shadowapi("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name
  *       Requires you to enable usesShadowedDependencies in gradle.properties
- *       For more info, see https://github.com/GregTechCEu/Buildscripts/blob/master/docs/shadow.md
+ *       For more info, see https://github.com/GTModpackTeam/Buildscripts/blob/master/docs/shadow.md
  *
  * You can exclude transitive dependencies (dependencies of the chosen dependency) by appending { transitive = false } if needed,
  * but use this sparingly as it can break using your mod as another mod's dependency if you're not careful.
@@ -40,16 +40,17 @@
 dependencies {
     // Published dependencies
     api("codechicken:codechickenlib:3.2.3.358") // CCL 3.2.3.358
-    api("com.cleanroommc:modularui:2.4.3") { transitive = false } // MUI 2.4.3
-    api("com.cleanroommc:groovyscript:1.1.1") { transitive = false } // GrS 1.1.1
+    api("com.cleanroommc:modularui:2.5.0-rc1") { transitive = false } // MUI 2.5.0-rc1
+    api("com.cleanroommc:groovyscript:1.1.2") { transitive = false } // GrS 1.1.2
     api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700") // CrT 4.1.20.700
     api rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31
 
     // Hard Dependencies
-    devOnlyNonPublishable(rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:5519022")) // CEu 2.8.10
-    //devOnlyNonPublishable(rfg.deobf(project.files("libs/gregtech-1.12.2-2.8.9-beta-dev.jar"))) // CEu pr 2.8.10
-    devOnlyNonPublishable(rfg.deobf("curse.maven:gregicality-multiblocks-564858:5508050")) // GCYM 1.2.10
-    devOnlyNonPublishable(rfg.deobf("curse.maven:shadowfacts-forgelin-248453:2785465")) // Forgelin 1.8.4
+    //devOnlyNonPublishable(rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:5519022")) // CEu 2.8.10
+    devOnlyNonPublishable(rfg.deobf(project.files("libs/gregtech-1.12.2-2.9.0-beta-dev.jar"))) // CEu pr 2.9.0
+    //devOnlyNonPublishable(rfg.deobf("curse.maven:gregicality-multiblocks-564858:5508050")) // GCYM 1.2.10
+    devOnlyNonPublishable(rfg.deobf(project.files("libs/GregicalityMultiblocks-1.3.0-dev.jar"))) // GCYM pr 1.3.0
+    devOnlyNonPublishable(rfg.deobf("curse.maven:forgelin-continuous-456403:6142081")) // Forgelin-Continuous 2.1.10.0
 
     // Switchable Dependencies
     if (project.useAE2uelExtended.toBoolean()) {
@@ -58,7 +59,18 @@ dependencies {
         devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5411078")) // AE2UEL 0.56.6
     }
 
-    // Debug AE Additions
+    // Debug GTWoodProcessing
+    if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776")
+    }
+
+    // Debug ImplosionNoBomb
+    compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5731331") // ImplosionNoBomb 1.1.0
+    if (project.debug_all.toBoolean() || project.debug_inb.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5731331")
+    }
+
+    // Debug ExtraCells2 Additions
     if (project.debug_all.toBoolean() || project.debug_aea.toBoolean()) {
         runtimeOnlyNonPublishable rfg.deobf("curse.maven:ae-additions-extra-cells-2-fork-493962:3814371") // AEAdditions 1.3.8
     }
@@ -85,27 +97,6 @@ dependencies {
         }
     }
 
-    // Debug Forestry
-    compileOnly rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387
-    compileOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
-    if (project.debug_all.toBoolean() || project.debug_ffm.toBoolean()) {
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:beebetteratbees-244516:2627215") // BeeBetterAtBees 2.0.3
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:jei-bees-248370:2490058") // JEIBees 0.9.0.5
-
-        // Debug Gendustry
-        if (project.debug_all.toBoolean() || project.debug_gendustry.toBoolean()) {
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:bdlib-70496:2518031") // BdLib 1.14.3.12
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:gendustry-70492:2516215") // Gendustry 1.6.5.8
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:gendustry-jei-addon-301364:2609434") // Gendustry JEI Addon 1.0.2
-        }
-
-        // Debug Binnies
-        if (project.debug_all.toBoolean() || project.debug_binnies.toBoolean()) {
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
-        }
-    }
-
     // Debug EnderIO
     compileOnly "info.loenwind.autoconfig:AutoConfig:1.12.2-1.0.2" // AutoConfig 1.0.2
     compileOnly "info.loenwind.autosave:AutoSave:1.12.2-1.0.11" // AutoSave 1.0.11
@@ -142,7 +133,7 @@ dependencies {
 
     // Debug Avaritia
     if (project.debug_all.toBoolean() || project.debug_avaritia.toBoolean()) {
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-kedition-913129:4777278") // Avaritia 1.1x Kedition 1.3
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6092956") // Avaritia UEL 3.3.0.41
     }
 
     // Debug Chisel