Dylan K. Taylor
|
3299bc4023
|
start using pocketmine/errorhandler
|
2020-05-10 13:04:40 +01:00 |
|
Dylan K. Taylor
|
c097188a97
|
Merge branch 'next-minor'
# Conflicts:
# composer.json
# composer.lock
# resources/vanilla
|
2020-04-19 12:22:39 +01:00 |
|
Dylan K. Taylor
|
d4594d6114
|
Merge commit '06a9c98'
# Conflicts:
# resources/vanilla
|
2020-04-18 13:48:26 +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
|
ee4757303b
|
Merge commit '9eebfa7cc30c8a5ac39f192c79023131623ad4b4'
# Conflicts:
# resources/vanilla
# src/Server.php
# src/pocketmine/Achievement.php
|
2020-01-31 20:07:21 +00:00 |
|
Dylan K. Taylor
|
9c06c1a06f
|
Merge branch 'stable'
|
2020-01-11 22:36:57 +00:00 |
|
Dylan K. Taylor
|
cda1143a79
|
Merge branch 'stable'
|
2020-01-09 17:17:42 +00:00 |
|
Dylan K. Taylor
|
c16337a80f
|
Merge branch 'stable' with changes
|
2019-11-09 18:01:04 +00:00 |
|
Dylan K. Taylor
|
3eea2442a7
|
move filesystem-related functions to pocketmine\utils\Filesystem
|
2019-08-25 17:36:50 +01:00 |
|
Dylan K. Taylor
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|