Merge branch 'stable' into next-minor

Browse Source

...

This commit is contained in:

Dylan K. Taylor

2019-12-09 10:47:53 +00:00

parent 09961b5cd0 5682cc8d53

commit 02fcfcc383

60 changed files with 2034 additions and 308 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

src/pocketmine/resources/vanilla

Submodule src/pocketmine/resources/vanilla updated: b5a8c68c42...a38b427888