Skip to content

Commit aeb8439

Browse files
tier940tier940
authored
Merge pull request #406 from GTModpackTeam/develop
2 parents dc0960f + 3b63a2f commit aeb8439

Some content is hidden

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

41 files changed

+1675
-19820
lines changed

‎.github/workflows/preview.yml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,12 @@ jobs:
6767
CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
6868
run: python buildtools/mod-install.py
6969

70+
- name: Remaove .gitkeep files
71+
run: find . -name ".gitkeep" -type f -delete
72+
7073
- if: matrix.version == 'NORMAL'
7174
name: Archive Release CF (NORMAL)
72-
run: |
73-
rm -rf ./overrides/resourcepacks/.gitkeep
74-
zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/ ./overrides/scripts/
75+
run: zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/ ./overrides/scripts/
7576

7677
- if: matrix.version == 'LWJGL3'
7778
name: Archive Release MMC (LWJGL3)
@@ -81,23 +82,41 @@ jobs:
8182
mv -vf ./overrides/ .minecraft/
8283
cp -vf ./icon.png .minecraft/
8384
cp -rvf ./cmmc/* ./
84-
rm -rf .minecraft/mods/.gitkeep
85-
rm -rf .minecraft/resourcepacks/.gitkeep
8685
zip -r ./${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-cmmc.zip ./libraries/ ./patches/ ./mmc-pack.json ./instance.cfg .minecraft/
8786
8887
- if: matrix.version == 'NORMAL'
8988
name: Archive Release MMC (NORMAL)
9089
run: |
9190
mv -vf ./overrides/ .minecraft/
9291
cp -vf ./icon.png .minecraft/
93-
rm -rf .minecraft/mods/.gitkeep
9492
zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip ./mmc-pack.json ./instance.cfg .minecraft/
9593
9694
- if: matrix.version == 'NORMAL'
9795
name: Move Server Files (NORMAL)
9896
run: |
9997
mv -vf ./serverfiles/* ./
10098
99+
- name: Remove Client Only Mods
100+
run: |
101+
rm -vf .minecraft/mods/!Red-Core-*
102+
rm -vf .minecraft/mods/Alfheim-*
103+
rm -vf .minecraft/mods/Valkyrie-*
104+
rm -vf .minecraft/mods/CraftPresence-*
105+
rm -vf .minecraft/mods/Controlling-*
106+
rm -vf .minecraft/mods/UniLib-*
107+
rm -vf .minecraft/mods/CustomMainMenu-*
108+
rm -vf .minecraft/mods/Fixeroo-*
109+
rm -vf .minecraft/mods/FpsReducer-*
110+
rm -vf .minecraft/mods/modernsplash-*
111+
rm -vf .minecraft/mods/RenderLib-*
112+
rm -vf .minecraft/mods/particleculling-*
113+
rm -vf .minecraft/mods/EntityCulling-*
114+
rm -vf .minecraft/mods/SmoothFont-*
115+
rm -vf .minecraft/mods/InGameInfoXML-*
116+
rm -vf .minecraft/mods/oauth-*
117+
rm -vf .minecraft/mods/UntranslatedItems-*
118+
rm -vf .minecraft/mods/vintagefix-*
119+
101120
- if: matrix.version == 'NORMAL'
102121
name: Archive Release Server (NORMAL)
103122
run: |

‎.github/workflows/release.yml

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,18 @@ jobs:
7171
run: |
7272
python buildtools/gen-lwjgl3-manifest.py
7373
cp -vf ./cmmc/manifest.json ./manifest.json
74-
74+
75+
- name: Remaove .gitkeep files
76+
run: find . -name ".gitkeep" -type f -delete
77+
7578
- name: Run Python
7679
env:
7780
CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
7881
run: python buildtools/mod-install.py
7982

8083
- if: matrix.version == 'NORMAL'
8184
name: Archive Release CF (NORMAL)
82-
run: |
83-
rm -rf ./overrides/resourcepacks/.gitkeep
84-
zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip ./manifest.json ./modlist.html ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/ ./overrides/scripts/
85+
run: zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip ./manifest.json ./modlist.html ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/ ./overrides/scripts/
8586

8687
- if: matrix.version == 'LWJGL3'
8788
name: Archive Release MMC (LWJGL3)
@@ -91,23 +92,41 @@ jobs:
9192
mv -vf ./overrides/ .minecraft/
9293
cp -vf ./icon.png .minecraft/
9394
cp -rvf ./cmmc/* ./
94-
rm -rf .minecraft/mods/.gitkeep
95-
rm -rf .minecraft/resourcepacks/.gitkeep
9695
zip -r ./${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-cmmc.zip ./libraries/ ./patches/ ./mmc-pack.json ./instance.cfg .minecraft/
9796
9897
- if: matrix.version == 'NORMAL'
9998
name: Archive Release MMC (NORMAL)
10099
run: |
101100
mv -vf ./overrides/ .minecraft/
102101
cp -vf ./icon.png .minecraft/
103-
rm -rf .minecraft/mods/.gitkeep
104102
zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip ./mmc-pack.json ./instance.cfg .minecraft/
105103
106104
- if: matrix.version == 'NORMAL'
107105
name: Move Server Files
108106
run: |
109107
mv -vf ./serverfiles/* ./
110108
109+
- name: Remove Client Only Mods
110+
run: |
111+
rm -vf .minecraft/mods/!Red-Core-*
112+
rm -vf .minecraft/mods/Alfheim-*
113+
rm -vf .minecraft/mods/Valkyrie-*
114+
rm -vf .minecraft/mods/CraftPresence-*
115+
rm -vf .minecraft/mods/Controlling-*
116+
rm -vf .minecraft/mods/UniLib-*
117+
rm -vf .minecraft/mods/CustomMainMenu-*
118+
rm -vf .minecraft/mods/Fixeroo-*
119+
rm -vf .minecraft/mods/FpsReducer-*
120+
rm -vf .minecraft/mods/modernsplash-*
121+
rm -vf .minecraft/mods/RenderLib-*
122+
rm -vf .minecraft/mods/particleculling-*
123+
rm -vf .minecraft/mods/EntityCulling-*
124+
rm -vf .minecraft/mods/SmoothFont-*
125+
rm -vf .minecraft/mods/InGameInfoXML-*
126+
rm -vf .minecraft/mods/oauth-*
127+
rm -vf .minecraft/mods/UntranslatedItems-*
128+
rm -vf .minecraft/mods/vintagefix-*
129+
111130
- if: matrix.version == 'NORMAL'
112131
name: Archive Release Server
113132
run: |

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ overrides/config/enderio/recipes/*
1919
!overrides/config/enderio/recipes/user/*
2020
overrides/config/nutrition/effects/example.json
2121
overrides/config/nutrition/nutrients/example.json
22+
overrides/config/activity.json
23+
overrides/config/AdvancedBackups-client.properties

‎CHANGELOG_v2.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# v2.7.8
2+
## Modpack information
3+
- Fix titanium quest.
4+
- Fix Void Portal quest.
5+
6+
## Update mods
7+
- Better Questing Unofficial (4.2.3 -> 4.2.4)
8+
- CraftPresence (2.5.0 -> 2.5.1)
9+
- GregTech Food Option (1.12.0 -> 1.12.1)
10+
- Had Enough Items (4.25.5 -> 4.26.1)
11+
- PackagedAuto (v1.0.13.54 -> v1.0.13.55)
12+
- StellarCore (1.3.4 -> 1.5.4)
13+
- Storage Drawers (5.5.1 -> 5.5.2)
14+
- UniLib (1.0.2 -> 1.0.3)
15+
16+
* * *
17+
118
# v2.7.7
219
## Modpack information
320
- Add alarm quest.

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333
- GTE2 comes with compatibility scripts for the following mods. You can drop them into the mods folder and their recipes will be adjusted accordingly.
3434
- However, support is for recipes only, so we will not respond to reports of unstable operation of the mod itself :<
35+
- [GTMoreOreProcessing](https://www.curseforge.com/minecraft/mc-mods/gtmoreoreprocessing)
36+
- You want to process more ores?
3537
- [Flux Networks](https://www.curseforge.com/minecraft/mc-mods/flux-networks)
3638
- You want to make RF wireless?
3739
- (**WIP**) [Forestry](https://www.curseforge.com/minecraft/mc-mods/forestry)

‎cmmc/README.md

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

33
## About
4-
- 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 [Java 21](https://www.azul.com/downloads/?version=java-21-lts&package=jre#zulu), optimize, and much more.
4+
- 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
88
- 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-cmmc.zip` or the PR version if you want to test the latest changes.
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-cmmc.zip` or the PR version if you want to test the latest changes
1111
1. PR Version: `GTExpert2-<base_version>-lwjgl3-<pr_version>-cmmc.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.
14-
5. Get the mods you need from the list below.
15-
6. Put the downloaded mods in the `mods` folder of the instance.
16-
7. Set java version to 21.
17-
8. Resolve any mod conflicts that may occur.
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
14+
5. Get the mods you need from the list below
15+
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)
17+
8. Resolve any mod conflicts that may occur
1818
9. Run the instance and enjoy the game!
1919

2020

‎cmmc/instance.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OverrideJavaLocation=true
1717
OverrideMemory=false
1818
OverrideNativeWorkarounds=false
1919
OverrideWindow=false
20-
JvmArgs=-XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGuaranteedGCInterval=1000000 -XX:AllocatePrefetchStyle=1 -XX:+DisableExplicitGC -XX:+UseNUMA -XX:+UseLargePages -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority -XX:MaxNodeLimit=240000 -XX:NodeLimitFudgeFactor=8000 -XX:-DontCompileHugeMethods
20+
JvmArgs=-XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGuaranteedGCInterval=100000 -XX:AllocatePrefetchStyle=1 -XX:+DisableExplicitGC -XX:+UseNUMA -XX:+UseLargePages -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority
2121
iconKey=default
2222
lastLaunchTime=0
2323
lastTimePlayed=0

‎manifest.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
},
157157
{
158158
"projectID": 297038,
159-
"fileID": 5608262,
159+
"fileID": 5798179,
160160
"required": true
161161
},
162162
{
@@ -206,7 +206,7 @@
206206
},
207207
{
208208
"projectID": 477021,
209-
"fileID": 5585788,
209+
"fileID": 5778294,
210210
"required": true
211211
},
212212
{
@@ -301,7 +301,7 @@
301301
},
302302
{
303303
"projectID": 629629,
304-
"fileID": 5487266,
304+
"fileID": 5802573,
305305
"required": true
306306
},
307307
{
@@ -326,7 +326,7 @@
326326
},
327327
{
328328
"projectID": 308380,
329-
"fileID": 5598426,
329+
"fileID": 5771422,
330330
"required": true
331331
},
332332
{
@@ -426,7 +426,7 @@
426426
},
427427
{
428428
"projectID": 223852,
429-
"fileID": 5612980,
429+
"fileID": 5758109,
430430
"required": true
431431
},
432432
{
@@ -466,7 +466,7 @@
466466
},
467467
{
468468
"projectID": 557549,
469-
"fileID": 5726160,
469+
"fileID": 5815590,
470470
"required": true
471471
},
472472
{
@@ -676,7 +676,7 @@
676676
},
677677
{
678678
"projectID": 1056812,
679-
"fileID": 5656649,
679+
"fileID": 5797752,
680680
"required": true
681681
},
682682
{
@@ -691,7 +691,7 @@
691691
},
692692
{
693693
"projectID": 1064321,
694-
"fileID": 5705621,
694+
"fileID": 5791405,
695695
"required": true
696696
},
697697
{

‎overrides/bansoukou/nae2-1.6.4/co/neeve/nae2/common/integration/ae2fc/UpgradeInit.class

1.18 KB
Binary file not shown.

‎overrides/bansoukou/nae2-1.6.4/co/neeve/nae2/common/registration/definitions/Upgrades$1.class

264 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)