Merge branch 'main' into backport

GTModpackTeam · Mar 17, 2024 · 8232384 · 8232384
2 parents 1e75033 + 1942b80
commit 8232384
Show file tree

Hide file tree

Showing 14 changed files with 1,236 additions and 41 deletions.
diff --git a/.github/workflows/preview-lwjgl3.yml b/.github/workflows/preview-lwjgl3.yml
@@ -70,7 +70,7 @@ jobs:
           zip -r ./GTExpert2-${{ env.VERSION }}-lwjgl3-${{ env.LWIGL3_VERSION }}-mmc.zip ./libraries/ ./patches/ ./mmc-pack.json ./instance.cfg .minecraft/
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           prerelease: true

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -76,7 +76,7 @@ jobs:
           zip -r ./GTExpert2-${{ env.VERSION }}-pr-${{ env.PR_VERSION }}-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
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           prerelease: true

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -98,7 +98,7 @@ jobs:
           zip -r ./${{ env.NAME }}-${{ env.FULL_VERSION }}-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
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: "${{ env.FULL_VERSION }}"
           draft: false

diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md
@@ -2,16 +2,16 @@
 ## Modpack information
 - Fix quests issues.
 
-# Revert mod
-- The One Probe Community Edition -> The One Probe
+## Downgrade mod
+- RoughlyEnoughIDs
 
 ## Update mod
-- Controlling
-- CraftPresence
-- Had Enough Items
-- Inventory Bogo Sorter
-- ModularUI
-- GregTech Food Option
+- Better Questing Unofficial
+- AE2 Fluid Crafting Rework
+- PackagedAuto
+- ConfigAnytime
+- VintageFix
+- JourneyMap
 - GTExpert-Core
 
 * * *

diff --git a/cmmc/instance.cfg b/cmmc/instance.cfg
@@ -13,5 +13,5 @@ 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: 7b9e4d2859a4970522955866d43f094f088cce02\nAction URL: https://github.com/CleanroomMC/Cleanroom/actions/runs/8038133347
+notes=This instance is built using Github Action.\nUsing installer artifact from commit: 45ed7e7f4eb566da65c375ee22cef2423de9a2d2\nAction URL: https://github.com/CleanroomMC/Cleanroom/actions/runs/8229431020
 totalTimePlayed=0
diff --git a/cmmc/libraries/cleanroom-15.24.0.3029-universal.jar b/cmmc/libraries/cleanroom-15.24.0.3029-universal.jar
diff --git a/cmmc/patches/net.minecraftforge.json b/cmmc/patches/net.minecraftforge.json
@@ -81,13 +81,13 @@
             }
         },
         {
-            "name": "com.cleanroommc:bouncepad:0.4.37-cursed",
+            "name": "com.cleanroommc:bouncepad:0.4.40-cursed",
             "downloads": {
                 "artifact": {
-                    "path": "com/cleanroommc/bouncepad/0.4.37-cursed/bouncepad-0.4.37-cursed.jar",
-                    "url": "https://maven.outlands.top/releases/com/cleanroommc/bouncepad/0.4.37-cursed/bouncepad-0.4.37-cursed.jar",
-                    "sha1": "5bd2516665af8f3f53ca7074ecd370e53ddefffc",
-                    "size": 28844
+                    "path": "com/cleanroommc/bouncepad/0.4.40-cursed/bouncepad-0.4.40-cursed.jar",
+                    "url": "https://maven.outlands.top/releases/com/cleanroommc/bouncepad/0.4.40-cursed/bouncepad-0.4.40-cursed.jar",
+                    "sha1": "d867f4d07dfe9f1b9edca3b607145eb23d0d5a47",
+                    "size": 28981
                 }
             }
         },

diff --git a/manifest.json b/manifest.json
@@ -336,7 +336,7 @@
     },
     {
       "projectID": 308380,
-      "fileID": 5148829,
+      "fileID": 5181918,
       "required": true
     },
     {
@@ -451,7 +451,7 @@
     },
     {
       "projectID": 629017,
-      "fileID": 5143492,
+      "fileID": 4949840,
       "required": true
     },
     {
@@ -461,7 +461,7 @@
     },
     {
       "projectID": 32274,
-      "fileID": 2916002,
+      "fileID": 5172461,
       "required": true
     },
     {
@@ -491,7 +491,7 @@
     },
     {
       "projectID": 871198,
-      "fileID": 5010926,
+      "fileID": 5175094,
       "required": true
     },
     {
@@ -511,7 +511,7 @@
     },
     {
       "projectID": 623955,
-      "fileID": 5122358,
+      "fileID": 5186082,
       "required": true
     },
     {
@@ -576,7 +576,7 @@
     },
     {
       "projectID": 851103,
-      "fileID": 5166757,
+      "fileID": 5188508,
       "required": true
     },
     {
@@ -601,7 +601,7 @@
     },
     {
       "projectID": 870276,
-      "fileID": 5069845,
+      "fileID": 5169620,
       "required": true
     },
     {

diff --git a/modlist.html b/modlist.html
@@ -22,7 +22,7 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/fps-reducer">FPS Reducer (by bre2el)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/p455w0rds-library">p455w0rd's Library (by TheRealp455w0rd)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/bisecthosting-server-integration-menu-forge">BisectHosting Server Integration Menu [FORGE] (by BisectHosting)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/the-one-probe-community-edition">The One Probe Community Edition (by xuanyu)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/the-one-probe">The One Probe (by McJty)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/realbench-nomi-ceu">RealBench: Nomi-CEu-Edition (by IntegerLimit_)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-ultimine-forge">FTB Ultimine (Forge) (by FTB)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/dank-null-no_rce">/dank/null/no_RCE/ (by jbredwards)</a></li>

diff --git a/overrides/config/Universal Tweaks - Bugfixes.cfg b/overrides/config/Universal Tweaks - Bugfixes.cfg
@@ -36,7 +36,7 @@ general {
         B:"Piston Retraction"=false
 
         # Fixes sleeping always resetting rain and thunder times
-        B:"Sleep Resets Weather"=true
+        B:"Sleep Resets Weather"=false
 
         "block overlay" {
             # Fixes x-ray when standing in non-suffocating blocks
@@ -175,7 +175,7 @@ general {
         # Increases the packet size limit to account for large packets in modded environments
         # Vanilla default is 0x200000
         # Incompatible with SpongeForge and RandomPatches
-        I:"Packet Size"=2147483647
+        I:"Packet Size"=0x2147483647
 
         # Fixes various particle types not showing up on the client
         B:"Particle Spawning"=true

diff --git a/overrides/config/Universal Tweaks - Tweaks.cfg b/overrides/config/Universal Tweaks - Tweaks.cfg
@@ -209,7 +209,7 @@ general {
         B:"Mob Despawn Improvement"=true
 
         # Prevents zombie pigmen spawning from nether portals
-        B:"No Portal Spawning"=false
+        B:"No Portal Spawning"=true
 
         # Stops horses wandering around when saddled
         B:"No Saddled Wandering"=true