Dylan K. Taylor
|
b032d49722
|
Merge branch 'stable'
|
2021-03-28 19:41:23 +01:00 |
|
Dylan K. Taylor
|
44e446b621
|
Merge remote-tracking branch 'origin/stable' into master
# Conflicts:
# build/php
# composer.lock
# phpstan.neon.dist
# resources/vanilla
# src/pocketmine/Server.php
# src/pocketmine/VersionInfo.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/lang/locale
# src/utils/Timezone.php
# tests/phpstan/bootstrap.php
# tests/phpstan/configs/custom-leveldb.neon
|
2020-10-13 17:51:49 +01:00 |
|
Dylan K. Taylor
|
2645b19617
|
Convert VersionInfo into a final class
this allows it to be loaded by the autoloader without additional changes.
|
2020-07-25 19:00:48 +01:00 |
|
Dylan K. Taylor
|
055b13a6cf
|
strip extra blank lines (php-cs-fixer)
|
2020-01-22 15:14:10 +00:00 |
|
Dylan K. Taylor
|
6d24760174
|
Merge branch 'stable'
|
2019-10-20 21:25:39 +01:00 |
|
Dylan K. Taylor
|
51ed564c5e
|
SetupWizard: remove non-obvious dependencies on dynamic constants, require path in constructor
|
2019-08-25 16:46:01 +01:00 |
|
Dylan K. Taylor
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|