icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.15

Browse Source 
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/settings/CarpetSettings.java
This commit is contained in:
gnembon committed 2019-08-28 21:38:32 -03:00
2 parents 628a350ea1 ef1a400c05
commit 3a86f1e81c
3 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+1 -1
View File
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.6.1+build.164 loader_version=0.6.1+build.164
# Mod Properties # Mod Properties
mod_version = 1.0.4+v190823_115 mod_version = 1.0.5+v190828
maven_group = carpet maven_group = carpet
archives_base_name = fabric-carpet archives_base_name = fabric-carpet
src/main/java/carpet/settings/CarpetSettings.java
+1 -1
View File
@@ -27,7 +27,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
public class CarpetSettings public class CarpetSettings
{ {
public static final String carpetVersion = "1.0.4-v190823_115"; public static final String carpetVersion = "1.0.5-v190828";
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;
src/main/resources/fabric.mod.json
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"schemaVersion": 1, "schemaVersion": 1,
"id": "carpet", "id": "carpet",
"version": "1.0.4", "version": "1.0.5",
"name": "Carpet Mod in Fabric", "name": "Carpet Mod in Fabric",
"description": "Carpet made out of fabric", "description": "Carpet made out of fabric",