Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2021-05-12 17:07:13 -03:00
commit 7ed96e22f1
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -42,7 +42,7 @@ import static carpet.settings.RuleCategory.CLIENT;
@SuppressWarnings("CanBeFinal")
public class CarpetSettings
{
public static final String carpetVersion = "1.4.35+v210505";
public static final String carpetVersion = "1.4.36+v210512";
public static final Logger LOG = LogManager.getLogger("carpet");
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;