mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into master

Browse Source 
# Conflicts:
#	.gitmodules
#	composer.lock
#	resources/vanilla
#	src/network/mcpe/protocol/PlayerAuthInputPacket.php
#	src/pocketmine/Player.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
This commit is contained in:
Dylan K. Taylor
2020-08-10 17:55:49 +01:00
parent 192e31a397 9bd6d5c67e
commit 98db4c5200
10 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
tests/plugins/PocketMine-DevTools → tests/plugins/DevTools
View File

2
tests/travis.sh
View File

@ -17,7 +17,7 @@ PLUGINS_DIR="$DATA_DIR/plugins"
rm -rf "$DATA_DIR"
rm PocketMine-MP.phar 2> /dev/null
cd tests/plugins/PocketMine-DevTools
cd tests/plugins/DevTools
php -dphar.readonly=0 ./src/DevTools/ConsoleScript.php --make ./ --relative ./ --out ../../../DevTools.phar
cd ../../..