Merge branch 'next-minor' into next-major

This commit is contained in:
Dylan K. Taylor
2023-01-13 17:29:25 +00:00
9 changed files with 74 additions and 35 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": "ecbdb7bda8ed93cb0499bfe486a68ff6",
"content-hash": "5c869a38ea239fff76262c1648cef623",
"packages": [
{
"name": "adhocore/json-comment",
@@ -591,16 +591,16 @@
},
{
"name": "pocketmine/locale-data",
"version": "2.16.0",
"version": "2.17.0",
"source": {
"type": "git",
"url": "https://github.com/pmmp/Language.git",
"reference": "b3bf9029c112414fdb7cd9de778df191565d3038"
"reference": "a2c7071117c98ccc0e333994271cab1072eb3c06"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pmmp/Language/zipball/b3bf9029c112414fdb7cd9de778df191565d3038",
"reference": "b3bf9029c112414fdb7cd9de778df191565d3038",
"url": "https://api.github.com/repos/pmmp/Language/zipball/a2c7071117c98ccc0e333994271cab1072eb3c06",
"reference": "a2c7071117c98ccc0e333994271cab1072eb3c06",
"shasum": ""
},
"type": "library",
@@ -608,9 +608,9 @@
"description": "Language resources used by PocketMine-MP",
"support": {
"issues": "https://github.com/pmmp/Language/issues",
"source": "https://github.com/pmmp/Language/tree/2.16.0"
"source": "https://github.com/pmmp/Language/tree/2.17.0"
},
"time": "2023-01-04T20:27:52+00:00"
"time": "2023-01-13T17:22:45+00:00"
},
{
"name": "pocketmine/log",