Skip to content

Commit f10fd81

Browse files
tier940tier940
committed
Update 2.8.0
1 parent a3c95d7 commit f10fd81

777 files changed

Lines changed: 34242 additions & 33422 deletions

File tree

Some content is hidden

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

‎.github/actions/build_setup/action.yml‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,19 @@ runs:
1111
using: 'composite'
1212

1313
steps:
14-
- name: Setup Python
15-
uses: actions/setup-python@v5
16-
with:
17-
python-version: '3.12'
18-
19-
- name: Install uv
14+
- name: Install system dependencies
2015
shell: bash
21-
run: pip install uv
16+
run: |
17+
sudo apt-get update
18+
sudo apt-get install -y zip jq wget
2219
23-
- name: Setup Python Cache
24-
uses: actions/cache@v4
20+
- name: Install uv
21+
uses: astral-sh/setup-uv@v7
2522
with:
26-
path: ~/.cache/uv
27-
key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
28-
restore-keys: |
29-
${{ runner.os }}-uv-
23+
enable-cache: true
24+
python-version-file: ./buildtools/pyproject.toml
3025

3126
- name: Install dependencies
3227
shell: bash
33-
run: uv pip install --system -r ./buildtools/requirements.txt
28+
working-directory: ./buildtools
29+
run: uv sync

‎.github/workflows/preview.yml‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ on:
88
workflow_dispatch:
99
inputs:
1010
target_branch:
11-
description: 'Target branch for the preview'
11+
description: "Target branch for the preview"
1212
type: string
1313
required: true
1414
version:
15-
description: 'Modpack version'
15+
description: "Modpack version"
1616
required: true
1717
preview_version:
18-
description: 'Preview version'
18+
description: "Preview version"
1919
required: true
2020

2121
env:
@@ -25,26 +25,18 @@ env:
2525

2626
jobs:
2727
build:
28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-slim
2929
strategy:
3030
matrix:
3131
buildType: [standard, lwjgl3]
3232

3333
steps:
3434
- name: Checkout repository
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636
with:
3737
ref: ${{ github.event.inputs.target_branch || github.ref }}
3838
fetch-depth: 0
3939

40-
- name: Cache dependencies
41-
uses: actions/cache@v4
42-
with:
43-
path: |
44-
~/.m2/repository
45-
~/.cache/pip
46-
key: ${{ runner.os }}-deps-${{ matrix.buildType }}-${{ hashFiles('**/pom.xml') }}
47-
4840
- name: Download Resource Packs zip
4941
run: |
5042
GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
@@ -72,13 +64,13 @@ jobs:
7264
- name: Adjust for LWJGL3
7365
if: matrix.buildType == 'lwjgl3'
7466
run: |
75-
python buildtools/gen-lwjgl3-manifest.py
67+
uv run --directory ./buildtools python ./gen-lwjgl3-manifest.py
7668
cp -vf cmmc/manifest.json manifest.json
7769
7870
- name: Install Mods
7971
env:
8072
CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
81-
run: python buildtools/mod-install.py
73+
run: uv run --directory ./buildtools python ./mod-install.py
8274

8375
- name: Clean up placeholder files
8476
run: find . -name ".gitkeep" -delete
@@ -87,21 +79,18 @@ jobs:
8779
run: |
8880
if [[ "${{ matrix.buildType }}" == "lwjgl3" ]]; then
8981
sed -i "s/B:EnableCustomGameTitle=false/B:EnableCustomGameTitle=true/" overrides/config/stellar_core.cfg
90-
cp -rvf cmmc/bansoukou/ ./overrides/
91-
rm -Rf cmmc/bansoukou/
9282
mv -vf overrides/ .minecraft/
9383
cp -vf icon.png .minecraft/
9484
cp -rvf cmmc/* ./
95-
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip libraries/ patches/ mmc-pack.json instance.cfg .minecraft/
85+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip patches/ mmc-pack.json instance.cfg .minecraft/
9686
else
97-
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/
87+
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/
9888
mv overrides/ .minecraft/
9989
cp icon.png .minecraft/
10090
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip mmc-pack.json instance.cfg .minecraft/
10191
mv serverfiles/* ./
10292
rm -vf .minecraft/mods/!Red-Core-*
10393
rm -vf .minecraft/mods/Alfheim-*
104-
rm -vf .minecraft/mods/Valkyrie-*
10594
rm -vf .minecraft/mods/CraftPresence-*
10695
rm -vf .minecraft/mods/Controlling-*
10796
rm -vf .minecraft/mods/UniLib-*
@@ -116,33 +105,32 @@ jobs:
116105
rm -vf .minecraft/mods/InGameInfoXML-*
117106
rm -vf .minecraft/mods/oauth-*
118107
rm -vf .minecraft/mods/UntranslatedItems-*
119-
rm -vf .minecraft/mods/vintagefix-*
120108
mv -vf .minecraft/* ./
121-
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/
109+
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/
122110
fi
123111
124112
- name: Upload Artifacts
125-
uses: actions/upload-artifact@v4
113+
uses: actions/upload-artifact@v5
126114
with:
127115
name: ${{ matrix.buildType }}-artifacts
128116
path: artifacts/
129117
retention-days: 1
130118

131119
release:
132120
needs: build
133-
runs-on: ubuntu-latest
121+
runs-on: ubuntu-slim
134122
permissions:
135123
contents: write
136124

137125
steps:
138126
- name: Checkout repository
139-
uses: actions/checkout@v4
127+
uses: actions/checkout@v5
140128
with:
141129
ref: ${{ github.event.inputs.target_branch || github.ref }}
142130
fetch-depth: 0
143131

144132
- name: Download All Artifacts
145-
uses: actions/download-artifact@v4
133+
uses: actions/download-artifact@v6
146134
with:
147135
path: downloads
148136

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
workflow_dispatch:
99
inputs:
1010
version:
11-
description: 'Modpack version'
11+
description: "Modpack version"
1212
required: true
1313
release_type:
14-
description: 'Release type'
14+
description: "Release type"
1515
type: choice
16-
default: 'release'
16+
default: "release"
1717
options: [release, beta, alpha]
1818

1919
env:
@@ -23,25 +23,17 @@ env:
2323

2424
jobs:
2525
build:
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-slim
2727
strategy:
2828
matrix:
2929
buildType: [standard, lwjgl3]
3030

3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434
with:
3535
fetch-depth: 0
3636

37-
- name: Restore cache
38-
uses: actions/cache@v4
39-
with:
40-
path: |
41-
~/.m2/repository
42-
~/.cache/pip
43-
key: ${{ runner.os }}-deps-${{ matrix.buildType }}-${{ hashFiles('**/pom.xml') }}
44-
4537
- name: Download Resource Packs zip
4638
run: |
4739
GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
@@ -69,13 +61,13 @@ jobs:
6961
- name: Adjust for LWJGL3
7062
if: matrix.buildType == 'lwjgl3'
7163
run: |
72-
python buildtools/gen-lwjgl3-manifest.py
64+
uv run --directory ./buildtools python ./gen-lwjgl3-manifest.py
7365
cp -vf cmmc/manifest.json manifest.json
7466
7567
- name: Install Mods
7668
env:
7769
CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
78-
run: python buildtools/mod-install.py
70+
run: uv run --directory ./buildtools python ./mod-install.py
7971

8072
- name: Clean up placeholder files
8173
run: find . -name ".gitkeep" -delete
@@ -84,21 +76,18 @@ jobs:
8476
run: |
8577
if [[ "${{ matrix.buildType }}" == "lwjgl3" ]]; then
8678
sed -i "s/B:EnableCustomGameTitle=false/B:EnableCustomGameTitle=true/" overrides/config/stellar_core.cfg
87-
cp -rvf cmmc/bansoukou/ ./overrides/
88-
rm -Rf cmmc/bansoukou/
8979
mv -vf overrides/ .minecraft/
9080
cp -vf icon.png .minecraft/
9181
cp -rvf cmmc/* ./
92-
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip libraries/ patches/ mmc-pack.json instance.cfg .minecraft/
82+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip patches/ mmc-pack.json instance.cfg .minecraft/
9383
else
94-
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip manifest.json modlist.html overrides/bansoukou/ overrides/config/ overrides/local/ overrides/resourcepacks/ overrides/scripts/
84+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip manifest.json modlist.html overrides/config/ overrides/local/ overrides/resourcepacks/ overrides/scripts/
9585
mv overrides/ .minecraft/
9686
cp icon.png .minecraft/
9787
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip mmc-pack.json instance.cfg .minecraft/
9888
mv serverfiles/* ./
9989
rm -vf .minecraft/mods/!Red-Core-*
10090
rm -vf .minecraft/mods/Alfheim-*
101-
rm -vf .minecraft/mods/Valkyrie-*
10291
rm -vf .minecraft/mods/CraftPresence-*
10392
rm -vf .minecraft/mods/Controlling-*
10493
rm -vf .minecraft/mods/UniLib-*
@@ -113,32 +102,31 @@ jobs:
113102
rm -vf .minecraft/mods/InGameInfoXML-*
114103
rm -vf .minecraft/mods/oauth-*
115104
rm -vf .minecraft/mods/UntranslatedItems-*
116-
rm -vf .minecraft/mods/vintagefix-*
117105
mv -vf .minecraft/* ./
118-
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/
106+
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/
119107
fi
120108
121109
- name: Upload Artifacts
122-
uses: actions/upload-artifact@v4
110+
uses: actions/upload-artifact@v5
123111
with:
124112
name: ${{ matrix.buildType }}-artifacts
125113
path: artifacts/
126114
retention-days: 1
127115

128116
release:
129117
needs: build
130-
runs-on: ubuntu-latest
118+
runs-on: ubuntu-slim
131119
permissions:
132120
contents: write
133121

134122
steps:
135123
- name: Checkout repository
136-
uses: actions/checkout@v4
124+
uses: actions/checkout@v5
137125
with:
138126
fetch-depth: 0
139127

140128
- name: Download All Artifacts
141-
uses: actions/download-artifact@v4
129+
uses: actions/download-artifact@v6
142130
with:
143131
path: downloads
144132

‎CHANGELOG_v2.md‎

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,66 @@
1+
# 2.7.13
2+
## Modpack migration
3+
- CoreMod fixes issues with NAE2.
4+
1. Delete the `bansoukou` folder.
5+
2. Delete `nae2-1.6.4-patched.jar` in the folder named `mods`.
6+
3. Rename `nae2-1.6.4.disabled` to `nae2-1.6.4.jar` in the folder named `mods`.
7+
8+
## Modpack information
9+
- Fix quests related to NBT tags
10+
11+
## Disable mods
12+
- Advanced Backups
13+
- Flare (Spark for 1.12.2)
14+
15+
## Move mods
16+
- AppleSkin -> LemonSkin (3.0.2)
17+
- NetherPortalFix -> Universal Tweaks
18+
- Ender Storage continuation (2.6.3) -> EnderStorage Continuation2 (2.7.0)
19+
20+
## Remove mods
21+
- Bansoukou (4.3.1)
22+
- Valkyrie (0.3)
23+
- VintageFix (0.6.2)
24+
25+
## New mods
26+
- AE2UEL Wireless Universal Terminal (1.2.6)
27+
- Key Binding Patch (1.3.3.3)
28+
- VintageDisplay (1.5)
29+
- SussyPatches (1.9.2)
30+
31+
## Update mods
32+
- AE2 Unofficial Extended Life (0.56.5 -> 0.56.7)
33+
- AE2 Stuff Unofficial (0.9 -> 0.10)
34+
- Alfheim (1.5 -> 1.6)
35+
- Betterer P2P (1.3.2 -> 1.3.3)
36+
- CraftPresence (2.6.2 -> 2.7.0)
37+
- CensoredASM (5.29 -> 5.30)
38+
- EZStorage 2 Patch (1.4.1 -> 1.5.0)
39+
- Fixeroo (2.3.6b -> 2.3.6)
40+
- Forgelin-Continuous (2.2.0.0 -> 2.2.21.0)
41+
- GTConsolidate (1.0.7.7 -> 1.1.0.4.1)
42+
- GTExpertCore (2.4.11 -> 2.5.4)
43+
- Inventory Bogo Sorter (1.4.8 -> 1.5.0)
44+
- JEI Utilities (0.2.11 -> 0.2.13)
45+
- Had Enough Items (4.28.1 -> 4.29.12)
46+
- Hot or Not GTCEu (1.2.0 -> 1.3.0)
47+
- MixinBooter (9.4 -> 10.7)
48+
- ModularUI (2.4.3 -> 3.0.5)
49+
- PackagedAuto (1.0.19.66 -> 1.0.23.72)
50+
- UniLib (1.1.1 -> 1.2.0)
51+
- Universal Tweaks (1.14.0 -> 1.17.0)
52+
53+
## New recipes
54+
### AE2 Unofficial Extended Life
55+
- Wireless Interface Terminal
56+
- Wireless Universal Terminal
57+
58+
## Fix recipes
59+
### AE2 Fluid Crafting Rework
60+
- Wireless Fluid Interface Terminal
61+
62+
* * *
63+
164
# v2.7.12
265
## New mods
366
- Hot or Not Plus (1.1.10)
@@ -732,7 +795,7 @@ Shadowfacts' Forgelin (1.8.4) -> Forgelin-Continuous (2.1.10.0)
732795
# v2.5.3
733796
## Modpack information
734797
### To update an existing profile without creating a new profile.
735-
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`.
798+
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`.
736799
2. In addition, delete `gregtech-1.12.2-2.7.2-beta.jar.disabled` and `gregtechfoodoption-1.9.3.1.jar.disabled`.
737800
3. Finally, check the `overrides\config\mod-director` and make sure there are no files inside.
738801
- In case you are wondering, ModPack recommends [MultiMC](https://multimc.org/) or [Prism Launcher](https://prismlauncher.org/).
@@ -936,7 +999,7 @@ Shadowfacts' Forgelin (1.8.4) -> Forgelin-Continuous (2.1.10.0)
936999
## New mods
9371000
- Extra CPUs
9381001

939-
* * *
1002+
* * *
9401003

9411004
# v2.3.1
9421005
## Modpack information

0 commit comments

Comments
 (0)