Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java
This commit is contained in:
gnembon committed 2020-11-06 00:25:36 -04:00
commit f306da7cc2
6 files changed
+5 -58

No files matched your search

+1 -1
View File
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.10.6+build.214
# Mod Properties
mod_version = 1.4.15+v201102
mod_version = 1.4.16+v201105
maven_group = carpet
archives_base_name = fabric-carpet