Merge commit '71a8b0340c303a4d2c024ad5a0a558c5e52694e7'

# Conflicts:
#	resources/vanilla

BUILDING.md

@@ -30,9 +30,9 @@ If you use a custom binary, you'll need to replace `composer` usages in this gui
 Preprocessor requires that the `cpp` (c preprocessor) is available in your PATH.
 
 ## Building `PocketMine-MP.phar`
-Run `build/server.phar` using your preferred PHP binary. It'll drop a `PocketMine-MP.phar` into the current working directory.
+Run `build/server-phar.php` using your preferred PHP binary. It'll drop a `PocketMine-MP.phar` into the current working directory.
 
 You can also use the `--out` option to change the output filename.
 
 ## Running PocketMine-MP from source code
-Run `src/pocketmine/PocketMine.php` using your preferred PHP binary.
+Run `src/pocketmine/PocketMine.php` using your preferred PHP binary.

changelogs/3.12.md

@@ -21,7 +21,7 @@ Plugin developers should **only** update their required API to this version if y
 - Fixed permission default timings not being reported in timings reports (they were never stopped, only started).
 - Resource packs with a directory tree like `pack.zip/MyPack/manifest.json` are now supported. Note that the manifest closest to the root will be used.
 - Fixed `SkinImage` height and width being inverted at the protocol layer.
-- Fixed blocks being able to be placed inside the spawn protectionb radius by clicking the side of a block outside the radius.
+- Fixed blocks being able to be placed inside the spawn protection radius by clicking the side of a block outside the radius.
 - Fixed server crash when `network.compression-level` is overridden by a CLI parameter.
 - Fixed moving entities spawning themselves to players registered on chunks when the players haven't received the chunk yet.
 - Cocoa pods now drop cocoa beans when broken instead of the block itself.