Dylan K. Taylor 0aee39027e Merge branch 'stable' into master ...

# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/entity/Living.php
#	src/pocketmine/Player.php
#	src/pocketmine/VersionInfo.php
#	src/pocketmine/block/Potato.php
#	src/pocketmine/block/Sugarcane.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/item/Item.php
#	src/pocketmine/level/format/Chunk.php
#	src/pocketmine/level/format/io/leveldb/LevelDB.php
#	src/world/generator/GeneratorRegisterTask.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/l7-baseline.neon
#	tests/phpstan/configs/l8-baseline.neon
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMainLoggerTest.php
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMemoryLeakTest.php
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskPublishProgressRaceTest.php

2020-09-04 01:43:52 +01:00

..

configs

Merge branch 'stable' into master

2020-09-04 01:43:52 +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

Remove VERSION and GIT_COMMIT constants

2020-07-25 19:17:33 +01:00