Merge remote-tracking branch 'upstream/master'

Author: cev-api

.github/workflows/gradle.yml

@@ -90,12 +90,12 @@ jobs:
     - name: Run client gametests
       env:
         IMGUR_CLIENT_ID: ${{ secrets.IMGUR_CLIENT_ID }}
-      run: xvfb-run --auto-servernum ./gradlew runClientGameTest --stacktrace --warning-mode=fail
+      run: ./gradlew runClientGameTest --stacktrace --warning-mode=fail
 
     - name: Run client gametests with mods
       env:
         IMGUR_CLIENT_ID: ${{ secrets.IMGUR_CLIENT_ID }}
-      run: xvfb-run --auto-servernum ./gradlew runClientGameTestWithMods --stacktrace --warning-mode=fail
+      run: ./gradlew runClientGameTestWithMods --stacktrace --warning-mode=fail
 
     - name: Upload screenshots
       uses: actions/upload-artifact@v5

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.configuration-cache=true
 minecraft_version=1.21.10
 yarn_mappings=1.21.10+build.2
 loader_version=0.18.1
-loom_version=1.13-SNAPSHOT
+loom_version=1.14-SNAPSHOT
 
 # Fabric API
 fabric_version=0.138.3+1.21.10

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -240,6 +240,7 @@ private boolean isBuiltInWurstResourcePack(Resource resource)
 
 		String id = knownPack.id();
 		return "wurst".equals(id) || "wurst_testmod".equals(id)
+			|| "vanilla".equals(id)
 			|| "nicewurst".equals(id);
 	}