Merge branch 'master' into 1.17

# Conflicts:
#	gradle.properties

gradle.properties

@@ -6,10 +6,10 @@ org.gradle.jvmargs=-Xmx1G
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=20w51a
 	yarn_mappings=20w51a+build.1
-	loader_version=0.10.8
+	loader_version=0.11.0
 
 # Mod Properties
-	mod_version = 1.4.21
+	mod_version = 1.4.22
 	maven_group = carpet
 	archives_base_name = fabric-carpet