Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-12-12 23:45:08 -04:00
commit ff0140309e
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.7.2+build.174 loader_version=0.7.2+build.174
# Mod Properties # Mod Properties
mod_version = 1.3.1+v191210 mod_version = 1.3.1+v191212
maven_group = carpet maven_group = carpet
archives_base_name = fabric-carpet archives_base_name = fabric-carpet
+1 -1
View File
@@ -31,7 +31,7 @@ import static carpet.settings.RuleCategory.DISPENSER;
public class CarpetSettings public class CarpetSettings
{ {
public static final String carpetVersion = "1.3.1+v191210"; public static final String carpetVersion = "1.3.1+v191212";
public static final Logger LOG = LogManager.getLogger(); public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false; public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false; public static boolean impendingFillSkipUpdates = false;