Merge remote-tracking branch 'upstream/master' into feature-1.20.2

Hendrix-Shen · Hendrix-Shen · commit 347477afa944 · 2023-10-28T09:32:23.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("fabric-loom").version("1.4-SNAPSHOT").apply(false)
     id("com.replaymod.preprocess").version("SNAPSHOT")
-    id("org.ajoberstar.grgit").version("5.2.0")
+    id("org.ajoberstar.grgit").version("5.2.1")
     id("net.kyori.blossom").version("1.3.1").apply(false)
 }
 
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-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("fabric-loom").version("1.4-SNAPSHOT").apply(false)`
`3`	`3`	`id("com.replaymod.preprocess").version("SNAPSHOT")`
`4`		`- id("org.ajoberstar.grgit").version("5.2.0")`
	`4`	`+ id("org.ajoberstar.grgit").version("5.2.1")`
`5`	`5`	`id("net.kyori.blossom").version("1.3.1").apply(false)`
`6`	`6`	`}`
`7`	`7`