Merge commit 'f24be2b05'

Browse Source

# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
#	src/pocketmine/block/SnowLayer.php

...

This commit is contained in:

Dylan K. Taylor 2020-06-03 13:08:48 +01:00

parent a5e08e9a71 f24be2b055

commit bce7cdd461

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available