Dylan K. Taylor
|
0aee39027e
|
Merge branch 'stable' into master
# Conflicts:
# composer.lock
# resources/vanilla
# src/entity/Living.php
# src/pocketmine/Player.php
# src/pocketmine/VersionInfo.php
# src/pocketmine/block/Potato.php
# src/pocketmine/block/Sugarcane.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/item/Item.php
# src/pocketmine/level/format/Chunk.php
# src/pocketmine/level/format/io/leveldb/LevelDB.php
# src/world/generator/GeneratorRegisterTask.php
# tests/phpstan/configs/check-explicit-mixed-baseline.neon
# tests/phpstan/configs/l7-baseline.neon
# tests/phpstan/configs/l8-baseline.neon
# tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMainLoggerTest.php
# tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMemoryLeakTest.php
# tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskPublishProgressRaceTest.php
|
2020-09-04 01:43:52 +01:00 |
|
Dylan K. Taylor
|
fb1126797a
|
Merge branch 'stable'
|
2020-02-07 18:13:55 +00:00 |
|
Dylan K. Taylor
|
464b2116a6
|
Merge remote-tracking branch 'origin/stable'
|
2019-10-01 14:41:54 +01:00 |
|
Dylan K. Taylor
|
735efeaa13
|
Merge branch 'stable'
|
2019-09-26 11:30:36 +01:00 |
|
Dylan K. Taylor
|
15694279c7
|
Merge branch 'stable'
|
2019-09-18 13:30:58 +01:00 |
|
Dylan K. Taylor
|
e82a40b2ba
|
forgot to stage this for b18bd4f33ce606ad594b56dd4785b650d21cd695
|
2019-06-18 17:37:38 +01:00 |
|
Dylan K. Taylor
|
57219abc9d
|
fix test failure
|
2019-05-18 20:20:33 +01:00 |
|
Dylan K. Taylor
|
9ad30e239a
|
Merge branch 'release/3.2'
|
2018-08-19 10:37:20 +01:00 |
|