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
..
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-09-03 15:09:52 +01:00