Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/script/bundled/Module.java
This commit is contained in:
gnembon committed 2020-04-15 02:00:31 -03:00
commit a757c6f88a
15 files changed
+219 -64

No files matched your search

+1
View File
@@ -25,6 +25,7 @@
"ServerWorld_tickMixin",
"ServerChunkManager_tickMixin",
"ThreadedAnvilChunkStorage_tickMixin",
"ChunkTicketManager_tickMixin",
"ThreadedAnvilChunkStorage_scarpetChunkCreationMixin",
"ChunkHolder_scarpetChunkCreationMixin",