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-21 11:57:24 +01:00
2020-07-21 11:57:24 +01:00
2020-07-11 20:14:42 +01:00
2020-07-17 14:41:04 +01:00
2020-07-08 12:01:48 +01:00
2020-07-11 20:14:42 +01:00
2020-06-18 20:01:49 +01:00
2020-07-08 11:46:02 +01:00
2020-06-14 19:28:05 +01:00