Dylan K. Taylor 2af15557b9 Merge branch 'stable' ...

# Conflicts:
#	.travis.yml
#	resources/vanilla
#	src/block/BlockToolType.php
#	src/network/mcpe/protocol/types/entity/MetadataProperty.php
#	tests/travis/setup-php.yml

2020-12-11 22:44:04 +00:00

..

phpstan

Removed PLUGIN_PATH constant

2020-12-09 20:48:50 +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