Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
This commit is contained in:
gnembon committed 2020-07-01 14:54:04 -03:00
commit c69f65e68e
8 files changed
+48 -8

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.4.0+v200623
mod_version = 1.4.1+v200701
maven_group = carpet
archives_base_name = fabric-carpet