Merge branch 'next-major' into modern-world-support

This commit is contained in:
Dylan K. Taylor
2022-05-11 20:46:32 +01:00
9 changed files with 102 additions and 38 deletions

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": "f3349dee8c1925a1890757897b25a2dc",
"content-hash": "0d40189fe566643df70bf3eee5a9b126",
"packages": [
{
"name": "adhocore/json-comment",
@ -563,16 +563,16 @@
},
{
"name": "pocketmine/locale-data",
"version": "2.7.0",
"version": "2.8.3",
"source": {
"type": "git",
"url": "https://github.com/pmmp/Language.git",
"reference": "f00216c4709d2c5a2af478498315206b336b8e2e"
"reference": "113c115a3b8976917eb22b74dccab464831b6483"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pmmp/Language/zipball/f00216c4709d2c5a2af478498315206b336b8e2e",
"reference": "f00216c4709d2c5a2af478498315206b336b8e2e",
"url": "https://api.github.com/repos/pmmp/Language/zipball/113c115a3b8976917eb22b74dccab464831b6483",
"reference": "113c115a3b8976917eb22b74dccab464831b6483",
"shasum": ""
},
"type": "library",
@ -580,9 +580,9 @@
"description": "Language resources used by PocketMine-MP",
"support": {
"issues": "https://github.com/pmmp/Language/issues",
"source": "https://github.com/pmmp/Language/tree/2.7.0"
"source": "https://github.com/pmmp/Language/tree/2.8.3"
},
"time": "2022-05-10T13:29:27+00:00"
"time": "2022-05-11T13:51:37+00:00"
},
{
"name": "pocketmine/log",