Merge branch 'master' into architectury-test (mc1.21.1 support)

# Conflicts:
#	build.gradle
#	gradle.properties
#	settings.json
#	versions/1.21-fabric/gradle.properties
#	versions/1.21.1/gradle.properties
#	versions/1.21/gradle.properties

build.gradle

@@ -19,18 +19,18 @@ preprocess {
 	def mc118_fabric = createNode('1.18.2-fabric', 1_18_02, '')
 	def mc119_fabric = createNode('1.19.4-fabric', 1_19_04, '')
 	def mc120_fabric = createNode('1.20.6-fabric', 1_20_06, '')
-	def mc121_fabric = createNode('1.21-fabric'  , 1_21_00, '')
+	def mc121_fabric = createNode('1.21.1-fabric', 1_21_01, '')
 
 	def mc115_forge = createNode('1.15.2-forge' , 1_15_02, '')
 	def mc116_forge = createNode('1.16.5-forge' , 1_16_05, '')
 	def mc117_forge = createNode('1.17.1-forge' , 1_17_01, '')
 	def mc118_forge = createNode('1.18.2-forge' , 1_18_02, '')
 	def mc119_forge = createNode('1.19.4-forge' , 1_19_04, '')
 	def mc120_forge = createNode('1.20.6-forge' , 1_20_06, '')
-	def mc121_forge = createNode('1.21-forge'   , 1_21_00, '')
+	def mc121_forge = createNode('1.21.1-forge' , 1_21_01, '')
 
 	def mc120_neoforge = createNode('1.20.6-neoforge', 1_20_06, '')
-	def mc121_neoforge = createNode('1.21-neoforge'  , 1_21_00, '')
+	def mc121_neoforge = createNode('1.21.1-neoforge', 1_21_01, '')
 
 	mc114_fabric.link(mc115_fabric, null)
 	mc115_fabric.link(mc116_fabric, null)

settings.json

@@ -7,17 +7,17 @@
     "1.18.2-fabric",
     "1.19.4-fabric",
     "1.20.6-fabric",
-    "1.21-fabric",
+    "1.21.1-fabric",
 
     "1.15.2-forge",
     "1.16.5-forge",
     "1.17.1-forge",
     "1.18.2-forge",
     "1.19.4-forge",
     "1.20.6-forge",
-    "1.21-forge",
+    "1.21.1-forge",
 
     "1.20.6-neoforge",
-    "1.21-neoforge"
+    "1.21.1-neoforge"
   ]
 }

versions/1.14.4-fabric/gradle.properties

@@ -6,7 +6,7 @@
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.15.11
+	fabric_loader_version=0.16.2
 	minecraft_dependency=1.14.x
 
 # Build Information

versions/1.15.2-fabric/gradle.properties

@@ -6,7 +6,7 @@
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.15.11
+	fabric_loader_version=0.16.2
 	minecraft_dependency=1.15.x
 
 # Build Information

versions/1.16.5-fabric/gradle.properties

@@ -6,7 +6,7 @@
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.15.11
+	fabric_loader_version=0.16.2
 	minecraft_dependency=1.16.x
 
 # Build Information

versions/1.17.1-fabric/gradle.properties

@@ -6,7 +6,7 @@
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.15.11
+	fabric_loader_version=0.16.2
 	minecraft_dependency=1.17.x
 
 # Build Information

versions/1.18.2-fabric/gradle.properties

@@ -6,7 +6,7 @@
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.15.11
+	fabric_loader_version=0.16.2
 	minecraft_dependency=1.18.x
 
 # Build Information

versions/1.19.4-fabric/gradle.properties

@@ -6,7 +6,7 @@
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.15.11
+	fabric_loader_version=0.16.2
 	minecraft_dependency=1.19.x
 
 # Build Information

versions/1.20.6-fabric/gradle.properties

@@ -6,7 +6,7 @@
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.15.11
+	fabric_loader_version=0.16.2
 	minecraft_dependency=>=1.20.5 <=1.20.6
 
 # Build Information

versions/1.21-fabric/gradle.properties → versions/1.21.1-fabric/gradle.properties

@@ -1,17 +1,17 @@
 # Loom Properties
-	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21
-	minecraft_version=1.21
-	yarn_mappings=1.21+build.7
+	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.1
+	minecraft_version=1.21.1
+	yarn_mappings=1.21.1+build.3
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.15.11
+	fabric_loader_version=0.16.2
 	minecraft_dependency=1.21
 
 # Build Information
 	# The target mc versions for the mod during mod publishing, separated with \n
-	game_versions=1.21
+	game_versions=1.21\n1.21.1
 
 # Dependencies
-	# fabric_api_version=0.100.4+1.21
+	# fabric_api_version=0.102.1+1.21.1

versions/1.21-forge/gradle.properties → versions/1.21.1-forge/gradle.properties

@@ -1,14 +1,14 @@
 # Loom Properties
-	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21
-	minecraft_version=1.21
-	yarn_mappings=1.21+build.7
+	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.1
+	minecraft_version=1.21.1
+	yarn_mappings=1.21.1+build.3
 	loom.platform=forge
 
 # Mod Metadata
-	# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.21.html
-	forge_version=51.0.33
-	minecraft_dependency=[1.21]
+	# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.21.1.html
+	forge_version=52.0.4
+	minecraft_dependency=[1.21, 1.21.1]
 
 # Build Information
 	# The target mc versions for the mod during mod publishing, separated with \n
-	game_versions=1.21
+	game_versions=1.21\n1.21.1

versions/1.21-neoforge/gradle.properties → versions/1.21.1-neoforge/gradle.properties

@@ -1,16 +1,16 @@
 # Loom Properties
-	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21
-	minecraft_version=1.21
-	yarn_mappings=1.21+build.7
+	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.1
+	minecraft_version=1.21.1
+	yarn_mappings=1.21.1+build.3
 	loom.platform=neoforge
 	# https://maven.architectury.dev/dev/architectury/yarn-mappings-patch-neoforge/
 	yarn_mappings_patch=1.21+build.4
 
 # Mod Metadata
 	# https://projects.neoforged.net/neoforged/neoforge
-	neoforge_version=21.0.43-beta
-	minecraft_dependency=[1.21]
+	neoforge_version=21.1.16
+	minecraft_dependency=[1.21, 1.21.1]
 
 # Build Information
 	# The target mc versions for the mod during mod publishing, separated with \n
-	game_versions=1.21
+	game_versions=1.21\n1.21.1