Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-06-23 11:27:00 -03:00
commit a9c6e46c59
5 files changed
+22 -20

No files matched your search

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