# Conflicts: # protocol/src/main/java/mc/protocol/packets/play/client/CPlayerPositionAndLookPacket.java # protocol/src/main/java/mc/protocol/packets/play/client/PlayerLookPacket.java # protocol/src/main/java/mc/protocol/packets/play/client/PlayerPositionPacket.java # protocol/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java # protocol/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java # protocol/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java # server/src/main/resources/logback-default.xml