Merge branch 'stable' of github.com:pmmp/PocketMine-MP into stable

This commit is contained in:
Dylan K. Taylor
2021-12-10 23:24:38 +00:00
2 changed files with 9 additions and 9 deletions

View File

@ -10,7 +10,7 @@
<a href="https://discord.gg/bmSAZBG"><img src="https://img.shields.io/discord/373199722573201408?label=discord&color=7289DA&logo=discord" alt="Discord" /></a> <a href="https://discord.gg/bmSAZBG"><img src="https://img.shields.io/discord/373199722573201408?label=discord&color=7289DA&logo=discord" alt="Discord" /></a>
<br> <br>
<img alt="GitHub all releases" src="https://img.shields.io/github/downloads/pmmp/PocketMine-MP/total?label=downloads%40total"> <img alt="GitHub all releases" src="https://img.shields.io/github/downloads/pmmp/PocketMine-MP/total?label=downloads%40total">
<img alt="GitHub release (latest by SemVer)" src="https://img.shields.io/github/downloads/pmmp/PocketMine-MP/latest/total"> <img alt="GitHub release (latest by SemVer)" src="https://img.shields.io/github/downloads/pmmp/PocketMine-MP/latest/total?sort=semver">
</p> </p>
## Getting started ## Getting started

16
composer.lock generated
View File

@ -123,24 +123,24 @@
}, },
{ {
"name": "fgrosse/phpasn1", "name": "fgrosse/phpasn1",
"version": "v2.3.0", "version": "v2.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fgrosse/PHPASN1.git", "url": "https://github.com/fgrosse/PHPASN1.git",
"reference": "20299033c35f4300eb656e7e8e88cf52d1d6694e" "reference": "6edcecb4df8b6881e79080d5e363dc8b90d4558c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/20299033c35f4300eb656e7e8e88cf52d1d6694e", "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/6edcecb4df8b6881e79080d5e363dc8b90d4558c",
"reference": "20299033c35f4300eb656e7e8e88cf52d1d6694e", "reference": "6edcecb4df8b6881e79080d5e363dc8b90d4558c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.0.0" "php": ">=7.0.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~6.3", "php-coveralls/php-coveralls": "~2.0",
"satooshi/php-coveralls": "~2.0" "phpunit/phpunit": "^6.3 | ^7.0"
}, },
"suggest": { "suggest": {
"ext-bcmath": "BCmath is the fallback extension for big integer calculations", "ext-bcmath": "BCmath is the fallback extension for big integer calculations",
@ -192,9 +192,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/fgrosse/PHPASN1/issues", "issues": "https://github.com/fgrosse/PHPASN1/issues",
"source": "https://github.com/fgrosse/PHPASN1/tree/v2.3.0" "source": "https://github.com/fgrosse/PHPASN1/tree/v2.3.1"
}, },
"time": "2021-04-24T19:01:55+00:00" "time": "2021-12-09T20:59:31+00:00"
}, },
{ {
"name": "netresearch/jsonmapper", "name": "netresearch/jsonmapper",