Dylan K. Taylor 977f9ec497 Merge branch 'stable'
# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/VersionInfo.php
#	src/pocketmine/block/Podzol.php
2020-07-21 11:57:24 +01:00
..
2020-07-06 11:18:29 +01:00
2020-02-07 21:51:50 +00:00
2020-07-04 22:22:22 +01:00
2020-07-21 11:57:24 +01:00
2020-07-09 13:43:42 +01:00
2020-02-07 21:51:50 +00:00
2020-07-17 14:23:32 +01:00
2020-01-22 11:55:03 +00:00