Merge branch 'master' into ver/1.21.9

Bram1903 · Bram1903 · commit 012529308fdb · 2026-01-22T10:27:51.000+01:00
# Conflicts:
#	build.gradle.kts
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,3 @@
-import java.io.ByteArrayOutputStream
-
 val fullVersion = "3.1.0"
 val snapshot = true
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import java.io.ByteArrayOutputStream`
`2`		`-`
`3`	`1`	`val fullVersion = "3.1.0"`
`4`	`2`	`val snapshot = true`
`5`	`3`