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-05-01 13:57:26 +01:00
2020-09-26 14:31:56 +01:00
2020-09-20 12:16:11 +01:00
2020-09-26 14:31:56 +01:00
2020-09-04 01:43:52 +01:00
2020-01-22 15:14:10 +00:00
2020-05-21 20:29:06 +01:00
2020-07-08 11:46:02 +01:00
2020-07-08 11:46:02 +01:00
2020-02-07 18:13:55 +00:00
2020-06-28 17:53:03 +01:00
2020-10-13 17:51:49 +01:00
2020-09-04 01:44:21 +01:00
2020-08-17 13:20:34 +01:00
2020-05-21 19:18:00 +01:00
2020-01-22 15:14:10 +00:00
2020-06-28 17:53:03 +01:00
2020-10-08 21:35:36 +01:00
2020-06-27 13:09:05 +01:00
2020-06-17 20:34:19 +01:00
2020-09-26 14:31:56 +01:00
2020-06-29 21:19:46 +01:00
2020-06-17 20:34:19 +01:00
2020-09-25 18:40:13 +01:00
2020-06-20 13:43:31 +01:00
2020-05-21 20:29:06 +01:00
2020-06-20 13:43:31 +01:00