Merge branch 'stable' into next-minor

.travis.yml

@@ -5,11 +5,10 @@ php:
 
 before_script:
  - phpenv config-rm xdebug.ini
-# - pecl install channel://pecl.php.net/pthreads-3.1.6
- - echo | pecl install channel://pecl.php.net/yaml-2.0.4
+ - echo | pecl install channel://pecl.php.net/yaml-2.1.0
  - git clone https://github.com/pmmp/pthreads.git
  - cd pthreads
- - git checkout 1b7da492b944146fa9680f6399bd9c6c6c6095e0
+ - git checkout 646dac62ae0d48c1ada7b007e15575fb84f7d71d
  - phpize
  - ./configure
  - make

build/php

@@ -1 +1 @@
-Subproject commit e145515864a6b1a5bad4e755b68e93b7dfbf9697
+Subproject commit a6ab41089e4c2d19b309fe29763f332564b4b662

changelogs/3.12.md

@@ -16,3 +16,12 @@ Plugin developers should **only** update their required API to this version if y
 - Fixed some bugs in login verification that could cause undefined behaviour.
 - Fixed item-use behaviour when sneaking - sneaking and clicking a block with an empty hand, and sneaking and using an item, both now follow vanilla behaviour.
 - `start.sh` will now work on platforms where `/bin/bash` is not available, as long as `/usr/bin/env` knows where bash is.
+
+# 3.12.2
+- 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 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.

src/pocketmine/VersionInfo.php

@@ -33,6 +33,6 @@ if(defined('pocketmine\_VERSION_INFO_INCLUDED')){
 const _VERSION_INFO_INCLUDED = true;
 
 const NAME = "PocketMine-MP";
-const BASE_VERSION = "3.12.2";
+const BASE_VERSION = "3.12.3";
 const IS_DEVELOPMENT_BUILD = true;
 const BUILD_NUMBER = 0;