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
|
75e3a0aa0f
|
Merge branch 'stable' into master
# Conflicts:
# composer.lock
# resources/vanilla
# src/command/defaults/StatusCommand.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/level/format/SubChunk.php
|
2020-09-26 13:27:08 +01:00 |
|
Dylan K. Taylor
|
bc52a38922
|
Improved network bandwidth data collection
|
2020-07-21 19:21:27 +01:00 |
|
Dylan K. Taylor
|
7b3c2a3703
|
Merge commit '3907a2b6ba58fa49022e3e7c8256731dfa2e0d00'
|
2020-03-14 13:32:35 +00:00 |
|
Dylan K. Taylor
|
ad0f100f8e
|
remove \pocketmine\START_TIME, add Server->getStartTime()
|
2019-08-25 16:25:27 +01:00 |
|
Dylan K. Taylor
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|