Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/resources/assets/carpet/scripts/ai_tracker.sc
This commit is contained in:
gnembon committed 2021-04-17 01:37:40 -03:00
commit 8f2c935fe6
6 files changed
+96 -98

No files matched your search

+1
View File
@@ -220,6 +220,7 @@
"DebugRenderer_scarpetRenderMixin",
"WorldRenderer_scarpetRenderMixin",
"BiomeArray_cleanLogsMixin",
"SoundEngineInt_cleanLogsMixin",
"SoundSystem_cleanLogsMixin"
],