Merge branch 'master' into tracing_functions

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=1.14.4-pre6
-	yarn_mappings=1.14.4-pre6+build.2
+	minecraft_version=1.14.4-pre7
+	yarn_mappings=1.14.4-pre7+build.1
 	loader_version=0.4.8+build.155
 
 # Mod Properties