Skip to content

Commit 077053c

Browse files
tier940tier940
committed
Update Cleanroom v0.3.30
1 parent 7419f00 commit 077053c

File tree

8 files changed

+49
-58
lines changed

8 files changed

+49
-58
lines changed

‎.github/workflows/preview.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ on:
2020

2121
env:
2222
NAME: "GTExpert2"
23-
VERSION_NORMAL: "v${{ github.event.inputs.version }}-pr-${{ github.event.inputs.preview_version }}"
24-
VERSION_LWJGL3: "v${{ github.event.inputs.version }}-lwjgl3-${{ github.event.inputs.preview_version }}"
23+
VERSION_NORMAL: "v${{ github.event.inputs.version }}-Pre-${{ github.event.inputs.preview_version }}_Java_8"
24+
VERSION_LWJGL3: "v${{ github.event.inputs.version }}-Pre-${{ github.event.inputs.preview_version }}_Java_17-25"
2525

2626
jobs:
2727
build:
@@ -82,12 +82,12 @@ jobs:
8282
mv -vf overrides/ .minecraft/
8383
cp -vf icon.png .minecraft/
8484
cp -rvf cmmc/* ./
85-
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip patches/ mmc-pack.json instance.cfg .minecraft/
85+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}_Java_17-25.zip patches/ mmc-pack.json instance.cfg .minecraft/
8686
else
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/
87+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}_Java_8.zip manifest.json modlist.html overrides/config/ overrides/local/ overrides/resourcepacks/icons/ overrides/resourcepacks/GTExpert2-* overrides/scripts/
8888
mv overrides/ .minecraft/
8989
cp icon.png .minecraft/
90-
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip mmc-pack.json instance.cfg .minecraft/
90+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}_Java_17-25.zip mmc-pack.json instance.cfg .minecraft/
9191
mv serverfiles/* ./
9292
rm -vf .minecraft/mods/!Red-Core-*
9393
rm -vf .minecraft/mods/Alfheim-*
@@ -160,16 +160,16 @@ jobs:
160160
## GregTech Expert 2 - Preview Release
161161
162162
This preview includes:
163-
- **Standard** (CurseForge / MultiMC / PrismLauncher / Server)
164-
- **LWJGL3** (MultiMC / PrismLauncher only)
163+
- **Java 8** (CurseForge / MultiMC / PrismLauncher / Server)
164+
- **Java 17-25** (MultiMC / PrismLauncher only)
165165
166166
See installation guide for LWJGL3 [here](https://github.com/GTModpackTeam/GregTech-Expert-2/blob/main/cmmc/README.md).
167167
prerelease: true
168168
generate_release_notes: true
169169
files: |
170-
artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip
171-
artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip
170+
artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}_Java_8.zip
171+
artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}_Java_17-25.zip
172172
artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip
173-
artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip
173+
artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}_Java_17-25.zip
174174
env:
175175
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ on:
1818

1919
env:
2020
NAME: "GTExpert2"
21-
VERSION_NORMAL: "v${{ github.event.inputs.version }}-${{ github.event.inputs.release_type }}"
22-
VERSION_LWJGL3: "v${{ github.event.inputs.version }}-${{ github.event.inputs.release_type }}-lwjgl3"
21+
VERSION_NORMAL: "v${{ github.event.inputs.version }}-${{ github.event.inputs.preview_version }}_Java_8"
22+
VERSION_LWJGL3: "v${{ github.event.inputs.version }}-${{ github.event.inputs.preview_version }}_Java_17-25"
2323

2424
jobs:
2525
build:
@@ -79,12 +79,12 @@ jobs:
7979
mv -vf overrides/ .minecraft/
8080
cp -vf icon.png .minecraft/
8181
cp -rvf cmmc/* ./
82-
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip patches/ mmc-pack.json instance.cfg .minecraft/
82+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}_Java_17-25.zip patches/ mmc-pack.json instance.cfg .minecraft/
8383
else
84-
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip manifest.json modlist.html overrides/config/ overrides/local/ overrides/resourcepacks/ overrides/scripts/
84+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}_Java_8.zip manifest.json modlist.html overrides/config/ overrides/local/ overrides/resourcepacks/ overrides/scripts/
8585
mv overrides/ .minecraft/
8686
cp icon.png .minecraft/
87-
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip mmc-pack.json instance.cfg .minecraft/
87+
zip -r artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}_Java_17-25.zip mmc-pack.json instance.cfg .minecraft/
8888
mv serverfiles/* ./
8989
rm -vf .minecraft/mods/!Red-Core-*
9090
rm -vf .minecraft/mods/Alfheim-*
@@ -159,16 +159,16 @@ jobs:
159159
## GregTech Expert 2 - ${{ env.VERSION_NORMAL }}
160160
161161
This preview includes:
162-
- **Standard** (CurseForge / MultiMC / PrismLauncher / Server)
163-
- **LWJGL3** (MultiMC / PrismLauncher only)
162+
- **Java 8** (CurseForge / MultiMC / PrismLauncher / Server)
163+
- **Java 17-25** (MultiMC / PrismLauncher only)
164164
165165
See installation guide for LWJGL3 [here](https://github.com/GTModpackTeam/GregTech-Expert-2/blob/main/cmmc/README.md).
166166
prerelease: false
167167
generate_release_notes: true
168168
files: |
169-
artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip
170-
artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip
169+
artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}_Java_8.zip
170+
artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}_Java_17-25.zip
171171
artifacts/${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip
172-
artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-mmc.zip
172+
artifacts/${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}_Java_17-25.zip
173173
env:
174174
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎CHANGELOG_v2.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@
6161

6262
* * *
6363

64-
# 2.7.13
65-
## Modpack information
66-
- Many Quests have been fixed.
67-
68-
* * *
69-
7064
# v2.7.12
7165
## New mods
7266
- Hot or Not Plus (1.1.10)

‎cmmc/README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
# GregTech Expert 2 for LWJGL3 Version - (Powered by [CleanroomMMC](https://github.com/CleanroomMC/CleanroomMMC))
1+
# GregTech Expert 2 for Java_17-25 Version - (Powered by [Cleanroom](https://github.com/CleanroomMC/Cleanroom))
22

33
## About
44
- This is the first ModPack created(probably) to promote [CleanroomMC](https://github.com/CleanroomMC), which runs on LWJGL version 3 in Minecraft 1.12.2 and aims to run [Azul Zulu Builds of OpenJDK(Java 21+)](https://www.azul.com/downloads/?version=java-21-lts&package=jre#zulu), optimize, and much more.
55

66

77
## How to install
8-
- To install the GregTech Expert 2 for LWJGL3 ModPack, follow these steps:
9-
1. First, find the latest build with [lwjgl3](https://github.com/GTModpackTeam/gregtech-expert-2/releases) in Github releases
10-
2. Download the `GTExpert2-<base_version>-lwjgl3-mmc.zip` or the PR version if you want to test the latest changes
11-
1. PR Version: `GTExpert2-<base_version>-lwjgl3-<pr_version>-mmc.zip`
12-
3. Open the [MultiMC](https://multimc.org/) or [Prism Launcher](https://prismlauncher.org/) and create a new instance
13-
4. Import the downloaded zip file into the MultiMC instance
8+
- To install the GregTech Expert 2 for Java_17-25 ModPack, follow these steps:
9+
1. First, find the latest build with [Java_17-25](https://github.com/GTModpackTeam/gregtech-expert-2/releases) in Github releases
10+
2. Download the `GTExpert2-<base_version>_Java_17-25.zip` or the PR version if you want to test the latest changes
11+
1. PR Version: `GTExpert2-<base_version>-Pre-<pr_version>_Java_17-25.zip`
12+
3. Open the [Prism Launcher](https://prismlauncher.org/) or [MultiMC](https://multimc.org/) and create a new instance
13+
4. Import the downloaded zip file into the Prism Launcher/MultiMC instance
1414
5. Get the mods you need from the list below
1515
6. Put the downloaded mods in the `mods` folder of the instance
16-
7. Set version to [Azul Zulu Builds of OpenJDK(Java 21+)](https://www.azul.com/downloads/?version=java-21-lts&package=jre#zulu)
16+
7. Set version to [Azul Zulu Builds of OpenJDK(Java 17-25)](https://www.azul.com/downloads/?version=java-25-lts&package=jre#zulu)
1717
8. Resolve any mod conflicts that may occur
1818
9. Run the instance and enjoy the game!
1919

‎cmmc/instance.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ JvmArgs=-XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+Use
2222
lastLaunchTime=0
2323
lastTimePlayed=0
2424
name=[Cleanroom] GregTech Expert 2 MODPACKVERSION
25-
notes=Release URL: https://github.com/CleanroomMC/Cleanroom/releases/tag/0.3.27-alpha
25+
notes=Release URL: https://github.com/CleanroomMC/Cleanroom/releases/tag/0.3.30-alpha
2626
totalTimePlayed=0

‎cmmc/mmc-pack.json‎

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

‎cmmc/patches/net.minecraftforge.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"formatVersion": 1,
99
"libraries": [
1010
{
11-
"name": "com.cleanroommc:cleanroom:0.3.27-alpha",
11+
"name": "com.cleanroommc:cleanroom:0.3.30-alpha",
1212
"downloads": {
1313
"artifact": {
14-
"path": "com/cleanroommc/cleanroom/0.3.27-alpha/cleanroom-0.3.27-alpha.jar",
15-
"url": "https://repo.cleanroommc.com/releases/com/cleanroommc/cleanroom/0.3.27-alpha/cleanroom-0.3.27-alpha-universal.jar",
16-
"sha1": "60aad36fcc76c1bb5a322620e4e1b7a7a62363c1",
17-
"size": 4370915
14+
"path": "com/cleanroommc/cleanroom/0.3.30-alpha/cleanroom-0.3.30-alpha.jar",
15+
"url": "https://repo.cleanroommc.com/releases/com/cleanroommc/cleanroom/0.3.30-alpha/cleanroom-0.3.30-alpha-universal.jar",
16+
"sha1": "d91904bc76f8479f2e06d08009fc934683a41361",
17+
"size": 4375743
1818
}
1919
}
2020
},
@@ -96,24 +96,24 @@
9696
}
9797
},
9898
{
99-
"name": "top.outlands:foundation:0.18.2",
99+
"name": "top.outlands:foundation:0.18.3",
100100
"downloads": {
101101
"artifact": {
102-
"path": "top/outlands/foundation/0.18.2/foundation-0.18.2.jar",
103-
"url": "https://repo.cleanroommc.com/releases/top/outlands/foundation/0.18.2/foundation-0.18.2.jar",
104-
"sha1": "2a595caa81b27d5f9ec15540b6065a3fe6e217fe",
105-
"size": 55926
102+
"path": "top/outlands/foundation/0.18.3/foundation-0.18.3.jar",
103+
"url": "https://repo.cleanroommc.com/releases/top/outlands/foundation/0.18.3/foundation-0.18.3.jar",
104+
"sha1": "9250189439abae96b29437ae0aa3a563f6d0a334",
105+
"size": 56075
106106
}
107107
}
108108
},
109109
{
110-
"name": "net.lenni0451:Reflect:1.5.0",
110+
"name": "net.lenni0451:Reflect:1.6.0",
111111
"downloads": {
112112
"artifact": {
113-
"path": "net/lenni0451/Reflect/1.5.0/Reflect-1.5.0.jar",
114-
"url": "https://repo.maven.apache.org/maven2/net/lenni0451/Reflect/1.5.0/Reflect-1.5.0.jar",
115-
"sha1": "28c05371ba5e8f2a1971cf78f23e90c274d417ce",
116-
"size": 170853
113+
"path": "net/lenni0451/Reflect/1.6.0/Reflect-1.6.0.jar",
114+
"url": "https://repo.maven.apache.org/maven2/net/lenni0451/Reflect/1.6.0/Reflect-1.6.0.jar",
115+
"sha1": "1374c43f1b5a0697b3aa1fd5d67031dc743a5e06",
116+
"size": 215140
117117
}
118118
}
119119
},
@@ -788,5 +788,5 @@
788788
}
789789
],
790790
"uid": "net.minecraftforge",
791-
"version": "0.3.27-alpha"
792-
}
791+
"version": "0.3.30-alpha"
792+
}

‎serverfiles/docker-compose.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
version: "3.8"
2-
31
# Repository for the image below: https://github.com/itzg/docker-minecraft-server
4-
52
services:
63
minecraft:
74
image: itzg/minecraft-server:java8

0 commit comments

Comments
 (0)