|
|
f65bf76fd8
|
Merge commit '799183e13e61e89cc6820ad3132a4147454017c6'
# Conflicts:
# resources/vanilla
# src/Server.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/level/format/io/LevelProviderManager.php
# src/pocketmine/tile/Tile.php
# src/world/generator/GeneratorManager.php
|
2020-01-31 21:26:40 +00:00 |
|
|
|
055b13a6cf
|
strip extra blank lines (php-cs-fixer)
|
2020-01-22 15:14:10 +00:00 |
|
|
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
|
|
39d5903c3e
|
Remove INT32_MIN and INT32_MAX global constants
|
2019-08-25 16:09:51 +01:00 |
|
|
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|
