5 Commits

Author	SHA1	Message	Date
Dylan K. Taylor	75e3a0aa0f	Merge branch 'stable' into master ... # Conflicts: # composer.lock # resources/vanilla # src/command/defaults/StatusCommand.php # src/pocketmine/entity/Entity.php # src/pocketmine/level/format/SubChunk.php	2020-09-26 13:27:08 +01:00
Dylan K. Taylor	4a88db7f43	travis: update pthreads to pmmp/pthreads@b81ab29df5	2020-09-11 14:30:22 +01:00
Dylan K. Taylor	773069d1cc	fix travis build	2020-09-08 21:09:39 +01:00
Dylan K. Taylor	3042c74aa5	Merge branch 'stable' into master	2020-08-21 21:41:29 +01:00
Dylan K. Taylor	4fe3401182	travis: moved PHP-specific configuration to its own YAML file ... this allows it to be imported by other repos using the same config (for example plugins needing PHPStan analysis) without them needing to copy paste big blocks of shit every time something little changes.	2020-08-21 17:42:47 +01:00