mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.2' into mcpe-1.6-master

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-08-29 17:27:48 +01:00
commit b2c0bba86e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
composer.lock generated
View File

@ -149,16 +149,16 @@
}, },
{ {
"name": "pocketmine/binaryutils", "name": "pocketmine/binaryutils",
"version": "0.1.0", "version": "0.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/BinaryUtils.git", "url": "https://github.com/pmmp/BinaryUtils.git",
"reference": "c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595" "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595", "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/54efeb978be0ff9335022729fe63c1e2077bf1be",
"reference": "c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595", "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -179,20 +179,20 @@
"source": "https://github.com/pmmp/BinaryUtils/tree/master", "source": "https://github.com/pmmp/BinaryUtils/tree/master",
"issues": "https://github.com/pmmp/BinaryUtils/issues" "issues": "https://github.com/pmmp/BinaryUtils/issues"
}, },
"time": "2018-04-16T09:05:08+00:00" "time": "2018-08-26T18:11:05+00:00"
}, },
{ {
"name": "pocketmine/math", "name": "pocketmine/math",
"version": "0.2.0", "version": "0.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/Math.git", "url": "https://github.com/pmmp/Math.git",
"reference": "95ae5600328ed2add44c0bc830a68d3660e9e0ef" "reference": "ee299f5c9c444ca526c9c691b920f321458cf0b6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/Math/zipball/95ae5600328ed2add44c0bc830a68d3660e9e0ef", "url": "https://api.github.com/repos/pmmp/Math/zipball/ee299f5c9c444ca526c9c691b920f321458cf0b6",
"reference": "95ae5600328ed2add44c0bc830a68d3660e9e0ef", "reference": "ee299f5c9c444ca526c9c691b920f321458cf0b6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -210,10 +210,10 @@
], ],
"description": "PHP library containing math related code used in PocketMine-MP", "description": "PHP library containing math related code used in PocketMine-MP",
"support": { "support": {
"source": "https://github.com/pmmp/Math/tree/master", "source": "https://github.com/pmmp/Math/tree/0.2.1",
"issues": "https://github.com/pmmp/Math/issues" "issues": "https://github.com/pmmp/Math/issues"
}, },
"time": "2018-06-09T09:26:30+00:00" "time": "2018-08-15T15:43:27+00:00"
}, },
{ {
"name": "pocketmine/nbt", "name": "pocketmine/nbt",

4
src/pocketmine/network/mcpe/protocol/ProtocolInfo.php
View File

@ -43,11 +43,11 @@ interface ProtocolInfo{
/** /**
* Current Minecraft PE version reported by the server. This is usually the earliest currently supported version. * Current Minecraft PE version reported by the server. This is usually the earliest currently supported version.
*/ */
public const MINECRAFT_VERSION = 'v1.6.0.8 beta'; public const MINECRAFT_VERSION = 'v1.6.0';
/** /**
* Version number sent to clients in ping responses. * Version number sent to clients in ping responses.
*/ */
public const MINECRAFT_VERSION_NETWORK = '1.6.0.8'; public const MINECRAFT_VERSION_NETWORK = '1.6.0';
public const LOGIN_PACKET = 0x01; public const LOGIN_PACKET = 0x01;
public const PLAY_STATUS_PACKET = 0x02; public const PLAY_STATUS_PACKET = 0x02;