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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

tests/plugins/PocketMine-DevTools → tests/plugins/DevTools