Skip to content

Commit 579d885

Browse files
tier940tier940
authored
Merge branch 'main' into tier-move-grs
2 parents ff50f09 + cecbc08 commit 579d885

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+4559
-2189
lines changed

‎.github/workflows/preview-lwjgl3.yml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,34 @@ jobs:
2626
2727
- name: Download Resource Packs zip
2828
run: |
29-
LATEST_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases/latest)
30-
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)
31-
ASSET_URL=$(echo $LATEST_RELEASE | jq -r --arg ASSET "$ASSET" '.assets[] | select(.name == $ASSET) | .browser_download_url')
32-
wget -O ./overrides/resourcepacks/$ASSET $ASSET_URL
29+
GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
30+
ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | head -1)
31+
ASSET_NAME=$(echo $ASSET_URL | awk -F'/' '{print $NF}')
32+
wget -O ./overrides/resourcepacks/$ASSET_NAME $ASSET_URL
3333
3434
- name: Setup Python
3535
uses: actions/setup-python@v5
3636
with:
37-
python-version: '3.11'
38-
cache: pip
37+
python-version: '3.12'
38+
39+
- name: Install uv
40+
run: pip install uv
41+
42+
- name: Setup Python Cache
43+
uses: actions/cache@v3
44+
with:
45+
path: ~/.cache/uv
46+
key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
47+
restore-keys: |
48+
${{ runner.os }}-uv-
3949
4050
- name: Remove lwjgl3 not supported mods
4151
run: python buildtools/gen-lwjgl3-manifest.py
4252

4353
- name: Install dependencies
4454
run: |
4555
cp -vf ./cmmc/manifest.json ./manifest.json
46-
python -m pip install --upgrade pip
47-
pip install -r ./buildtools/requirements.txt
56+
uv pip install --system -r ./buildtools/requirements.txt
4857
4958
- name: Run Python
5059
env:

‎.github/workflows/preview.yml‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
2727
- name: Download Resource Packs zip
2828
run: |
29-
LATEST_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases/latest)
30-
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)
31-
ASSET_URL=$(echo $LATEST_RELEASE | jq -r --arg ASSET "$ASSET" '.assets[] | select(.name == $ASSET) | .browser_download_url')
32-
wget -O ./overrides/resourcepacks/$ASSET $ASSET_URL
29+
GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
30+
ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | head -1)
31+
ASSET_NAME=$(echo $ASSET_URL | awk -F'/' '{print $NF}')
32+
wget -O ./overrides/resourcepacks/$ASSET_NAME $ASSET_URL
3333
3434
- name: Archive Release CF
3535
run: |
@@ -39,13 +39,21 @@ jobs:
3939
- name: Setup Python
4040
uses: actions/setup-python@v5
4141
with:
42-
python-version: '3.11'
43-
cache: pip
42+
python-version: '3.12'
43+
44+
- name: Install uv
45+
run: pip install uv
46+
47+
- name: Setup Python Cache
48+
uses: actions/cache@v3
49+
with:
50+
path: ~/.cache/uv
51+
key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
52+
restore-keys: |
53+
${{ runner.os }}-uv-
4454
4555
- name: Install dependencies
46-
run: |
47-
python -m pip install --upgrade pip
48-
pip install -r ./buildtools/requirements.txt
56+
run: uv pip install --system -r ./buildtools/requirements.txt
4957

5058
- name: Run Python
5159
env:

‎.github/workflows/release.yml‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ jobs:
4848
4949
- name: Download Resource Packs zip
5050
run: |
51-
LATEST_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases/latest)
52-
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)
53-
ASSET_URL=$(echo $LATEST_RELEASE | jq -r --arg ASSET "$ASSET" '.assets[] | select(.name == $ASSET) | .browser_download_url')
54-
wget -O ./overrides/resourcepacks/$ASSET $ASSET_URL
51+
GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
52+
ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | head -1)
53+
ASSET_NAME=$(echo $ASSET_URL | awk -F'/' '{print $NF}')
54+
wget -O ./overrides/resourcepacks/$ASSET_NAME $ASSET_URL
5555
5656
- name: Archive Release CF
5757
run: |
@@ -61,13 +61,21 @@ jobs:
6161
- name: Setup Python
6262
uses: actions/setup-python@v5
6363
with:
64-
python-version: '3.11'
65-
cache: pip
64+
python-version: '3.12'
65+
66+
- name: Install uv
67+
run: pip install uv
68+
69+
- name: Setup Python Cache
70+
uses: actions/cache@v3
71+
with:
72+
path: ~/.cache/uv
73+
key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
74+
restore-keys: |
75+
${{ runner.os }}-uv-
6676
6777
- name: Install dependencies
68-
run: |
69-
python -m pip install --upgrade pip
70-
pip install -r ./buildtools/requirements.txt
78+
run: uv pip install --system -r ./buildtools/requirements.txt
7179

7280
- name: Run Python
7381
env:

‎CHANGELOG_v1.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
* Crafting Tweaks -> dan's Crafting Tweaks
7373
* GregTech CE: Unofficial
7474
* GregTech Food Option
75-
* LoliASM
75+
* CensoredASM
7676
* Had Enough Items
7777
* ModTweaker
7878

@@ -130,7 +130,7 @@
130130
## Update mods
131131
* AE2 Unofficial Extended Life
132132
* GregTech CE: Unofficial
133-
* LoliASM
133+
* CensoredASM
134134
* DevTech
135135
* GregTech Food Option
136136
* Had Enough Items
@@ -169,7 +169,7 @@
169169
* GregTech Food Option
170170
* MultiblockTweaker
171171
* DevTech
172-
* LoliASM
172+
* CensoredASM
173173
* Had Enough Items
174174
* CraftTweaker
175175
* Smooth Font
@@ -229,7 +229,7 @@
229229
# v1.7.0(hotfix)
230230
## Update mods
231231
* AE2 Unofficial Extended Life
232-
* LoliASM
232+
* CensoredASM
233233

234234
* * *
235235

@@ -246,7 +246,7 @@
246246

247247
## Update mods
248248
* AE2 Unofficial Extended Life
249-
* LoliASM
249+
* CensoredASM
250250
* SuperMartijn642's Core Lib
251251
* Trash Cans
252252
* Had Enough Items
@@ -597,7 +597,7 @@
597597

598598
## Update mods
599599
* AE2 Unofficial Extended Life
600-
* LoliASM
600+
* CensoredASM
601601
* Had Enough Items
602602
* MixinBooter
603603

@@ -947,7 +947,7 @@ Respond to the fact that GTFO is not included and that quests are not included.
947947
* AE2 Unofficial Extended Life
948948
* CraftTweaker
949949
* GregTech Food Option
950-
* LoliASM
950+
* CensoredASM
951951
* MixinBooter
952952
* Not Enough Energistics
953953

0 commit comments

Comments
 (0)