Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.6.3+build.167
 
 # Mod Properties
-	mod_version = 1.1.2+v191009
+	mod_version = 1.1.3+v191016
 	maven_group = carpet
 	archives_base_name = fabric-carpet