Dylan K. Taylor
|
d840e8c4d4
|
Merge commit 'a34f3261c'
# Conflicts:
# resources/vanilla
# src/event/entity/EntityExplodeEvent.php
# src/pocketmine/event/block/SignChangeEvent.php
# src/utils/Utils.php
|
2020-07-04 22:39:40 +01:00 |
|
Dylan K. Taylor
|
1f90aa07aa
|
Merge branch 'stable'
# Conflicts:
# resources/vanilla
# src/command/defaults/TeleportCommand.php
# src/pocketmine/event/entity/EntityDespawnEvent.php
# src/pocketmine/event/entity/EntityInventoryChangeEvent.php
# src/pocketmine/event/entity/EntityLevelChangeEvent.php
# src/pocketmine/event/entity/EntitySpawnEvent.php
# tests/phpstan/configs/actual-problems.neon
|
2020-06-21 00:30:45 +01: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
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|