Merge branch 'stable'

Browse Source

# Conflicts:
#	resources/vanilla
#	src/network/mcpe/protocol/types/inventory/stackresponse/ItemStackResponseSlotInfo.php
#	src/network/mcpe/raklib/FilterTextPacket.php
#	src/pocketmine/VersionInfo.php
#	src/pocketmine/network/mcpe/protocol/PacketPool.php
#	src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php

...

This commit is contained in:

Dylan K. Taylor

2020-12-08 21:34:06 +00:00

parent 05a1f45111 69a41a5ed4

commit 197b1a8566

11 changed files with 217 additions and 11 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

2

resources/vanilla

Submodule resources/vanilla updated: 14f4a765eb...4e58a3c67d