mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 02:42:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into master

Browse Source 
# Conflicts:
#	composer.json
#	composer.lock
#	src/CrashDump.php
#	src/pocketmine/Server.php
#	src/pocketmine/level/format/io/region/McRegion.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/l7-baseline.neon
#	tests/phpstan/configs/l8-baseline.neon
#	tests/travis/setup-php.yml
This commit is contained in:
Dylan K. Taylor
2020-10-26 16:18:53 +00:00
parent 4c0c2ebd24 0b550b346b
commit d6ed542fcd
11 changed files with 325 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -47,11 +47,11 @@
"pocketmine/color": "^0.1.0",
"adhocore/json-comment": "^0.1.0",
"netresearch/jsonmapper": "^2.0",
"ocramius/package-versions": "^1.5",
"respect/validation": "^2.0"
"respect/validation": "^2.0",
"composer-runtime-api": "^2.0"
},
"require-dev": {
"phpstan/phpstan": "0.12.50",
"phpstan/phpstan": "0.12.51",
"phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2"