Merge branch '1.21.8' into 1.21.10

Author: rfresh2

.github/workflows/1.21.10.yml

@@ -22,7 +22,7 @@ jobs:
         distribution: 'temurin'
 
     - name: Loom Cache
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: "**/.gradle/loom-cache"
         key: "${{ env.MINECRAFT_VERSION }}-loom-${{ hashFiles('settings.gradle.kts', 'gradle.properties', '**/gradle-wrapper.properties', 'buildSrc/build.gradle.kts', 'buildSrc/**/*.gradle.kts', '**/*.accesswidener') }}"

.github/workflows/release.yml

@@ -64,7 +64,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Loom Cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
         with:
           path: "**/.gradle/loom-cache"
           key: "${{ env.MINECRAFT_VERSION }}-loom-${{ hashFiles('settings.gradle.kts', 'gradle.properties', '**/gradle-wrapper.properties', 'buildSrc/build.gradle.kts', 'buildSrc/**/*.gradle.kts', '**/*.accesswidener') }}"

buildSrc/build.gradle.kts

@@ -14,6 +14,6 @@ repositories {
 dependencies {
     implementation("dev.architectury:architectury-loom:1.17.+")
     implementation("architectury-plugin:architectury-plugin.gradle.plugin:3.5.+")
-    implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.2")
+    implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.3")
 }
 

common/src/main/java/xaeroplus/feature/db/DatabaseMigrator.java

@@ -132,7 +132,7 @@ private void executeConcurrencyLimited(
         final String operation,
         final SqlOperation sqlOperation
     ) throws SQLException, InterruptedException {
-        var permitAcquired = HEAVY_OPERATION_PERMITS.tryAcquire(1, TimeUnit.HOURS);
+        var permitAcquired = HEAVY_OPERATION_PERMITS.tryAcquire(48, TimeUnit.HOURS);
         if (!permitAcquired) {
             throw new RuntimeException("Failed to acquire permit for database " + operation + ": " + databaseName);
         }

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.parallel=false
 enabled_platforms=fabric,neoforge
 loom.ignoreDependencyLoomVersionValidation=true
 
-mod_version=2.33.0
+mod_version=2.33.1
 
 minecraft_version=1.21.10