Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/resources/carpet.mixins.json

src/main/java/carpet/fakes/TicketInfoInterface.java

@@ -0,0 +1,8 @@
+package carpet.fakes;
+
+import net.minecraft.util.math.BlockPos;
+
+public interface TicketInfoInterface
+{
+    BlockPos getPos();
+}