Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-10-08 09:19:42 -03:00
commit 3f1fd42c4e
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.6.2+build.166 loader_version=0.6.2+build.166
# Mod Properties # Mod Properties
mod_version = 1.1.1+v191002 mod_version = 1.1.1+v191008
maven_group = carpet maven_group = carpet
archives_base_name = fabric-carpet archives_base_name = fabric-carpet
@@ -27,7 +27,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
public class CarpetSettings public class CarpetSettings
{ {
public static final String carpetVersion = "1.1.1+v191002"; public static final String carpetVersion = "1.1.1+v191008";
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;