Merge commit 'a5764b3ae98a70fe8f20f9b403a4ab84b51b11d8'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/level/format/io/LevelProvider.php
#	src/world/generator/Generator.php
#	src/world/generator/GeneratorRegisterTask.php

src/world/format/io/WritableWorldProvider.php

@@ -28,6 +28,8 @@ use pocketmine\world\format\Chunk;
 interface WritableWorldProvider extends WorldProvider{
 	/**
 	 * Generate the needed files in the path given
+	 *
+	 * @param mixed[] $options
 	 */
 	public static function generate(string $path, string $name, int $seed, string $generator, array $options = []) : void;