Dylan K. Taylor 44e446b621 Merge remote-tracking branch 'origin/stable' into master
# Conflicts:
#	build/php
#	composer.lock
#	phpstan.neon.dist
#	resources/vanilla
#	src/pocketmine/Server.php
#	src/pocketmine/VersionInfo.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/lang/locale
#	src/utils/Timezone.php
#	tests/phpstan/bootstrap.php
#	tests/phpstan/configs/custom-leveldb.neon
2020-10-13 17:51:49 +01:00
..
2019-06-11 16:44:05 +01:00
2019-06-11 16:44:05 +01:00
2019-06-11 16:44:05 +01:00
2019-06-11 16:48:24 +01:00
2019-06-11 16:44:05 +01:00
2019-06-11 16:44:05 +01:00
2019-06-11 16:44:05 +01:00
2019-06-11 16:44:05 +01:00
2019-06-11 16:44:05 +01:00
2019-06-11 16:44:05 +01:00
2019-06-11 16:44:05 +01:00
2019-06-11 16:44:05 +01:00
2019-07-12 18:20:47 +01:00
2019-12-06 20:33:51 +00:00
2020-04-14 02:54:40 +01:00
2020-06-04 20:38:06 +01:00
2020-06-26 12:31:56 +01:00
2020-08-11 21:06:38 +01:00
2020-10-06 13:33:42 +01:00