Dylan K. Taylor 197b1a8566 Merge branch 'stable' ...

# 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

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

..

locale @ 3d1c70b9f3

Implemented /clear command (#3854)

2020-12-06 15:26:12 +00:00

vanilla @ 4e58a3c67d

Merge branch 'stable'

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

item_from_string_bc_map.json

added legacy string item mappings that were unknowingly removed

2020-05-13 22:48:08 +01:00

plugin_list.yml

Implemented plugin loading whitelist/blacklist by config file (#2783)

2019-03-24 16:18:13 +00:00

pocketmine.yml

Merge remote-tracking branch 'origin/stable' into master

2020-10-13 17:51:49 +01:00

resource_packs.yml

Merge branch '3.5'

2019-01-24 18:45:06 +00:00