Dylan K. Taylor
|
1f90aa07aa
|
Merge branch 'stable'
# Conflicts:
# resources/vanilla
# src/command/defaults/TeleportCommand.php
# src/pocketmine/event/entity/EntityDespawnEvent.php
# src/pocketmine/event/entity/EntityInventoryChangeEvent.php
# src/pocketmine/event/entity/EntityLevelChangeEvent.php
# src/pocketmine/event/entity/EntitySpawnEvent.php
# tests/phpstan/configs/actual-problems.neon
|
2020-06-21 00:30:45 +01:00 |
|
Dylan K. Taylor
|
5a8633f6c0
|
Merge commit '409c8c170'
# Conflicts:
# resources/vanilla
|
2020-06-13 11:57:58 +01:00 |
|
Dylan K. Taylor
|
da3ba1e2b2
|
Merge commit 'a27b29897'
# Conflicts:
# resources/vanilla
|
2020-06-13 11:28:03 +01:00 |
|
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
|
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
|
dedf81a9af
|
Merge commit 'e61c3e8bf697e5c5c6cddb4843b24279faaf25cb'
|
2020-01-31 19:12:32 +00:00 |
|
Dylan K. Taylor
|
25ead18369
|
Merge commit '7ce6c8aa13bd1e8eb5aa3fe267a0116ab43e9313'
|
2020-01-31 18:55:49 +00:00 |
|
Dylan K. Taylor
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|