Merge branch 'main' into backport

CHANGELOG_v2.md

@@ -16,6 +16,7 @@
 - CraftPresence
 - GTExpert-Core
 - Had Enough Items
+- Modern Splash
 - OpenComputers
 - PackagedAuto
 - RoughlyEnoughIDs
@@ -74,6 +75,7 @@
 ## Modpack information
 - This is a backport including 2.7.2 mod updates and updates that do not break the environment as 2.6.11.
 - 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
@@ -90,6 +92,7 @@
 - CraftPresence
 - GTExpert-Core
 - Had Enough Items
+- Modern Splash
 - OpenComputers
 - PackagedAuto
 - RoughlyEnoughIDs

buildtools/mod-install.py

@@ -6,7 +6,6 @@
 import os
 import shutil
 import requests
-import time
 from concurrent.futures import ThreadPoolExecutor
 
 ## Initialize

cmmc/README.md

@@ -13,11 +13,13 @@
 5. Get the mods you need from the list below.
 6. Put the downloaded mods in the `mods` folder of the instance.
 7. Set java version to 21.
-8. Set Java Arguments to `-XX:+UseZGC -XX:+ZGenerational` in the instance settings.
-9. Resolve any mod conflicts that may occur.
-10. Run the instance and enjoy the game!
+8. Resolve any mod conflicts that may occur.
+9. Run the instance and enjoy the game!
 
 
 ## Self download mods
-- [Fugue](https://github.com/CleanroomMC/Fugue/releases) by CleanroomMC
+- [Fugue](https://github.com/CleanroomMC/Fugue/releases/tag/0.5.4) by CleanroomMC
+
+## Optional mods
 - [Vintagium](https://github.com/Asek3/sodium-1.12/actions) by Asek3
+    - [CEu patch is temporarily included](https://github.com/GregTechCEu/GregTech/pull/2463)

cmmc/instance.cfg

@@ -9,9 +9,18 @@ ManagedPackName=
 ManagedPackType=
 ManagedPackVersionID=
 ManagedPackVersionName=
+OverrideCommands=false
+OverrideConsole=false
+OverrideGameTime=false
+OverrideJavaArgs=true
+OverrideJavaLocation=true
+OverrideMemory=false
+OverrideNativeWorkarounds=false
+OverrideWindow=false
+JvmArgs=-XX:+UseZGC -XX:+ZGenerational
 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: 7685ce9679aa2b8b327ceb27dd1e451ff90a81a6\nAction URL: https://github.com/CleanroomMC/Cleanroom/actions/runs/8669970544
+notes=This instance is built using Github Action.\nUsing installer artifact from commit: dcbc7351c123721d9b63dea7730789af56959fc4\nAction URL: https://github.com/CleanroomMC/Cleanroom/actions/runs/8872740930
 totalTimePlayed=0

cmmc/patches/net.minecraft.json

@@ -7,11 +7,8 @@
         "url": "https://piston-meta.mojang.com/v1/packages/a21e1ded1a24ea1548dd8db0cf30b6acb02655a9/1.12.json"
     },
     "compatibleJavaMajors": [
-        11,
-        17,
-        19,
-        20,
-        21
+        21,
+        22
     ],
     "formatVersion": 1,
     "libraries": [

cmmc/patches/net.minecraftforge.json

@@ -92,13 +92,13 @@
             }
         },
         {
-            "name": "com.ibm.icu:icu4j:74.2",
+            "name": "com.ibm.icu:icu4j:75.1",
             "downloads": {
                 "artifact": {
-                    "path": "com/ibm/icu/icu4j/74.2/icu4j-74.2.jar",
-                    "url": "https://maven.minecraftforge.net/com/ibm/icu/icu4j/74.2/icu4j-74.2.jar",
-                    "sha1": "97222d018f7f43cae88cacd1fad39717b001ffc4",
-                    "size": 14311564
+                    "path": "com/ibm/icu/icu4j/75.1/icu4j-75.1.jar",
+                    "url": "https://maven.minecraftforge.net/com/ibm/icu/icu4j/75.1/icu4j-75.1.jar",
+                    "sha1": "e8f8dcc2967f5ec2cfae185172293adfa5599b78",
+                    "size": 14312248
                 }
             }
         },

instance.cfg

@@ -1,4 +1,10 @@
 InstanceType=OneSix
+ManagedPack=false
+ManagedPackID=
+ManagedPackName=
+ManagedPackType=
+ManagedPackVersionID=
+ManagedPackVersionName=
 JoinServerOnLaunch=false
 OverrideCommands=false
 OverrideConsole=false

manifest.json

@@ -161,7 +161,7 @@
     },
     {
       "projectID": 297038,
-      "fileID": 5268094,
+      "fileID": 5290565,
       "required": true
     },
     {
@@ -186,12 +186,12 @@
     },
     {
       "projectID": 876284,
-      "fileID": 5256657,
+      "fileID": 5275734,
       "required": true
     },
     {
       "projectID": 223008,
-      "fileID": 5268074,
+      "fileID": 5274236,
       "required": true
     },
     {
@@ -336,7 +336,7 @@
     },
     {
       "projectID": 308380,
-      "fileID": 5272321,
+      "fileID": 5279432,
       "required": true
     },
     {
@@ -511,7 +511,7 @@
     },
     {
       "projectID": 623955,
-      "fileID": 5255932,
+      "fileID": 5278333,
       "required": true
     },
     {
@@ -561,7 +561,7 @@
     },
     {
       "projectID": 629058,
-      "fileID": 4718724,
+      "fileID": 5282442,
       "required": true
     },
     {
@@ -576,7 +576,7 @@
     },
     {
       "projectID": 851103,
-      "fileID": 5237216,
+      "fileID": 5283887,
       "required": true
     },
     {

overrides/config/AdvancedBackups.properties

@@ -1,11 +1,16 @@
 #Enable or disable automatic backups.
-#Options : true, false   #Default : true,
+#Options : true, false   #Default : true
 config.advancedbackups.enabled=true
 
 #Whether to save before making a backup.
 #Options : true, false    #Default : true
 config.advancedbackups.save=true
 
+#Buffer size, in bytes, to use when reading / writing files. Higher will improve speeds, but increase memory usage.
+#Too high can cause an OOM. I'd advise against editing this unless you experience issues.
+#Range : 1-2147483647     #Default : 1048576
+config.advancedbackups.buffer=1048576
+
 #Whether to flush when making the aforementioned save. Can cause a lag spike, and is usually not required.
 #Unused prior to minecraft 1.16.
 #Options : true, false    #Default : false
@@ -19,12 +24,17 @@ config.advancedbackups.activity=true
 #Options : zip, differential, incremental    #Default : differential
 config.advancedbackups.type=zip
 
+#A list of files, relative paths within the world directory, to skip backing up.
+#Default : empty.
+config.advancedbackups.blacklist=session.lock
+
 #The absolute or relative path to the backup location.
 #Options : any file path. Default : ./backups
 config.advancedbackups.path=./backups
 
 #Minimum time between backups, in hours. This can prevent a shutdown backup from triggering immediately after a scheduled backup or similar situations.
-#Range : 0.25 - 500    #Default : 0.5
+#5 minutes = ~ 0.083 hours.
+#Range : 0.08 - 500    #Default : 0.5
 config.advancedbackups.frequency.min=0.5
 
 #Triggers a backup if none has already happened within this time. Can be combined with an uptime-based schedule.

overrides/config/aeadditions.cfg

@@ -204,7 +204,7 @@ integration {
     B:enableopencomputers=true
 
     # Enable Thaumatic Energistics Integration.
-    B:enablethaumicenergistics=false
+    B:enablethaumicenergistics=true
 
     # Enable waila Integration.
     B:enablewaila=true