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

Merge branch 'master' into 1.17

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
gnembon committed 2021-01-20 22:55:10 -04:00
2 parents 981dcf6eaa 42ea68e740
commit 1ee0301504
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+4 -4
View File
@@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
# or better: https://modmuss50.me/fabric.html # or better: https://modmuss50.me/fabric.html
minecraft_version=20w51a minecraft_version=21w03a
yarn_mappings=20w51a+build.30 yarn_mappings=21w03a+build.1
loader_version=0.11.0 loader_version=0.11.1
# Mod Properties # Mod Properties
mod_version = 1.4.23 mod_version = 1.4.24
maven_group = carpet maven_group = carpet
archives_base_name = fabric-carpet archives_base_name = fabric-carpet
src/main/java/carpet/CarpetSettings.java
+1 -1
View File
@@ -37,7 +37,7 @@ import static carpet.settings.RuleCategory.CLIENT;
@SuppressWarnings("CanBeFinal") @SuppressWarnings("CanBeFinal")
public class CarpetSettings public class CarpetSettings
{ {
public static final String carpetVersion = "1.4.23+v210115"; public static final String carpetVersion = "1.4.24+v210120";
public static final Logger LOG = LogManager.getLogger("carpet"); public static final Logger LOG = LogManager.getLogger("carpet");
public static boolean skipGenerationChecks = false; public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false; public static boolean impendingFillSkipUpdates = false;