Merge branch 'master' into future

# Conflicts:
#	gradle.properties

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	fabric_version=0.49.4+1.19
 
 # Mod Properties
-	mod_version = 1.4.68
+	mod_version = 1.4.69
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 
@@ -17,7 +17,7 @@ org.gradle.jvmargs=-Xmx1G
 	# The Curseforge versions "names" or ids for the main branch (comma separated: 1.16.4,1.16.5)
 	# This is needed because CF uses too vague names for prereleases and release candidates
 	# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]
-	release-curse-versions = 1.18-1.18.2
+	release-curse-versions = 1.18:1.18.2
 	# Whether or not to build another branch on release
 	release-extra-branch = true
 	# The name of the second branch to release

src/main/java/carpet/CarpetSettings.java

@@ -45,7 +45,7 @@ import static carpet.settings.RuleCategory.CLIENT;
 @SuppressWarnings("CanBeFinal")
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.4.68+v220324";
+    public static final String carpetVersion = "1.4.69+v220331";
     public static final Logger LOG = LoggerFactory.getLogger("carpet");
     public static ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
     public static ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);