Merge branch 'master' into future

# Conflicts:
#	src/main/java/carpet/settings/SettingsManager.java
This commit is contained in:
gnembon committed 2021-11-17 20:49:05 +01:00
commit 4cdb1bae28
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
fabric_version=0.42.6+1.18
# Mod Properties
mod_version = 1.4.53
mod_version = 1.4.54
maven_group = carpet
archives_base_name = fabric-carpet