Merge branch 'main' into tier-move-grs

GTModpackTeam · Apr 30, 2024 · 579d885 · 579d885
2 parents ff50f09 + cecbc08
commit 579d885
Show file tree

Hide file tree

Showing 46 changed files with 4,559 additions and 2,189 deletions.
diff --git a/.github/workflows/preview-lwjgl3.yml b/.github/workflows/preview-lwjgl3.yml
@@ -26,25 +26,34 @@ jobs:
 
       - name: Download Resource Packs zip
         run: |
-          LATEST_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases/latest)
-          ASSET=$(echo $LATEST_RELEASE | jq -r '.assets[] | select(.name | test("GTExpert2-v[0-9.]+-resourcepack-v[0-9]+\\.zip")) | .name' | sort -V | tail -n 1)
-          ASSET_URL=$(echo $LATEST_RELEASE | jq -r --arg ASSET "$ASSET" '.assets[] | select(.name == $ASSET) | .browser_download_url')
-          wget -O ./overrides/resourcepacks/$ASSET $ASSET_URL
+          GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
+          ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | head -1)
+          ASSET_NAME=$(echo $ASSET_URL | awk -F'/' '{print $NF}')
+          wget -O ./overrides/resourcepacks/$ASSET_NAME $ASSET_URL
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
-          cache: pip
+          python-version: '3.12'
+
+      - name: Install uv
+        run: pip install uv
+
+      - name: Setup Python Cache 
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/uv
+          key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-uv-
 
       - name: Remove lwjgl3 not supported mods
         run: python buildtools/gen-lwjgl3-manifest.py
 
       - name: Install dependencies
         run: |
           cp -vf ./cmmc/manifest.json ./manifest.json
-          python -m pip install --upgrade pip
-          pip install -r ./buildtools/requirements.txt
+          uv pip install --system -r ./buildtools/requirements.txt
 
       - name: Run Python
         env:

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -26,10 +26,10 @@ jobs:
 
       - name: Download Resource Packs zip
         run: |
-          LATEST_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases/latest)
-          ASSET=$(echo $LATEST_RELEASE | jq -r '.assets[] | select(.name | test("GTExpert2-v[0-9.]+-resourcepack-v[0-9]+\\.zip")) | .name' | sort -V | tail -n 1)
-          ASSET_URL=$(echo $LATEST_RELEASE | jq -r --arg ASSET "$ASSET" '.assets[] | select(.name == $ASSET) | .browser_download_url')
-          wget -O ./overrides/resourcepacks/$ASSET $ASSET_URL
+          GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
+          ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | head -1)
+          ASSET_NAME=$(echo $ASSET_URL | awk -F'/' '{print $NF}')
+          wget -O ./overrides/resourcepacks/$ASSET_NAME $ASSET_URL
 
       - name: Archive Release CF
         run: |
@@ -39,13 +39,21 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
-          cache: pip
+          python-version: '3.12'
+
+      - name: Install uv
+        run: pip install uv
+
+      - name: Setup Python Cache 
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/uv
+          key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-uv-
 
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r ./buildtools/requirements.txt
+        run: uv pip install --system -r ./buildtools/requirements.txt
 
       - name: Run Python
         env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,10 +48,10 @@ jobs:
 
       - name: Download Resource Packs zip
         run: |
-          LATEST_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases/latest)
-          ASSET=$(echo $LATEST_RELEASE | jq -r '.assets[] | select(.name | test("GTExpert2-v[0-9.]+-resourcepack-v[0-9]+\\.zip")) | .name' | sort -V | tail -n 1)
-          ASSET_URL=$(echo $LATEST_RELEASE | jq -r --arg ASSET "$ASSET" '.assets[] | select(.name == $ASSET) | .browser_download_url')
-          wget -O ./overrides/resourcepacks/$ASSET $ASSET_URL
+          GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
+          ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | head -1)
+          ASSET_NAME=$(echo $ASSET_URL | awk -F'/' '{print $NF}')
+          wget -O ./overrides/resourcepacks/$ASSET_NAME $ASSET_URL
 
       - name: Archive Release CF
         run: |
@@ -61,13 +61,21 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
-          cache: pip
+          python-version: '3.12'
+
+      - name: Install uv
+        run: pip install uv
+
+      - name: Setup Python Cache 
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/uv
+          key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-uv-
 
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r ./buildtools/requirements.txt
+        run: uv pip install --system -r ./buildtools/requirements.txt
 
       - name: Run Python
         env:

diff --git a/CHANGELOG_v1.md b/CHANGELOG_v1.md
@@ -72,7 +72,7 @@
 * Crafting Tweaks -> dan's Crafting Tweaks
 * GregTech CE: Unofficial
 * GregTech Food Option
-* LoliASM
+* CensoredASM
 * Had Enough Items
 * ModTweaker
 
@@ -130,7 +130,7 @@
 ## Update mods
 * AE2 Unofficial Extended Life
 * GregTech CE: Unofficial
-* LoliASM
+* CensoredASM
 * DevTech
 * GregTech Food Option
 * Had Enough Items
@@ -169,7 +169,7 @@
 * GregTech Food Option
 * MultiblockTweaker
 * DevTech
-* LoliASM
+* CensoredASM
 * Had Enough Items
 * CraftTweaker
 * Smooth Font
@@ -229,7 +229,7 @@
 # v1.7.0(hotfix)
 ## Update mods
 * AE2 Unofficial Extended Life
-* LoliASM
+* CensoredASM
 
 * * *
 
@@ -246,7 +246,7 @@
 
 ## Update mods
 * AE2 Unofficial Extended Life
-* LoliASM
+* CensoredASM
 * SuperMartijn642's Core Lib
 * Trash Cans
 * Had Enough Items
@@ -597,7 +597,7 @@
 
 ## Update mods
 * AE2 Unofficial Extended Life
-* LoliASM
+* CensoredASM
 * Had Enough Items
 * MixinBooter
 
@@ -947,7 +947,7 @@ Respond to the fact that GTFO is not included and that quests are not included.
 * AE2 Unofficial Extended Life
 * CraftTweaker
 * GregTech Food Option
-* LoliASM
+* CensoredASM
 * MixinBooter
 * Not Enough Energistics