Merge branch 'master' into 1.15

# Conflicts:
#	gradle.properties

gradle.properties

@@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=1.15-pre2
-	yarn_mappings=1.15-pre2+build.1
+	yarn_mappings=1.15-pre2+build.4
-	loader_version=0.7.1+build.173
+	loader_version=0.7.2+build.174
 
 # Mod Properties
 	mod_version = 1.2.4+v191121