Dylan K. Taylor 9228f006d4

Merge remote-tracking branch 'origin/stable' ...

# Conflicts:
#	composer.json
#	composer.lock
#	resources/vanilla
#	src/CrashDump.php
#	src/PocketMine.php
#	src/pocketmine/Server.php
#	src/pocketmine/item/Bucket.php
#	src/pocketmine/item/Item.php
#	src/pocketmine/level/format/Chunk.php
#	src/pocketmine/level/format/io/leveldb/LevelDB.php
#	src/pocketmine/level/format/io/region/McRegion.php
#	src/pocketmine/network/mcpe/protocol/BatchPacket.php
#	src/pocketmine/tile/Furnace.php
#	src/pocketmine/utils/UUID.php
#	src/utils/ServerKiller.php

2020-12-20 20:54:13 +00:00

..

gh-actions

fix CXXFLAGS

2020-12-14 22:02:16 +00:00

phpstan

fixed phpstan failures caused by 5282ae329834512a6ca497e8c4bdbcb73ec86db2

2020-12-11 23:00:14 +00:00

phpunit

Removed PLUGIN_PATH constant

2020-12-09 20:48:50 +00:00

plugins

Updated DevTools submodule to pmmp/DevTools@888d021260

2020-12-05 22:56:27 +00:00

travis.sh

fix build #3

2020-11-16 19:25:13 +00:00