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
..
2020-02-07 22:05:15 +00:00
2020-05-24 14:26:12 +01:00
2020-02-03 19:57:21 +00:00
2020-01-22 11:55:03 +00:00
2020-05-19 21:19:44 +01:00
2020-10-13 17:51:49 +01:00
2019-07-30 19:14:57 +01:00
2020-05-15 22:57:38 +01:00
2020-01-22 11:55:03 +00:00
2020-02-01 20:33:30 +00:00
2019-07-30 19:14:57 +01:00
2020-07-08 13:50:38 +01:00
2020-05-11 19:25:52 +01:00
2020-05-11 19:25:52 +01:00
2020-01-22 11:55:03 +00:00
2020-04-19 11:13:41 +01:00