Dylan K. Taylor
|
fb58959d5f
|
Merge commit '189f12a644aa6474bc91650cce0eb0ae9735db91'
# Conflicts:
# resources/vanilla
|
2020-05-18 10:34:00 +01:00 |
|
Dylan K. Taylor
|
38e28f91e8
|
PermissionParser: move default string mappings to const array instead of switch
this allows them to be used for validation in stuff like Respect In() rule.
|
2020-05-16 11:26:00 +01:00 |
|
Dylan K. Taylor
|
aac7da6c96
|
eliminate remaining empty() usages
|
2020-02-07 21:51:50 +00:00 |
|
Dylan K. Taylor
|
fb1126797a
|
Merge branch 'stable'
|
2020-02-07 18:13:55 +00:00 |
|
Dylan K. Taylor
|
ff63f6d055
|
fill in more iterable types (master)
|
2020-02-01 20:19:57 +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
|
b46712fbe9
|
Merge commit '58bc08838ba18df6361cede4b420d87d5973090a'
# Conflicts:
# resources/vanilla
# src/permission/Permission.php
|
2020-01-31 19:45:31 +00:00 |
|
Dylan K. Taylor
|
055b13a6cf
|
strip extra blank lines (php-cs-fixer)
|
2020-01-22 15:14:10 +00:00 |
|
Dylan K. Taylor
|
cd55cdf5c6
|
Merge commit '9cd6b3e1c7cd81d0a4b0da68d9b3ff026c9f6495'
|
2020-01-22 15:04:06 +00:00 |
|
Dylan K. Taylor
|
1b33143f4f
|
pass 2, manual removal of incorrect non-nullable phpdoc types
|
2020-01-22 12:06:47 +00:00 |
|
Dylan K. Taylor
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
Dylan K. Taylor
|
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 |
|
Dylan K. Taylor
|
cda1143a79
|
Merge branch 'stable'
|
2020-01-09 17:17:42 +00:00 |
|
Dylan K. Taylor
|
0f718ea28b
|
Merge commit '8726604899d1a371567141e0831ed570d3233356'
|
2019-12-25 14:19:35 +00:00 |
|
Dylan K. Taylor
|
a9c09e4517
|
Merge branch 'next-minor'
|
2019-12-12 13:52:14 +00:00 |
|
Dylan K. Taylor
|
4651bcf8c3
|
master: imports cleanup
it was easier to make an empty merge and re-run php-cs-fixer afterwards.
|
2019-12-11 23:23:03 +00:00 |
|
Dylan K. Taylor
|
ebbb99b96b
|
Merge branch 'next-minor'
|
2019-10-22 19:05:11 +01:00 |
|
Dylan K. Taylor
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|