Merge branch 'master' into 1.16

src/main/java/carpet/mixins/ServerChunkManagerMixin.java

@@ -35,7 +35,7 @@ public abstract class ServerChunkManagerMixin implements ServerChunkManagerInter
     @Shadow @Final private ChunkTicketManager ticketManager;
 
     @Override // shared between scarpet and spawnChunks setting
-    public ChunkTicketManager getTicketManager()
+    public ChunkTicketManager getCMTicketManager()
     {
         return ticketManager;
     }