Merge branch 'master' into 1.16

# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
This commit is contained in:
gnembon committed 2020-06-05 16:57:50 -03:00
commit 8925756bf4
3 files changed
+3 -3

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.26+v200605";
public static final String carpetVersion = "1.3.27+v200605";
public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;