Merge branch 'master' into 1.16

src/main/java/carpet/fakes/ItemEntityInterface.java

@@ -2,6 +2,6 @@ package carpet.fakes;
 
 public interface ItemEntityInterface
 {
-    int getAge();
-    int getPickupDelay();
+    int getAgeCM();
+    int getPickupDelayCM();
 }

src/main/java/carpet/fakes/ServerChunkManagerInterface.java

@@ -4,5 +4,5 @@ import net.minecraft.server.world.ChunkTicketManager;
 
 public interface ServerChunkManagerInterface
 {
-    ChunkTicketManager getTicketManager();
+    ChunkTicketManager getCMTicketManager();
 }