Dylan K. Taylor f24be2b055 Merge branch 'stable' into next-minor ...

# Conflicts:
#	src/pocketmine/Player.php
#	src/pocketmine/block/SnowLayer.php

2020-06-01 13:42:59 +01:00

..

block

strip extra blank lines (php-cs-fixer)

2020-01-22 14:50:29 +00:00

entity

Merge branch 'stable' into next-minor

2020-06-01 13:42:59 +01:00

inventory

Mass removal of useless @param/@return PHPDoc annotations, pass 1

2020-01-21 15:10:18 +00:00

level

strip extra blank lines (php-cs-fixer)

2020-01-22 14:50:29 +00:00

player

Merge branch 'stable' into next-minor

2020-05-20 19:36:20 +01:00

plugin

strip extra blank lines (php-cs-fixer)

2020-01-22 14:50:29 +00:00

server

Process: split getMemoryUsage() into 2 functions

2020-03-13 17:32:17 +00:00

Cancellable.php

strip extra blank lines (php-cs-fixer)

2020-01-22 14:50:29 +00:00

Event.php

Mass removal of useless @param/@return PHPDoc annotations, pass 1

2020-01-21 15:10:18 +00:00

EventPriority.php

Mass removal of useless @param/@return PHPDoc annotations, pass 1

2020-01-21 15:10:18 +00:00

HandlerList.php

strip extra blank lines (php-cs-fixer)

2020-01-22 14:50:29 +00:00

Listener.php

Listener: Add documentation on functionality (#2292)

2018-07-12 19:24:46 +01:00