|
|
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 |
|
|
|
9b9b955762
|
Merge commit '0537c66849b307465159306981bad78ba902f30b'
# Conflicts:
# resources/vanilla
# src/scheduler/BulkCurlTask.php
|
2020-01-31 19:47:59 +00:00 |
|
|
|
5c4487c980
|
added some callable prototypes for phpstan
|
2020-01-29 19:56:16 +00:00 |
|
|
|
a604176ac2
|
Merge branch 'stable'
|
2020-01-29 16:11:51 +00:00 |
|
|
|
055b13a6cf
|
strip extra blank lines (php-cs-fixer)
|
2020-01-22 15:14:10 +00:00 |
|
|
|
cd55cdf5c6
|
Merge commit '9cd6b3e1c7cd81d0a4b0da68d9b3ff026c9f6495'
|
2020-01-22 15:04:06 +00:00 |
|
|
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
|
|
3ee6887792
|
populate remaining missing return types, using native returns where possible
this is done separately to stable so that stable changes can be integrated easily using an empty merge.
|
2020-01-19 10:26:35 +00:00 |
|
|
|
0e1cea043a
|
added some phpstan-specific generic type annotations
|
2020-01-13 15:05:02 +00:00 |
|
|
|
aba71762e9
|
master-specific @var annotations
|
2020-01-09 17:50:01 +00:00 |
|
|
|
cda1143a79
|
Merge branch 'stable'
|
2020-01-09 17:17:42 +00:00 |
|
|
|
fb78ec1f62
|
AsyncTask: mark threadLocalStorage static field as nullable
|
2019-12-04 22:50:30 +00:00 |
|
|
|
ebbb99b96b
|
Merge branch 'next-minor'
|
2019-10-22 19:05:11 +01:00 |
|
|
|
a52e4f0392
|
AsyncPool: Return whether there are tasks left to be collected from collectTasks()
this allows a while($pool->collectTasks()); style code.
|
2019-08-08 18:48:58 +01:00 |
|
|
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|
