Merge branch 'master' into mcpe-1.2

Browse Source

...

This commit is contained in:

Dylan K. Taylor

2017-09-14 18:16:45 +01:00

parent c1c290cd39 77241e14ce

commit 6b34c47c96

12 changed files with 220 additions and 52 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

tests/plugins/PocketMine-DevTools

Submodule tests/plugins/PocketMine-DevTools updated: bfae42ce89...eec5da2443

2

tests/plugins/PocketMine-TesterPlugin

Submodule tests/plugins/PocketMine-TesterPlugin updated: c568b5ec9b...87d6b81989