Merge remote-tracking branch 'refs/remotes/origin/version/1.21.10' into pre/development

TheBjoRedCraft · TheBjoRedCraft · commit 8bfd9ec78053 · 2025-12-20T20:00:50.000+01:00
# Conflicts:
#	gradle.properties
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
         maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }
     }
     dependencies {
-        classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.7+")
+        classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.10+")
     }
 }
 
@@ -19,7 +19,7 @@ subprojects {
     afterEvaluate {
         plugins.withType<PublishingPlugin> {
             configure<PublishingExtension> {
-                repositories{
+                repositories {
                     slneReleases()
                 }
             }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=1.21.7-1.5.2-SNAPSHOT
+version=1.21.10-1.5.0-SNAPSHOT

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.7+")`
	`9`	`+ classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.10+")`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`@@ -19,7 +19,7 @@ subprojects {`
`19`	`19`	`afterEvaluate {`
`20`	`20`	`plugins.withType<PublishingPlugin> {`
`21`	`21`	`configure<PublishingExtension> {`
`22`		`- repositories{`
	`22`	`+ repositories {`
`23`	`23`	`slneReleases()`
`24`	`24`	`}`
`25`	`25`	`}`