[WIP] Update 2.7.13

.github/actions/build_setup/action.yml

@@ -11,23 +11,19 @@ runs:
   using: 'composite'
 
   steps:
-    - name: Setup Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.12'
-
-    - name: Install uv
+    - name: Install system dependencies
       shell: bash
-      run: pip install uv
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y zip jq wget
 
-    - name: Setup Python Cache 
-      uses: actions/cache@v4
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
       with:
-        path: ~/.cache/uv
-        key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-uv-
+        enable-cache: true
+        python-version-file: ./buildtools/pyproject.toml
 
     - name: Install dependencies
       shell: bash
-      run: uv pip install --system -r ./buildtools/requirements.txt
+      working-directory: ./buildtools
+      run: uv sync

.github/workflows/preview.yml

@@ -8,14 +8,14 @@ on:
   workflow_dispatch:
     inputs:
       target_branch:
-        description: 'Target branch for the preview'
+        description: "Target branch for the preview"
         type: string
         required: true
       version:
-        description: 'Modpack version'
+        description: "Modpack version"
         required: true
       preview_version:
-        description: 'Preview version'
+        description: "Preview version"
         required: true
 
 env:
@@ -25,26 +25,18 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     strategy:
       matrix:
         buildType: [standard, lwjgl3]
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.inputs.target_branch || github.ref }}
           fetch-depth: 0
 
-      - name: Cache dependencies
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.cache/pip
-          key: ${{ runner.os }}-deps-${{ matrix.buildType }}-${{ hashFiles('**/pom.xml') }}
-
       - name: Download Resource Packs zip
         run: |
           GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
@@ -72,13 +64,13 @@ jobs:
       - name: Adjust for LWJGL3
         if: matrix.buildType == 'lwjgl3'
         run: |
-          python buildtools/gen-lwjgl3-manifest.py
+          uv run --directory ./buildtools python ./gen-lwjgl3-manifest.py
           cp -vf cmmc/manifest.json manifest.json
 
       - name: Install Mods
         env:
           CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
-        run: python buildtools/mod-install.py
+        run: uv run --directory ./buildtools python ./mod-install.py
 
       - name: Clean up placeholder files
         run: find . -name ".gitkeep" -delete
@@ -87,21 +79,18 @@ jobs:
         run: |
           if [[ "${{ matrix.buildType }}" == "lwjgl3" ]]; then
             sed -i "s/B:EnableCustomGameTitle=false/B:EnableCustomGameTitle=true/" overrides/config/stellar_core.cfg
-            cp -rvf cmmc/bansoukou/ ./overrides/
-            rm -Rf cmmc/bansoukou/
             mv -vf overrides/ .minecraft/
             cp -vf icon.png .minecraft/
             cp -rvf cmmc/* ./
-            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip libraries/ patches/ mmc-pack.json instance.cfg .minecraft/
+            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip patches/ mmc-pack.json instance.cfg .minecraft/
           else
-            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip manifest.json modlist.html overrides/bansoukou/ overrides/config/ overrides/local/ overrides/resourcepacks/icons/ overrides/resourcepacks/GTExpert2-* overrides/scripts/
+            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip manifest.json modlist.html overrides/config/ overrides/local/ overrides/resourcepacks/icons/ overrides/resourcepacks/GTExpert2-* overrides/scripts/
             mv overrides/ .minecraft/
             cp icon.png .minecraft/
             zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip mmc-pack.json instance.cfg .minecraft/
             mv serverfiles/* ./
             rm -vf .minecraft/mods/!Red-Core-*
             rm -vf .minecraft/mods/Alfheim-*
-            rm -vf .minecraft/mods/Valkyrie-*
             rm -vf .minecraft/mods/CraftPresence-*
             rm -vf .minecraft/mods/Controlling-*
             rm -vf .minecraft/mods/UniLib-*
@@ -116,33 +105,32 @@ jobs:
             rm -vf .minecraft/mods/InGameInfoXML-*
             rm -vf .minecraft/mods/oauth-*
             rm -vf .minecraft/mods/UntranslatedItems-*
-            rm -vf .minecraft/mods/vintagefix-*
             mv -vf .minecraft/* ./
-            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip docker-compose.yml PleaseRead.txt log4j2_112-116.xml Install.* ServerStart.* settings.* TmuxServer.sh bansoukou/ config/ local/ mods/ resources/ scripts/
+            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip docker-compose.yml PleaseRead.txt log4j2_112-116.xml Install.* ServerStart.* settings.* TmuxServer.sh config/ local/ mods/ resources/ scripts/
           fi
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.buildType }}-artifacts
           path: artifacts/
           retention-days: 1
 
   release:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     permissions:
       contents: write
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.inputs.target_branch || github.ref }}
           fetch-depth: 0
 
       - name: Download All Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           path: downloads
 

.github/workflows/release.yml

@@ -8,12 +8,12 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Modpack version'
+        description: "Modpack version"
         required: true
       release_type:
-        description: 'Release type'
+        description: "Release type"
         type: choice
-        default: 'release'
+        default: "release"
         options: [release, beta, alpha]
 
 env:
@@ -23,25 +23,17 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     strategy:
       matrix:
         buildType: [standard, lwjgl3]
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
-      - name: Restore cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.cache/pip
-          key: ${{ runner.os }}-deps-${{ matrix.buildType }}-${{ hashFiles('**/pom.xml') }}
-
       - name: Download Resource Packs zip
         run: |
           GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
@@ -69,13 +61,13 @@ jobs:
       - name: Adjust for LWJGL3
         if: matrix.buildType == 'lwjgl3'
         run: |
-          python buildtools/gen-lwjgl3-manifest.py
+          uv run --directory ./buildtools python ./gen-lwjgl3-manifest.py
           cp -vf cmmc/manifest.json manifest.json
 
       - name: Install Mods
         env:
           CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
-        run: python buildtools/mod-install.py
+        run: uv run --directory ./buildtools python ./mod-install.py
 
       - name: Clean up placeholder files
         run: find . -name ".gitkeep" -delete
@@ -84,21 +76,18 @@ jobs:
         run: |
           if [[ "${{ matrix.buildType }}" == "lwjgl3" ]]; then
             sed -i "s/B:EnableCustomGameTitle=false/B:EnableCustomGameTitle=true/" overrides/config/stellar_core.cfg
-            cp -rvf cmmc/bansoukou/ ./overrides/
-            rm -Rf cmmc/bansoukou/
             mv -vf overrides/ .minecraft/
             cp -vf icon.png .minecraft/
             cp -rvf cmmc/* ./
-            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip libraries/ patches/ mmc-pack.json instance.cfg .minecraft/
+            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip patches/ mmc-pack.json instance.cfg .minecraft/
           else
-            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip manifest.json modlist.html overrides/bansoukou/ overrides/config/ overrides/local/ overrides/resourcepacks/ overrides/scripts/
+            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip manifest.json modlist.html overrides/config/ overrides/local/ overrides/resourcepacks/ overrides/scripts/
             mv overrides/ .minecraft/
             cp icon.png .minecraft/
             zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip mmc-pack.json instance.cfg .minecraft/
             mv serverfiles/* ./
             rm -vf .minecraft/mods/!Red-Core-*
             rm -vf .minecraft/mods/Alfheim-*
-            rm -vf .minecraft/mods/Valkyrie-*
             rm -vf .minecraft/mods/CraftPresence-*
             rm -vf .minecraft/mods/Controlling-*
             rm -vf .minecraft/mods/UniLib-*
@@ -113,32 +102,31 @@ jobs:
             rm -vf .minecraft/mods/InGameInfoXML-*
             rm -vf .minecraft/mods/oauth-*
             rm -vf .minecraft/mods/UntranslatedItems-*
-            rm -vf .minecraft/mods/vintagefix-*
             mv -vf .minecraft/* ./
-            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip docker-compose.yml PleaseRead.txt log4j2_112-116.xml Install.* ServerStart.* settings.* TmuxServer.sh bansoukou/ config/ local/ mods/ resources/ scripts/
+            zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip docker-compose.yml PleaseRead.txt log4j2_112-116.xml Install.* ServerStart.* settings.* TmuxServer.sh config/ local/ mods/ resources/ scripts/
           fi
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.buildType }}-artifacts
           path: artifacts/
           retention-days: 1
 
   release:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     permissions:
       contents: write
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Download All Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           path: downloads
 

CHANGELOG_v2.md

@@ -1,3 +1,65 @@
+# 2.7.13
+## Modpack migration
+- CoreMod fixes issues with NAE2.
+    1. Delete the `bansoukou` folder.
+    2. Delete `nae2-1.6.4-patched.jar` in the folder named `mods`.
+    3. Rename `nae2-1.6.4.disabled` to `nae2-1.6.4.jar` in the folder named `mods`.
+
+## Modpack information
+- Fix quests related to NBT tags
+
+## Disable mods
+- Advanced Backups
+- Flare (Spark for 1.12.2)
+
+## Move mods
+- AppleSkin -> LemonSkin (3.0.2)
+- NetherPortalFix -> Universal Tweaks
+- Ender Storage continuation (2.6.3) -> EnderStorage Continuation2 (2.7.0)
+
+## Remove mods
+- Bansoukou (4.3.1)
+- Valkyrie (0.3)
+- VintageFix (0.6.2)
+
+## New mods
+- AE2UEL Wireless Universal Terminal (1.2.6)
+- Key Binding Patch (1.3.3.3)
+- VintageDisplay (1.5)
+- SussyPatches (1.9.2)
+
+## Update mods
+- AE2 Unofficial Extended Life (0.56.5 -> 0.56.7)
+- Alfheim (1.5 -> 1.6)
+- Betterer P2P (1.3.2 -> 1.3.3)
+- CraftPresence (2.6.2 -> 2.7.0)
+- CensoredASM (5.29 -> 5.30)
+- EZStorage 2 Patch (1.4.1 -> 1.5.0)
+- Fixeroo (2.3.6b -> 2.3.6)
+- Forgelin-Continuous (2.2.0.0 -> 2.2.21.0)
+- GTConsolidate (1.0.7.7 -> 1.1.0.4.1)
+- GTExpertCore (2.4.11 -> 2.5.4)
+- Inventory Bogo Sorter (1.4.8 -> 1.5.0)
+- JEI Utilities (0.2.11 -> 0.2.13)
+- Had Enough Items (4.28.1 -> 4.29.12)
+- Hot or Not GTCEu (1.2.0 -> 1.3.0)
+- MixinBooter (9.4 -> 10.7)
+- ModularUI (2.4.3 -> 3.0.5)
+- PackagedAuto (1.0.19.66 -> 1.0.23.72)
+- UniLib (1.1.1 -> 1.2.0)
+- Universal Tweaks (1.14.0 -> 1.17.0)
+
+## New recipes
+### AE2 Unofficial Extended Life
+- Wireless Interface Terminal
+- Wireless Universal Terminal
+
+## Fix recipes
+### AE2 Fluid Crafting Rework
+- Wireless Fluid Interface Terminal
+
+* * *
+
 # v2.7.12
 ## New mods
 - Hot or Not Plus (1.1.10)
@@ -732,7 +794,7 @@ Shadowfacts' Forgelin (1.8.4) -> Forgelin-Continuous (2.1.10.0)
 # v2.5.3
 ## Modpack information
 ### To update an existing profile without creating a new profile.
-1. Check the mods folder and delete `gregtech-1.12.2-2.7.3-beta-gte.jar` and `gregtechfoodoption-1.9.3.2-gte.jar`. 
+1. Check the mods folder and delete `gregtech-1.12.2-2.7.3-beta-gte.jar` and `gregtechfoodoption-1.9.3.2-gte.jar`.
 2. In addition, delete `gregtech-1.12.2-2.7.2-beta.jar.disabled` and `gregtechfoodoption-1.9.3.1.jar.disabled`.
 3. Finally, check the `overrides\config\mod-director` and make sure there are no files inside.
 - In case you are wondering, ModPack recommends [MultiMC](https://multimc.org/) or [Prism Launcher](https://prismlauncher.org/).
@@ -936,7 +998,7 @@ Shadowfacts' Forgelin (1.8.4) -> Forgelin-Continuous (2.1.10.0)
 ## New mods
 - Extra CPUs
 
-* * * 
+* * *
 
 # v2.3.1
 ## Modpack information