Dylan K. Taylor
|
64e9647334
|
Merge branch 'stable'
# Conflicts:
# resources/vanilla
# src/network/mcpe/convert/LegacySkinAdapter.php
# tests/phpstan/configs/check-explicit-mixed-baseline.neon
# tests/phpstan/configs/phpstan-bugs.neon
|
2020-06-19 10:48:27 +01:00 |
|
Dylan K. Taylor
|
e105578be0
|
LegacySkinAdapter: an extra check for resourcePatch (fixes 3 phpstan explicitMixed errors)
|
2020-06-18 20:08:38 +01:00 |
|
Dylan K. Taylor
|
98f0447912
|
AutoUpdater: use JsonMapper to handle API response information
|
2020-06-18 19:03:11 +01:00 |
|
Dylan K. Taylor
|
2687e63645
|
Merge branch 'stable'
# Conflicts:
# resources/vanilla
# src/pocketmine/block/Cake.php
|
2020-06-18 18:10:27 +01:00 |
|
Dylan K. Taylor
|
a9d98bdf73
|
phpstan: baseline our way into checkExplicitMixed territory
|
2020-06-18 18:07:21 +01:00 |
|