Merge branch 'stable' into next-minor

Browse Source

...

This commit is contained in:

Dylan K. Taylor

2019-12-12 13:07:02 +00:00

parent 02fcfcc383 70c3008b7b

commit 1a467420e3

37 changed files with 165 additions and 48 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: a38b427888...cc132c80dd