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

..

setup-php.yml

Merge branch 'stable' into master

2020-09-26 13:27:08 +01:00