Merge branch 'master' into 1.17

# Conflicts:
#	gradle.properties
This commit is contained in:
gnembon committed 2021-01-15 11:41:07 -04:00
commit 981dcf6eaa
6 files changed
+21 -7

No files matched your search

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