Merge pull request #395 from GTModpackTeam/preview

GTModpackTeam · Jul 1, 2024 · 55bef7d · 55bef7d
2 parents a32445e + f669dc3
commit 55bef7d
Show file tree

Hide file tree

Showing 50 changed files with 1,717 additions and 1,555 deletions.
diff --git a/.github/ISSUE_TEMPLATE/003-dev-only.yml b/.github/ISSUE_TEMPLATE/003-dev-only.yml
@@ -0,0 +1,9 @@
+name: 'Dev Only Issue'
+description: "This select the dev only issue template."
+body:
+  - type: textarea
+    attributes:
+      label: Task
+      description: What do you need to do?
+    validations:
+      required: true
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Download Resource Packs zip
         run: |
           GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
-          ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | head -1)
+          ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | grep "resourcepack" | head -1)
           ASSET_NAME=$(echo $ASSET_URL | awk -F'/' '{print $NF}')
           wget -O ./overrides/resourcepacks/$ASSET_NAME $ASSET_URL
 
@@ -104,7 +104,8 @@ jobs:
           mv -vf .minecraft/* ./
           zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip ./docker-compose.yml ./PleaseRead.txt ./log4j2_112-116.xml ./Install.bat ./Install.sh ./ServerStart.bat ./ServerStart.sh ./settings.bat ./settings.sh ./TmuxServer.sh ./bansoukou/ ./config/ ./local/ ./mods/ ./resources/ ./scripts/
 
-      - name: Create GitHub Release
+      - if: matrix.version == 'NORMAL'
+        name: Create GitHub Release (NORMAL)
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.VERSION_NORMAL }}
@@ -114,4 +115,13 @@ jobs:
             ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip
             ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip
             ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip
+
+      - if: matrix.version == 'LWJGL3'
+        name: Create GitHub Release (LWJGL3)
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ env.VERSION_LWJGL3 }}
+          prerelease: true
+          generate_release_notes: true
+          files: |
             ./${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-cmmc.zip
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Download Resource Packs zip
         run: |
           GITHUB_RELEASE=$(curl -s https://api.github.com/repos/GTModpackTeam/GTE2-Translations/releases)
-          ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | head -1)
+          ASSET_URL=$(echo $GITHUB_RELEASE | jq -r '.[]."assets"[]."browser_download_url"' | grep "resourcepack" | head -1)
           ASSET_NAME=$(echo $ASSET_URL | awk -F'/' '{print $NF}')
           wget -O ./overrides/resourcepacks/$ASSET_NAME $ASSET_URL
       
@@ -114,17 +114,24 @@ jobs:
           mv -vf .minecraft/* ./
           zip -r ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip ./docker-compose.yml ./PleaseRead.txt ./log4j2_112-116.xml ./Install.bat ./Install.sh ./ServerStart.bat ./ServerStart.sh ./settings.bat ./settings.sh ./TmuxServer.sh ./bansoukou/ ./config/ ./local/ ./mods/ ./resources/ ./scripts/
 
-      - name: Create GitHub Release
+      - if: matrix.version == 'NORMAL'
+        name: Create GitHub Release (NORMAL)
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: "${{ env.VERSION_NORMAL }}"
-          draft: false
-          prerelease: false
+          tag_name: ${{ env.VERSION_NORMAL }}
           generate_release_notes: true
           files: |
             ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-cf.zip
             ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-mmc.zip
             ./${{ env.NAME }}-${{ env.VERSION_NORMAL }}-server.zip
+
+      - if: matrix.version == 'LWJGL3'
+        name: Create GitHub Release (LWJGL3)
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ env.VERSION_LWJGL3 }}
+          generate_release_notes: true
+          files: |
             ./${{ env.NAME }}-${{ env.VERSION_LWJGL3 }}-cmmc.zip
 
       # - name: Upload Curseforge

diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md
@@ -1,3 +1,58 @@
+# v2.7.4
+## Modpack information
+- Update Duct Tape quest.
+- Update Blank Pattern quest.
+- Add Programmed Circuit Card quest.
+- Fix Darmstadtium quest.
+- Fix Portable Scanner quest.
+
+## Modpack migration
+- CoreMod fixes issues with DraconicAdditions.
+    1. If there is `Draconic-Additions-1.12.2-1.17.0.45-universal` in the folder `bansoukou`, delete the whole folder.
+    2. Delete `Draconic-Additions-1.12.2-1.17.0.45-universal-patched.jar` in the folder named `mods`.
+    3. Rename `Draconic-Additions-1.12.2-1.17.0.45-universal.disabled` to `Draconic-Additions-1.12.2-1.17.0.45-universal.jar` in the folder named `mods`.
+
+## Fix config
+### Spice of Life
+- Food history will not get reset after every death.
+
+### Nutrition
+- Nutrition will not get reset after every death.
+
+## New recipes
+### AE2 Unofficial Extended Life
+- Blank Pattern
+
+### Neeve's AE2: Extended Life Additions
+- Programmed Circuit Card
+
+## New mods
+- Red Core (0.5.1)
+
+## Update mods
+- Advanced Backups (3.5.2 -> 3.6)
+- AE2 Fluid Crafting Rework (2.5.13 -> 2.6.2)
+- Better Questing Unofficial (4.2.2 -> 4.2.3)
+- Controlling (3.0.12.3 -> 3.0.12.4)
+- CraftPresence (2.3.9 -> 2.4.3)
+- EnderStorage continuation (2.5.0 -> 2.6.2)
+- GregTech Food Option (1.11.1 -> 1.11.2.1)
+- GTExpert-Core (2.1.6 -> 2.2.4)
+- Had Enough Items (4.25.4 -> 4.25.5)
+- Neeve's AE2: Extended Life Additions (0.56.4 -> 0.56.6)
+- PackagedAuto (1.0.13.47 -> 1.0.13.49)
+- RenderLib (1.3.4 -> 1.3.5)
+- VintageFix (0.4.2 -> 0.5.0)
+
+## Move mods
+- 燐/Hesperus (0.2.9.3) -> Alfheim Lighting Engine (1.3)
+- It's the little things (1.0.4) -> Valkyrie (0.2)
+
+## Del mods
+- Nothirium (0.3.4)
+
+* * *
+
 # v2.7.3
 ## Modpack information
 - Update to CEu 2.8.8 and add new quests.
@@ -7,14 +62,14 @@
 - Fix quest issues.
 
 ## Update mods
-- Advanced Backups
-- AE2 Fluid Crafting Rework
-- GregTech CE Unofficial
-- GTExpert-Core
-- Neeve's AE2: Extended Life Additions
-- PackagedAuto
-- Particle Culling
-- Universal Tweaks
+- Advanced Backups (3.5.1 -> 3.5.2)
+- AE2 Fluid Crafting Rework (2.5.12 -> 2.5.13)
+- GregTech CE Unofficial (2.8.7 -> 2.8.8)
+- GTExpert-Core (2.1.4 -> 2.1.6)
+- Neeve's AE2: Extended Life Additions (1.6.1 -> 1.6.2)
+- PackagedAuto (1.0.12.46 -> 1.0.12.47)
+- Particle Culling (1.4.2 -> 1.4.3)
+- Universal Tweaks (1.10.0 -> 1.11.0)
 
 * * *
 
@@ -25,41 +80,23 @@
 - Add HV Chainsaw quest.
 
 ## New mods
-- Particle Culling
+- Particle Culling (1.4.2)
 
 ## Update mods
-- Advanced Backups
-- AE2 Fluid Crafting Rework
-- Aqua Acrobatics
-- Better Questing Unofficial
-- CensoredASM
-- ConfigAnytime
-- CraftPresence
-- GTExpert-Core
-- Had Enough Items
-- Modern Splash
-- OpenComputers
-- PackagedAuto
-- RoughlyEnoughIDs
-- VintageFix
+- AE2 Fluid Crafting Rework (2.5.8 -> 2.5.12)
+- Better Questing Unofficial (4.2.1 -> 4.2.2)
+- PackagedAuto (1.0.12.43 -> 1.0.12.46)
 
 * * *
 
 # v2.7.1
 ## Modpack information
 - Fix quests issues.
 
-## Downgrade mods
-- RoughlyEnoughIDs
-
 ## Update mods
-- AE2 Fluid Crafting Rework
-- Better Questing Unofficial
-- ConfigAnytime
-- GTExpert-Core
-- JourneyMap
-- PackagedAuto
-- VintageFix
+- AE2 Fluid Crafting Rework (2.5.7 -> 2.5.8)
+- Better Questing Unofficial (4.2.0 -> 4.2.1)
+- PackagedAuto (0.11.40 -> 0.11.43)
 
 * * *
 
@@ -68,27 +105,29 @@
 - A major adjustment has been made in food related matter.
     - Thanks to @KatatsumuriPan, @MaimoCh, @hag-hag for his support!!
 
+## New mods
+- Better Questing Unofficial (4.2.0)
+- Nutrition Unofficial Extended Life (4.13.0)
+- Nutrition: GTCEu (1.0.0)
+- ParticleCulling (1.4.2)
+
 ## Remove mods
-- FTB Quests (Forge)
-- Item Filters
+- FTB Quests (1220.9.0.15)
+- Item Filters (1.0.4.2)
 
 ## Move mods
-- FTB Backups (Forge) -> Advanced Backups
+- FTB Backups (1220.9.0.15) -> Advanced Backups (3.5.1)
 
 ## Update mods
-- AE2 Unofficial Extended Life
-- GTExpert-Core
-- PackagedAuto
-- Roughly Enough IDs
-- Universal Tweaks
-
-## New mods
-- Nutrition Unofficial Extended Life
-- Nutrition: GTCEu
-- Better Questing Unofficial
+- Inventory Bogo Sorter (1.4.7 -> 1.4.8)
+- GregTech Food Option (1.11.0.1 -> 1.11.1)
+- JourneyMap (5.7.1 -> 5.7.1p3)
+- Modern Splash (1.3 -> 1.3.1)
+- OpenComputers (1.8.3 -> 1.8.5)
+- RoughlyEnoughIDs (2.0.7 -> 2.1.1)
 
 ## Formally introduced from compatibility mods
-- The Spice of Life
+- The Spice of Life (1.3.12)
 
 * * *
 
@@ -98,26 +137,19 @@
 - Includes multiplayer issues, performance tweaks and mod updates.
 - **ALSO, FUTURE UPDATES WILL BE 2.7.X, AND THE BACKPORTS OF 2.6.X VERSIONS WILL BE DEPRECATED!!**
 
-## New mods
-- Nutrition Unofficial Extended Life
-- Nutrition: GTCEu
-- Particle Culling
-
 ## Update mods
-- Advanced Backups
-- AE2 Fluid Crafting Rework
-- Aqua Acrobatics
-- Better Questing Unofficial
-- CensoredASM
-- ConfigAnytime
-- CraftPresence
-- GTExpert-Core
-- Had Enough Items
-- Modern Splash
-- OpenComputers
-- PackagedAuto
-- RoughlyEnoughIDs
-- VintageFix
+- Advanced Backups (3.4 -> 3.5.1)
+- AE2 Fluid Crafting Rework (2.5.8 -> 2.5.12)
+- Aqua Acrobatics (1.15.3 -> 1.15.4)
+- CensoredASM (5.19 -> 5.20)
+- ConfigAnytime (2.0 -> 3.0)
+- CraftPresence (2.3.5 -> 2.3.9)
+- GTExpert-Core (2.1.1 -> 2.1.4)
+- Had Enough Items (4.25.2 -> 4.25.4)
+- Modern Splash (1.3 -> 1.3.1)
+- OpenComputers (1.8.3 -> 1.8.5)
+- RoughlyEnoughIDs (2.0.7 -> 2.1.1)
+- VintageFix (0.4.1 -> 0.4.2)
 
 * * *
 

diff --git a/README.md b/README.md
@@ -55,26 +55,25 @@
 
 | Age | Quest | Description | Migration | Tips |
 | ---- | ---- | ---- | ---- | --- |
-| Stone Age | 〇 | 〇 | 〇 |  - |
-| Ore Veins | 〇 | 〇 | 〇 |  - |
-| Tier 0 - ULV | 〇 | 〇 | 〇 |  - |
-| Tier 1 - LV | 〇 | 〇 | 〇 |  - |
-| Tier 2 - MV | 〇 | 〇 | 〇 |  - |
-| Tier 3 - HV | 〇 | 〇 | 〇 |  - |
-| Tier 4 - EV | 〇 | 〇 | 〇 |  - |
-| Tier 5 - IV | 〇 | 〇 | 〇 |  - |
-| Tier 6 - LuV | 〇 | △ | 〇 |  - |
-| Tier 7 - ZPM | 〇 | △ | 〇 |  - |
-| Tier 8 - UV / UHV | 〇 | △ | 〇 |  - |
-| Tier 940 - Endgame | 〇 | × | 〇 |  - |
-| AE2 Unofficial Extended Life | 〇 | 〇 | 〇 |  - |
-| Draconic Evolution | 〇 | △ | 〇 |  - |
-| GCYM / GTFO/ GTEC | 〇 | 〇 | 〇 |  - |
+| Stone Age | 〇 | 〇 | 〇 | - |
+| Ore Veins | 〇 | 〇 | 〇 | - |
+| Tier 0 - ULV | 〇 | 〇 | 〇 | - |
+| Tier 1 - LV | 〇 | 〇 | 〇 | - |
+| Tier 2 - MV | 〇 | 〇 | 〇 | - |
+| Tier 3 - HV | 〇 | 〇 | 〇 | - |
+| Tier 4 - EV | 〇 | 〇 | 〇 | - |
+| Tier 5 - IV | 〇 | 〇 | 〇 | - |
+| Tier 6 - LuV | 〇 | △ | 〇 | - |
+| Tier 7 - ZPM | 〇 | △ | 〇 | - |
+| Tier 8 - UV / UHV | 〇 | △ | 〇 | - |
+| Tier 940 - Endgame | 〇 | × | 〇 | - |
+| AE2 Unofficial Extended Life | 〇 | 〇 | 〇 | - |
+| Draconic Evolution | 〇 | △ | 〇 | - |
+| GCYM / GTFO/ GTEC | 〇 | 〇 | 〇 | - |
 | Foods | × | × | × | Rescheduled |
 | Milestones | 〇 | △ | 〇 | - |
 
 
 ## Credits
 
 - Many Japanese Quests are also translated from the [GregTech-Community-Pack](https://github.com/GregTechCEu/GregTech-Community-Pack).
-- The idea of Saw Mill and some other recipes are from [IMPACT: GREGTECH EDITION](https://gt-impact.github.io/)
diff --git a/buildtools/gen-lwjgl3-manifest.py b/buildtools/gen-lwjgl3-manifest.py
@@ -7,12 +7,14 @@
 
 ## Run main function
 projectIDs = [
+    419286, # MixinBooter
     870276, # ConfigAnytime
+    873867, # Red Core
+    874067, # Valkyrie
+    910715, # Alfheim Lighting Engine
     624967, # RenderLib
-    624960, # Nothirium
     409087, # Entity Culling
     408853, # Particle Culling
-    419286  # MixinBooter
 ]
 
 # Read manifest.json

diff --git a/cmmc/README.md b/cmmc/README.md
@@ -19,9 +19,8 @@
 
 
 ## Self download mods
-- [Fugue](https://github.com/CleanroomMC/Fugue/releases) by CleanroomMC
-- [Scalar](https://github.com/CleanroomMC/Scalar/releases/tag/2.11.1) by CleanroomMC
-
+- [Fugue](https://www.curseforge.com/minecraft/mc-mods/fugue) by CleanroomMC
+- [Scalar](https://www.curseforge.com/minecraft/mc-mods/scalar/files/5309537) by CleanroomMC
 
 ## Optional mods
 - [Vintagium](https://github.com/Asek3/sodium-1.12/actions) by Asek3

diff --git a/cmmc/instance.cfg b/cmmc/instance.cfg
@@ -17,10 +17,10 @@ OverrideJavaLocation=true
 OverrideMemory=false
 OverrideNativeWorkarounds=false
 OverrideWindow=false
-JvmArgs=-XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+AlwaysActAsServerClassMachine -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseNUMA -XX:NmethodSweepActivity=1 -XX:ReservedCodeCacheSize=400M -XX:NonNMethodCodeHeapSize=12M -XX:ProfiledCodeHeapSize=194M -XX:NonProfiledCodeHeapSize=194M -XX:-DontCompileHugeMethods -XX:MaxNodeLimit=240000 -XX:NodeLimitFudgeFactor=8000 -XX:+UseVectorCmov -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority -XX:ThreadPriorityPolicy=1 -XX:AllocatePrefetchStyle=3 -XX:+UseZGC -XX:-ZProactive
+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
 iconKey=default
 lastLaunchTime=0
 lastTimePlayed=0
 name=[CleanroomMMC] GregTech Expert 2 MODPACKVERSION
-notes=This instance is built using Github Action.\nUsing installer artifact from commit: f8856412a24c1e0588518eac79b5ede8ab393cf4\nAction URL: https://github.com/CleanroomMC/Cleanroom/actions/runs/9012049921
+notes=This instance is built using Github Action.\nUsing installer artifact from commit: b5cfa24bd9a1f39b185d565b408e1876d82109e4\nAction URL: https://github.com/CleanroomMC/Cleanroom/actions/runs/9598223581
 totalTimePlayed=0
diff --git a/...0.2.1-alpha+build.1.run.573-universal.jar → ....2.2-alpha+build.13.run.651-universal.jar b/...0.2.1-alpha+build.1.run.573-universal.jar → ....2.2-alpha+build.13.run.651-universal.jar
diff --git a/cmmc/mmc-pack.json b/cmmc/mmc-pack.json
@@ -29,9 +29,9 @@
                     "uid": "net.minecraft"
                 }
             ],
-            "cachedVersion": "0.2.1-alpha+build.1.run.573",
+            "cachedVersion": "0.2.2-alpha+build.13.run.651",
             "uid": "net.minecraftforge",
-            "version": "0.2.1-alpha+build.1.run.573"
+            "version": "0.2.2-alpha+build.13.run.651"
         }
     ],
     "formatVersion": 1