Merge branch 'refs/heads/main' into 1.21

# Conflicts:
#	gradle.properties
#	src/main/resources/fabric.mod.json

.github/workflows/publish.yml

@@ -1,4 +1,3 @@
-# https://wiki.fabricmc.net/zh_cn:tutorial:publishing_mods_using_github_actions
 name: publish
 on: [workflow_dispatch]
 
@@ -14,9 +13,10 @@ jobs:
         with:
           submodules: true
       - name: setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: 21
+          distribution: 'microsoft'
       - name: exe
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
@@ -31,5 +31,4 @@ jobs:
           github-token: ${{ secrets.GAYHUB_TOKEN }}
           github-commitish: 1.21
 
-          version-type: beta
-          loaders: ["fabric", "quilt"]
+          version-type: beta

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.modrinth.minotaur' version '2.+'
 }

gradle/wrapper/gradle-wrapper.properties

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

src/main/resources/fabric.mod.json

@@ -35,11 +35,16 @@
 	],
 	"depends": {
 		"fabricloader": "*",
-		"minecraft": ">=1.21- <1.21.2-",
+		"minecraft": ">1.20.6 <1.21.2",
 		"java": ">=21",
 		"fabric-api": "*"
 	},
 	"suggests": {
 		"another-mod": "*"
+	},
+	"custom": {
+		"mc-publish": {
+			"loaders": ["fabric", "quilt"]
+		}
 	}
 }