Merge branch 'master' into 1.17

# Conflicts:
#	gradle.properties

gradle.properties

@@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=20w51a
-	yarn_mappings=20w51a+build.30
-	loader_version=0.11.0
+	minecraft_version=21w03a
+	yarn_mappings=21w03a+build.1
+	loader_version=0.11.1
 
 # Mod Properties
-	mod_version = 1.4.23
+	mod_version = 1.4.24
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 

src/main/java/carpet/CarpetSettings.java

@@ -37,7 +37,7 @@ import static carpet.settings.RuleCategory.CLIENT;
 @SuppressWarnings("CanBeFinal")
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.4.23+v210115";
+    public static final String carpetVersion = "1.4.24+v210120";
     public static final Logger LOG = LogManager.getLogger("carpet");
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;