Merge remote-tracking branch 'origin/1.21.4' into 1.21

# Conflicts:
#	gradle/libs.versions.toml

gradle/libs.versions.toml

@@ -4,10 +4,10 @@ parchment = "2024.11.17"
 
 fabric_loom = "1.9.2"
 fabric_loader = "0.16.9"
-moddevgradle = "2.0.54-beta"
-neoforge = "21.1.84"
+moddevgradle = "2.0.72"
+neoforge = "21.1.93"
 
-fabric_api = "0.110.0+1.21.1"
+fabric_api = "0.114.0+1.21.1"
 wrench_wrapper = "0.6.1"
 
 modmenu = "11.0.3"

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

norge/build.gradle

@@ -25,12 +25,11 @@ processResources {
 }
 
 neoForge {
-	version = libs.versions.neoforge
+	version = libs.versions.neoforge.get()
 
-	// TODO - Just use the MC version as-is once Parchment finally catches up
 	parchment {
-		minecraftVersion.set('1.21.1')
-		mappingsVersion.set(libs.versions.parchment.get())
+		minecraftVersion = libs.versions.minecraft.get()
+		mappingsVersion = libs.versions.parchment.get()
 	}
 
 	runs {