Dylan K. Taylor
|
d48af3f4ca
|
Merge branch 'stable'
# Conflicts:
# composer.lock
# resources/vanilla
# src/permission/BanEntry.php
# src/permission/PermissionAttachmentInfo.php
|
2020-12-01 17:35:30 +00:00 |
|
Dylan T
|
6d8833ccd3
|
Removal of permission defaults (in favour of permission cascading) (#3937)
|
2020-12-01 17:13:54 +00:00 |
|
Dylan K. Taylor
|
463bc044df
|
Rename PluginLoadOrder -> PluginEnableOrder
this more accurately describes its real purpose.
|
2020-11-09 20:28:08 +00:00 |
|
Dylan K. Taylor
|
23e5ade77e
|
Merge branch 'stable' into master
# Conflicts:
# build/make-release.php
# composer.lock
# resources/vanilla
# src/plugin/PluginDescription.php
# src/pocketmine/entity/Human.php
|
2020-10-21 16:55:52 +01:00 |
|
Dylan K. Taylor
|
44e446b621
|
Merge remote-tracking branch 'origin/stable' into master
# Conflicts:
# build/php
# composer.lock
# phpstan.neon.dist
# resources/vanilla
# src/pocketmine/Server.php
# src/pocketmine/VersionInfo.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/lang/locale
# src/utils/Timezone.php
# tests/phpstan/bootstrap.php
# tests/phpstan/configs/custom-leveldb.neon
|
2020-10-13 17:51:49 +01:00 |
|
Dylan K. Taylor
|
163c3855eb
|
Merge branch 'next-minor'
# Conflicts:
# resources/vanilla
# src/plugin/PluginBase.php
# src/plugin/PluginDescription.php
# src/pocketmine/Player.php
# src/pocketmine/network/rcon/RCON.php
# src/pocketmine/network/rcon/RCONInstance.php
# src/pocketmine/scheduler/AsyncTask.php
# src/pocketmine/tile/Spawnable.php
# src/scheduler/AsyncPool.php
# src/utils/Config.php
# src/utils/Timezone.php
# src/utils/UUID.php
# src/utils/Utils.php
# src/world/format/io/region/RegionLoader.php
|
2020-04-19 11:13:41 +01:00 |
|
Dylan K. Taylor
|
ca909ebc1d
|
Merge branch 'next-minor'
|
2020-03-10 13:05:37 +00:00 |
|
Dylan K. Taylor
|
b4b1877ce5
|
Merge branch 'next-minor'
|
2020-03-09 14:38:15 +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
|
19a6fb35e7
|
Merge commit 'd94995e161d71659e2fe6ec1df47621f2de4b494'
# Conflicts:
# resources/vanilla
|
2020-01-31 19:46:28 +00:00 |
|
Dylan K. Taylor
|
cd55cdf5c6
|
Merge commit '9cd6b3e1c7cd81d0a4b0da68d9b3ff026c9f6495'
|
2020-01-22 15:04:06 +00:00 |
|
Dylan K. Taylor
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
Dylan K. Taylor
|
aba71762e9
|
master-specific @var annotations
|
2020-01-09 17:50:01 +00:00 |
|
Dylan K. Taylor
|
e0ed123236
|
Merge commit 'cda3e6f4dcc5a642c6c2597b77df7f29ecbb9397'
|
2020-01-09 16:49:04 +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
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|