mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-21 08:17:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into master

Browse Source 
# Conflicts:
#	composer.json
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-08-21 22:14:49 +01:00
commit a9871a6c1a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -40,7 +40,7 @@
"pocketmine/snooze": "^0.1.0",
"pocketmine/classloader": "dev-master",
"pocketmine/log-pthreads": "dev-master",
"pocketmine/callback-validator": "^1.0.1",
"pocketmine/callback-validator": "^1.0.2",
"pocketmine/errorhandler": "^0.1.0",
"pocketmine/uuid": "^0.1.0",
"pocketmine/color": "^0.1.0",

2
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": "f76900efadf8b19b39bbef9b1382851a",
"content-hash": "7ec1bf61515c3b157a1347560b551826",
"packages": [
{
"name": "adhocore/json-comment",