|
|
561fc62232
|
Merge remote-tracking branch 'origin/stable'
# Conflicts:
# .github/workflows/main.yml
# resources/vanilla
# src/pocketmine/VersionInfo.php
# src/world/format/io/region/RegionLoader.php
|
2021-02-03 17:32:47 +00:00 |
|
|
|
3e1ac66abf
|
Merge branch 'stable'
|
2021-02-02 13:46:29 +00:00 |
|
|
|
69a829db91
|
Merge remote-tracking branch 'origin/stable'
|
2021-01-20 22:16:44 +00:00 |
|
|
|
5fa4e284bf
|
Merge branch 'stable'
|
2020-12-27 19:35:27 +00:00 |
|
|
|
75e3a0aa0f
|
Merge branch 'stable' into master
# Conflicts:
# composer.lock
# resources/vanilla
# src/command/defaults/StatusCommand.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/level/format/SubChunk.php
|
2020-09-26 13:27:08 +01:00 |
|
|
|
7d73630fb7
|
Merge branch 'stable'
# Conflicts:
# resources/vanilla
# src/world/format/io/region/RegionGarbageMap.php
# src/world/format/io/region/RegionLoader.php
# tests/phpstan/configs/l7-baseline.neon
# tests/phpunit/world/format/io/region/RegionLocationTableEntryTest.php
|
2020-06-15 20:10:15 +01:00 |
|
|
|
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 |
|
|
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
|
|
96b91af66a
|
Merge branch 'stable'
|
2020-01-11 21:41:38 +00:00 |
|
|
|
cda1143a79
|
Merge branch 'stable'
|
2020-01-09 17:17:42 +00:00 |
|
|
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|
