20b64e18e4
Conflicts: source/Bindings.cpp source/Entities/Entity.cpp Updated from upsteam |
||
---|---|---|
.. | ||
ChunkDataSerializer.cpp | ||
ChunkDataSerializer.h | ||
Protocol14x.cpp | ||
Protocol14x.h | ||
Protocol15x.cpp | ||
Protocol15x.h | ||
Protocol16x.cpp | ||
Protocol16x.h | ||
Protocol125.cpp | ||
Protocol125.h | ||
Protocol132.cpp | ||
Protocol132.h | ||
Protocol.h | ||
ProtocolRecognizer.cpp | ||
ProtocolRecognizer.h |