Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/1.20' into 1.21
# Conflicts: # src/main/java/folk/sisby/surveyor/PlayerSummary.java # src/main/java/folk/sisby/surveyor/ServerSummary.java # src/main/java/folk/sisby/surveyor/SurveyorCommands.java # src/main/java/folk/sisby/surveyor/SurveyorExploration.java # src/main/java/folk/sisby/surveyor/SurveyorNetworking.java # src/main/java/folk/sisby/surveyor/client/SurveyorClient.java # src/main/java/folk/sisby/surveyor/client/SurveyorClientCommands.java # src/main/java/folk/sisby/surveyor/client/SurveyorClientNetworking.java # src/main/java/folk/sisby/surveyor/landmark/LandmarkType.java # src/main/java/folk/sisby/surveyor/landmark/Landmarks.java # src/main/java/folk/sisby/surveyor/landmark/NetherPortalLandmark.java # src/main/java/folk/sisby/surveyor/landmark/PlayerDeathLandmark.java # src/main/java/folk/sisby/surveyor/landmark/SimplePointLandmark.java # src/main/java/folk/sisby/surveyor/landmark/SimplePointOfInterestLandmark.java # src/main/java/folk/sisby/surveyor/landmark/WorldLandmarks.java # src/main/java/folk/sisby/surveyor/mixin/MixinServerPlayerEntity.java # src/main/java/folk/sisby/surveyor/mixin/MixinThreadedAnvilChunkStorage.java # src/main/java/folk/sisby/surveyor/mixin/client/MixinClientPlayNetworkHandler.java # src/main/java/folk/sisby/surveyor/mixin/client/MixinClientWorld.java # src/main/java/folk/sisby/surveyor/mixin/client/MixinMinecraftClient.java # src/main/java/folk/sisby/surveyor/packet/C2SKnownLandmarksPacket.java # src/main/java/folk/sisby/surveyor/packet/C2SKnownStructuresPacket.java # src/main/java/folk/sisby/surveyor/packet/C2SKnownTerrainPacket.java # src/main/java/folk/sisby/surveyor/packet/S2CGroupChangedPacket.java # src/main/java/folk/sisby/surveyor/packet/S2CGroupUpdatedPacket.java # src/main/java/folk/sisby/surveyor/packet/S2CPacket.java # src/main/java/folk/sisby/surveyor/packet/S2CStructuresAddedPacket.java # src/main/java/folk/sisby/surveyor/packet/S2CUpdateRegionPacket.java # src/main/java/folk/sisby/surveyor/packet/SurveyorPacket.java # src/main/java/folk/sisby/surveyor/packet/SyncLandmarksAddedPacket.java # src/main/java/folk/sisby/surveyor/packet/SyncLandmarksRemovedPacket.java # src/main/java/folk/sisby/surveyor/structure/JigsawPieceSummary.java # src/main/java/folk/sisby/surveyor/structure/RegionStructureSummary.java # src/main/java/folk/sisby/surveyor/structure/StructurePieceSummary.java # src/main/java/folk/sisby/surveyor/structure/StructureStartSummary.java # src/main/java/folk/sisby/surveyor/structure/WorldStructureSummary.java # src/main/java/folk/sisby/surveyor/terrain/DimensionSupport.java # src/main/java/folk/sisby/surveyor/terrain/RegionSummary.java # src/main/java/folk/sisby/surveyor/terrain/WorldTerrainSummary.java # src/main/java/folk/sisby/surveyor/util/ChunkUtil.java # src/main/java/folk/sisby/surveyor/util/MapUtil.java # src/main/java/folk/sisby/surveyor/util/TextUtil.java # src/main/resources/surveyor.mixins.json
- Loading branch information
