Dylan K. Taylor
|
fe649d8d70
|
Extract ServerConfigGroup from Server
this API isn't very nice, but it's pretty much the same as the original, and at least this can be _kinda_ unit-tested...
|
2020-05-24 15:48:03 +01:00 |
|
Dylan K. Taylor
|
fb1126797a
|
Merge branch 'stable'
|
2020-02-07 18:13:55 +00:00 |
|
Dylan K. Taylor
|
cb16f5c142
|
Merge commit '260ac47588c76a2e6814cfba46773a990fb8c5da'
# Conflicts:
# resources/vanilla
# src/Server.php
# src/lang/Language.php
# src/network/mcpe/protocol/AddItemActorPacket.php
# src/network/mcpe/protocol/AddPlayerPacket.php
# src/network/mcpe/protocol/SetActorDataPacket.php
# src/network/mcpe/serializer/NetworkBinaryStream.php
# src/permission/Permission.php
# src/pocketmine/block/Leaves.php
# src/pocketmine/entity/DataPropertyManager.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/item/Banner.php
# src/pocketmine/item/Item.php
# src/pocketmine/level/format/io/LevelProvider.php
# src/pocketmine/level/format/io/LevelProviderManager.php
# src/pocketmine/network/mcpe/protocol/AddActorPacket.php
# src/pocketmine/network/mcpe/protocol/LoginPacket.php
# src/pocketmine/tile/Banner.php
# src/scheduler/BulkCurlTask.php
# src/updater/AutoUpdater.php
# src/utils/Config.php
# src/utils/Utils.php
# src/world/generator/Flat.php
# src/world/generator/Generator.php
|
2020-01-31 21:07:34 +00:00 |
|
Dylan K. Taylor
|
3401504bab
|
Merge commit '9097d6c4d35b05576181f91bda68d316809f28b9'
# Conflicts:
# resources/vanilla
|
2020-01-31 20:02:59 +00:00 |
|
Dylan K. Taylor
|
3e80850938
|
Merge commit '60b405d944254c940f818ebd0b7aa2603d7968a7'
# Conflicts:
# resources/vanilla
# src/updater/AutoUpdater.php
|
2020-01-31 19:55:43 +00:00 |
|
Dylan K. Taylor
|
055b13a6cf
|
strip extra blank lines (php-cs-fixer)
|
2020-01-22 15:14:10 +00:00 |
|
Dylan K. Taylor
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
Dylan K. Taylor
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|