Merge branch 'master' into 1.16

# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
#	src/main/resources/fabric.mod.json

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.8.2+build.194
 
 # Mod Properties
-	mod_version = 1.3.19b+v200415
+	mod_version = 1.3.20+v200422
 	maven_group = carpet
 	archives_base_name = fabric-carpet