Dylan K. Taylor 163c3855eb Merge branch 'next-minor' ...

# Conflicts:
#	resources/vanilla
#	src/plugin/PluginBase.php
#	src/plugin/PluginDescription.php
#	src/pocketmine/Player.php
#	src/pocketmine/network/rcon/RCON.php
#	src/pocketmine/network/rcon/RCONInstance.php
#	src/pocketmine/scheduler/AsyncTask.php
#	src/pocketmine/tile/Spawnable.php
#	src/scheduler/AsyncPool.php
#	src/utils/Config.php
#	src/utils/Timezone.php
#	src/utils/UUID.php
#	src/utils/Utils.php
#	src/world/format/io/region/RegionLoader.php

2020-04-19 11:13:41 +01:00

..

configs

Merge branch 'next-minor'

2020-04-19 11:13:41 +01:00

rules

added some phpstan-specific generic type annotations

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

stubs

LoginPacket: use netresearch/jsonmapper for login data decoding

2020-03-23 22:00:13 +00:00

bootstrap.php

fixing some PHPStan complaints about bootstrap

2019-11-07 18:22:37 +00:00