Dylan K. Taylor a8180cdf0b Merge commit 'df76c02e7ac3bfbde8ecb597653779e8e1516f58' ...

# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l7-baseline.neon

2020-06-26 19:14:25 +01:00

..

AssumptionFailedError.php

Merge commit 'a2543ff80d2906bccda1a4e2fdbd9d8e7d147fb3'

2020-04-18 17:33:05 +01:00

CloningRegistryTrait.php

Unhackify Registry member cloning, fixes #3519

2020-05-21 11:38:02 +01:00

Config.php

Merge branch 'next-minor'

2020-04-19 11:13:41 +01:00

EnumTrait.php

Force types of RegistryTrait usages to shut PHPStan up

2020-05-21 19:12:48 +01:00

Filesystem.php

Merge commit 'df76c02e7ac3bfbde8ecb597653779e8e1516f58'

2020-06-26 19:14:25 +01:00

Git.php

phpdoc armageddon for master, pass 1

2020-01-22 11:55:03 +00:00

Internet.php

imports cleanup

2020-04-28 17:27:38 +01:00

InternetException.php

Removed pocketmine subdirectory, map PSR-4 style

2019-07-30 19:14:57 +01:00

MainLogger.php

MainLogger: fix exception messages always reporting ErrorTypeToStringMap source if they have non-zero code

2020-05-19 22:43:44 +01:00

Process.php

Merge branch 'next-minor'

2020-05-23 11:16:19 +01:00

Random.php

Merge commit 'ff3af492f'

2020-05-20 20:20:47 +01:00

RegistryTrait.php

(master) imports cleanup

2020-06-14 19:29:33 +01:00

ReversePriorityQueue.php

Merge commit 'd8d994351'

2020-06-14 19:47:21 +01:00

ServerException.php

Removed pocketmine subdirectory, map PSR-4 style

2019-07-30 19:14:57 +01:00

ServerKiller.php

Merge branch 'stable'

2020-02-07 18:13:55 +00:00

SingletonTrait.php

SingletonTrait: added setInstance()

2020-04-28 14:31:56 +01:00

Terminal.php

Merge branch 'next-minor'

2020-05-23 11:16:19 +01:00

TextFormat.php

Merge commit 'a4e250a3e61cbf1e75fe2785e71158f16a4a9039'

2020-06-17 20:48:19 +01:00

Timezone.php

Merge commit 'a7f10d8cc'

2020-06-13 11:52:17 +01:00

Utils.php

(master) imports cleanup

2020-06-14 19:29:33 +01:00

VersionString.php

strip extra blank lines (php-cs-fixer)

2020-01-22 15:14:10 +00:00