|
|
da798817b5
|
Merge branch 'stable'
# Conflicts:
# changelogs/3.14.md
# resources/vanilla
# src/VersionInfo.php
# src/entity/Attribute.php
|
2020-07-08 11:46:02 +01:00 |
|
|
|
b09379151a
|
MainLogger: fix exception messages always reporting ErrorTypeToStringMap source if they have non-zero code
|
2020-05-19 22:43:44 +01:00 |
|
|
|
3299bc4023
|
start using pocketmine/errorhandler
|
2020-05-10 13:04:40 +01:00 |
|
|
|
f5cd87ac95
|
MainLogger: implement BufferedLogger
|
2020-04-01 20:09:42 +01:00 |
|
|
|
fb1126797a
|
Merge branch 'stable'
|
2020-02-07 18:13:55 +00:00 |
|
|
|
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 |
|
|
|
721bd8f02b
|
Merge commit 'd3021c628134293c2b8af505806efc2fba4fe947'
# Conflicts:
# resources/vanilla
|
2020-01-31 20:03:27 +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 |
|
|
|
9c06c1a06f
|
Merge branch 'stable'
|
2020-01-11 22:36:57 +00:00 |
|
|
|
43601e57bf
|
Merge branch 'stable'
|
2020-01-09 21:08:16 +00:00 |
|
|
|
ebbb99b96b
|
Merge branch 'next-minor'
|
2019-10-22 19:05:11 +01:00 |
|
|
|
3eea2442a7
|
move filesystem-related functions to pocketmine\utils\Filesystem
|
2019-08-25 17:36:50 +01:00 |
|
|
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|
