Dylan K. Taylor 9e98666f57 Merge commit 'c4ad39046' ...

# Conflicts:
#	resources/vanilla

2020-06-03 12:31:42 +01:00

..

locale @ 157abfa5a2

Merge remote-tracking branch 'origin/stable'

2019-10-01 14:41:54 +01:00

vanilla @ cc132c80dd

move BedrockData submodule to resources/

2020-02-01 22:14:24 +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 commit 'c4ad39046'

2020-06-03 12:31:42 +01:00

resource_packs.yml

Merge branch '3.5'

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