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

..

configs

Merge remote-tracking branch 'origin/stable' into master

2020-10-13 17:51:49 +01:00

rules

added some phpstan-specific generic type annotations

2020-01-13 15:05:02 +00:00

stubs

ChunkUtils: be more specific in extension stub too

2020-06-15 23:07:05 +01:00

bootstrap.php

Merge remote-tracking branch 'origin/stable' into master

2020-10-13 17:51:49 +01:00