Merge branch 'master' into 1.16

# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
This commit is contained in:
gnembon committed 2020-06-05 16:57:50 -03:00
commit 8925756bf4
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.8.7+build.201
# Mod Properties
mod_version = 1.3.26+v200605
mod_version = 1.3.27+v200605
maven_group = carpet
archives_base_name = fabric-carpet