Dylan K. Taylor
|
0025196a81
|
Merge branch 'next-minor'
# Conflicts:
# resources/vanilla
# src/network/upnp/UPnP.php
|
2020-05-23 11:16:19 +01:00 |
|
Dylan K. Taylor
|
f9a587d40e
|
imports cleanup
|
2020-04-28 17:27:38 +01:00 |
|
Dylan K. Taylor
|
163c3855eb
|
Merge branch 'next-minor'
# Conflicts:
# resources/vanilla
# src/plugin/PluginBase.php
# src/plugin/PluginDescription.php
# src/pocketmine/Player.php
# src/pocketmine/network/rcon/RCON.php
# src/pocketmine/network/rcon/RCONInstance.php
# src/pocketmine/scheduler/AsyncTask.php
# src/pocketmine/tile/Spawnable.php
# src/scheduler/AsyncPool.php
# src/utils/Config.php
# src/utils/Timezone.php
# src/utils/UUID.php
# src/utils/Utils.php
# src/world/format/io/region/RegionLoader.php
|
2020-04-19 11:13:41 +01:00 |
|
Dylan K. Taylor
|
3a68f5e3d0
|
Merge commit 'da43ae82fe3b8839a4d153b0365f815cf9859d77'
# Conflicts:
# resources/vanilla
# src/utils/Config.php
# src/utils/Timezone.php
# src/utils/Utils.php
|
2020-01-31 20:02:39 +00:00 |
|
Dylan K. Taylor
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
Dylan K. Taylor
|
cda1143a79
|
Merge branch 'stable'
|
2020-01-09 17:17:42 +00:00 |
|
Dylan K. Taylor
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|