mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 18:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into master

Browse Source 
# Conflicts:
#	.gitmodules
#	composer.lock
#	resources/vanilla
#	src/network/mcpe/protocol/PlayerAuthInputPacket.php
#	src/pocketmine/Player.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
This commit is contained in:
Dylan K. Taylor
2020-08-10 17:55:49 +01:00
parent 192e31a397 9bd6d5c67e
commit 98db4c5200
10 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "96c53cbd2154a5a665517d9b7d22af6b",
"content-hash": "a518c2e67a38a7f2e4b5de64b602a8e2",
"packages": [
{
"name": "adhocore/json-comment",
@ -1376,20 +1376,20 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.29",
"version": "0.12.36",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "9771daaf6b95c6313b908d0bcdee0afcd51f838a"
"reference": "eaeff985e395ff4e7aebf3251a43fca6c9be1af3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/9771daaf6b95c6313b908d0bcdee0afcd51f838a",
"reference": "9771daaf6b95c6313b908d0bcdee0afcd51f838a",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/eaeff985e395ff4e7aebf3251a43fca6c9be1af3",
"reference": "eaeff985e395ff4e7aebf3251a43fca6c9be1af3",
"shasum": ""
},
"require": {
"php": "^7.1"
"php": "^7.1|^8.0"
},
"conflict": {
"phpstan/phpstan-shim": "*"
@ -1428,7 +1428,7 @@
"type": "tidelift"
}
],
"time": "2020-06-14T14:10:59+00:00"
"time": "2020-08-05T09:29:40+00:00"
},
{
"name": "phpstan/phpstan-phpunit",