Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
This commit is contained in:
gnembon committed 2021-03-18 00:52:13 -03:00
commit e795a38b17
6 files changed
+20 -10

No files matched your search

+1 -1
View File
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
fabric_version=0.32.2+1.17
# Mod Properties
mod_version = 1.4.29
mod_version = 1.4.30
maven_group = carpet
archives_base_name = fabric-carpet