Merge branch 'master' into 1.16

# Conflicts:
#	gradle.properties

src/main/java/carpet/CarpetSettings.java

@@ -35,7 +35,7 @@ import static carpet.settings.RuleCategory.CLIENT;
 @SuppressWarnings("CanBeFinal")
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.3.32+v200617";
+    public static final String carpetVersion = "1.3.33+v200621";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;