Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor
2020-02-07 18:13:55 +00:00
88 changed files with 543 additions and 283 deletions

View File

@ -62,7 +62,7 @@ class ZippedResourcePack implements ResourcePack{
/** @var \stdClass */
protected $manifest;
/** @var string */
/** @var string|null */
protected $sha256 = null;
/** @var resource */