Dylan K. Taylor 75e3a0aa0f Merge branch 'stable' into master
# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/command/defaults/StatusCommand.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/level/format/SubChunk.php
2020-09-26 13:27:08 +01:00
..
2020-09-26 13:27:08 +01:00
2020-09-26 13:27:08 +01:00
2020-01-22 11:55:03 +00:00
2020-08-16 20:39:51 +01:00
2020-08-10 17:55:49 +01:00
2020-09-26 13:27:08 +01:00
2020-03-10 13:05:37 +00:00