Merge branch 'master' into 1.16

# Conflicts:
#	gradle.properties
This commit is contained in:
gnembon committed 2020-06-21 23:19:49 -03:00
commit f23312c0fc
5 files changed
+156 -4

No files matched your search

+1 -1
View File
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.8.8+build.202
# Mod Properties
mod_version = 1.3.32+v200617
mod_version = 1.3.33+v200621
maven_group = carpet
archives_base_name = fabric-carpet