Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-02-26 13:44:01 -04:00
commit 37e72cbf46
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.7.8+build.184
# Mod Properties
mod_version = 1.3.11+v200221
mod_version = 1.3.12+v200226
maven_group = carpet
archives_base_name = fabric-carpet
+1 -1
View File
@@ -32,7 +32,7 @@ import static carpet.settings.RuleCategory.DISPENSER;
@SuppressWarnings("CanBeFinal")
public class CarpetSettings
{
public static final String carpetVersion = "1.3.11+v200221";
public static final String carpetVersion = "1.3.12+v200226";
public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;
+1 -1
View File
@@ -1,7 +1,7 @@
{
"schemaVersion": 1,
"id": "carpet",
"version": "1.3.11",
"version": "1.3.12",
"name": "Carpet Mod in Fabric",
"description": "Carpet made out of fabric",