10 Commits

Author SHA1 Message Date
Dylan K. Taylor
fe649d8d70 Extract ServerConfigGroup from Server
this API isn't very nice, but it's pretty much the same as the original, and at least this can be _kinda_ unit-tested...
2020-05-24 15:48:03 +01:00
Dylan K. Taylor
cc8aed5979 Merge commit '56883f9ff9d2a0934dd3585e565d109ea322f583'
# Conflicts:
#	resources/vanilla
2020-05-13 13:51:55 +01:00
Dylan K. Taylor
152da604be MemoryManager::dumpMemory() should never throw an exception that matters to calling code 2020-05-12 22:37:23 +01:00
Dylan K. Taylor
d4594d6114 Merge commit '06a9c98'
# Conflicts:
#	resources/vanilla
2020-04-18 13:48:26 +01:00
Dylan K. Taylor
7b3c2a3703 Merge commit '3907a2b6ba58fa49022e3e7c8256731dfa2e0d00' 2020-03-14 13:32:35 +00:00
Dylan K. Taylor
fb1126797a Merge branch 'stable' 2020-02-07 18:13:55 +00:00
Dylan K. Taylor
055b13a6cf strip extra blank lines (php-cs-fixer) 2020-01-22 15:14:10 +00:00
Dylan K. Taylor
67bcc1c0fb phpdoc armageddon for master, pass 1 2020-01-22 11:55:03 +00:00
Dylan K. Taylor
96b91af66a Merge branch 'stable' 2020-01-11 21:41:38 +00:00
Dylan K. Taylor
5499ac620c Removed pocketmine subdirectory, map PSR-4 style 2019-07-30 19:14:57 +01:00