Dylan K. Taylor
|
d39348929f
|
Removed PLUGIN_PATH constant
|
2020-12-09 20:48:50 +00:00 |
|
Dylan K. Taylor
|
ff6672ba85
|
Merge branch 'stable'
# Conflicts:
# resources/vanilla
# src/utils/Utils.php
|
2020-12-09 20:27:19 +00:00 |
|
Dylan K. Taylor
|
22c8bdeeeb
|
Merge branch 'stable'
# Conflicts:
# resources/vanilla
# src/CrashDump.php
# src/utils/Utils.php
|
2020-12-09 01:47:05 +00:00 |
|
Dylan K. Taylor
|
a8180cdf0b
|
Merge commit 'df76c02e7ac3bfbde8ecb597653779e8e1516f58'
# Conflicts:
# resources/vanilla
# tests/phpstan/configs/l7-baseline.neon
|
2020-06-26 19:14:25 +01:00 |
|
Dylan K. Taylor
|
5b7a55660f
|
Merge commit '786f416f2ef31726b9e6fa0a5edde36aecddf085'
# Conflicts:
# resources/vanilla
# src/plugin/PluginBase.php
# src/utils/Utils.php
|
2020-05-19 21:19:44 +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
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
Dylan K. Taylor
|
9c06c1a06f
|
Merge branch 'stable'
|
2020-01-11 22:36:57 +00:00 |
|
Dylan T
|
d456cb2419
|
Filesystem: added some documentation for createLockFile() and releaseLockFile()
[ci skip]
|
2019-10-07 10:03:29 +01:00 |
|
Dylan K. Taylor
|
6e692d76d5
|
make lock-file code more reusable
|
2019-08-25 18:50:33 +01:00 |
|
Dylan K. Taylor
|
3eea2442a7
|
move filesystem-related functions to pocketmine\utils\Filesystem
|
2019-08-25 17:36:50 +01:00 |
|