|
|
4520660025
|
Merge commit 'f3e436592a180c8d4fbcd346a97abdd746056c38'
# Conflicts:
# resources/vanilla
|
2020-05-18 10:30:55 +01:00 |
|
|
|
fb1126797a
|
Merge branch 'stable'
|
2020-02-07 18:13:55 +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 |
|
|
|
4651bcf8c3
|
master: imports cleanup
it was easier to make an empty merge and re-run php-cs-fixer afterwards.
|
2019-12-11 23:23:03 +00:00 |
|
|
|
15694279c7
|
Merge branch 'stable'
|
2019-09-18 13:30:58 +01:00 |
|
|
|
d87b6f9ff7
|
Remove resource pack packets dependency on ResourcePack, now supports decoding
|
2019-08-08 19:36:54 +01:00 |
|
|
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|
