Merge branch 'master' into 1.16

# Conflicts:
#	gradle.properties

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=20w12a
 	yarn_mappings=20w12a+build.3
-	loader_version=0.7.8+build.187
+	loader_version=0.7.8+build.188
 
 # Mod Properties
 	mod_version = 1.3.15+v200318