Dylan K. Taylor
|
a2677eba02
|
Merge commit 'f3063e797fab56ff8d0213c8e5a3904085a6eb79'
# Conflicts:
# resources/vanilla
# src/pocketmine/level/format/io/ChunkUtils.php
|
2020-06-17 20:43:30 +01:00 |
|
Dylan K. Taylor
|
d2130265f8
|
Merge commit '8dcc88712c6b8a4d4a0c6be2f6b908ae85378209'
# Conflicts:
# resources/vanilla
# src/pocketmine/level/format/io/ChunkUtils.php
# tests/phpstan/configs/l7-baseline.neon
|
2020-06-17 20:42:28 +01: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 |
|