Merge branch 'master' into 1.15

# Conflicts:
#	gradle.properties
#	src/main/java/carpet/settings/CarpetSettings.java

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.6.1+build.165
 
 # Mod Properties
-	mod_version = 1.0.6+v190905-2
+	mod_version = 1.0.7+v190911
 	maven_group = carpet
 	archives_base_name = fabric-carpet