Skip to content

Commit 472667f

Browse files
committed
Updte CMMC
1 parent 89d2910 commit 472667f

8 files changed

Lines changed: 266 additions & 252 deletions

File tree

.github/workflows/preview.yml

Lines changed: 5 additions & 7 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:
@@ -87,14 +87,12 @@ jobs:
8787
run: |
8888
if [[ "${{ matrix.buildType }}" == "lwjgl3" ]]; then
8989
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/
9290
mv -vf overrides/ .minecraft/
9391
cp -vf icon.png .minecraft/
9492
cp -rvf cmmc/* ./
95-
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip libraries/ patches/ mmc-pack.json instance.cfg .minecraft/
93+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip patches/ mmc-pack.json instance.cfg .minecraft/
9694
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/
95+
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/
9896
mv overrides/ .minecraft/
9997
cp icon.png .minecraft/
10098
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip mmc-pack.json instance.cfg .minecraft/

.github/workflows/release.yml

Lines changed: 5 additions & 7 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:
@@ -84,14 +84,12 @@ jobs:
8484
run: |
8585
if [[ "${{ matrix.buildType }}" == "lwjgl3" ]]; then
8686
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/
8987
mv -vf overrides/ .minecraft/
9088
cp -vf icon.png .minecraft/
9189
cp -rvf cmmc/* ./
92-
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip libraries/ patches/ mmc-pack.json instance.cfg .minecraft/
90+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip patches/ mmc-pack.json instance.cfg .minecraft/
9391
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/
92+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip manifest.json modlist.html overrides/config/ overrides/local/ overrides/resourcepacks/ overrides/scripts/
9593
mv overrides/ .minecraft/
9694
cp icon.png .minecraft/
9795
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip mmc-pack.json instance.cfg .minecraft/

cmmc/bansoukou/.gitkeep

Whitespace-only changes.

cmmc/instance.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ iconKey=default
2222
lastLaunchTime=0
2323
lastTimePlayed=0
2424
name=[CleanroomMMC] GregTech Expert 2 MODPACKVERSION
25-
notes=Release URL: https://github.com/CleanroomMC/Cleanroom/releases/tag/0.3.13-alpha
25+
notes=Release URL: https://github.com/CleanroomMC/Cleanroom/releases/tag/0.3.20-alpha
2626
totalTimePlayed=0
-4.17 MB
Binary file not shown.

cmmc/mmc-pack.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"uid": "net.minecraft"
3030
}
3131
],
32-
"cachedVersion": "0.3.13-alpha",
32+
"cachedVersion": "0.3.20-alpha",
3333
"uid": "net.minecraftforge",
34-
"version": "0.3.13-alpha"
34+
"version": "0.3.20-alpha"
3535
}
3636
],
3737
"formatVersion": 1

cmmc/patches/net.minecraftforge.json

Lines changed: 253 additions & 235 deletions
Large diffs are not rendered by default.

overrides/bansoukou/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)