66 Commits

Author	SHA1	Message	Date
Dylan K. Taylor	fb1126797a	Merge branch 'stable'	2020-02-07 18:13:55 +00:00
Dylan K. Taylor	f65bf76fd8	Merge commit '799183e13e61e89cc6820ad3132a4147454017c6' ... # Conflicts: # resources/vanilla # src/Server.php # src/pocketmine/entity/Entity.php # src/pocketmine/level/format/io/LevelProviderManager.php # src/pocketmine/tile/Tile.php # src/world/generator/GeneratorManager.php	2020-01-31 21:26:40 +00:00
Dylan K. Taylor	19a6fb35e7	Merge commit 'd94995e161d71659e2fe6ec1df47621f2de4b494' ... # Conflicts: # resources/vanilla	2020-01-31 19:46:28 +00:00
Dylan K. Taylor	5c4487c980	added some callable prototypes for phpstan	2020-01-29 19:56:16 +00:00
Dylan K. Taylor	055b13a6cf	strip extra blank lines (php-cs-fixer)	2020-01-22 15:14:10 +00:00
Dylan K. Taylor	cd55cdf5c6	Merge commit '9cd6b3e1c7cd81d0a4b0da68d9b3ff026c9f6495'	2020-01-22 15:04:06 +00:00
Dylan K. Taylor	1b33143f4f	pass 2, manual removal of incorrect non-nullable phpdoc types	2020-01-22 12:06:47 +00:00
Dylan K. Taylor	67bcc1c0fb	phpdoc armageddon for master, pass 1	2020-01-22 11:55:03 +00:00
Dylan K. Taylor	bcc3e20c31	DiskResourceProvider: do not arbitrarily suffix /resources/	2019-12-13 17:58:53 +00:00
Dylan K. Taylor	4651bcf8c3	master: imports cleanup ... it was easier to make an empty merge and re-run php-cs-fixer afterwards.	2019-12-11 23:23:03 +00:00
Dylan K. Taylor	dc5d985cf4	Merge branch 'next-minor'	2019-12-04 11:23:30 +00:00
Dylan K. Taylor	b7665fd906	remove unused imports	2019-10-20 21:26:22 +01:00
Dylan K. Taylor	e5b02ee5e0	make logic for fetching handler lists more consistent	2019-08-23 17:16:07 +01:00
Dylan K. Taylor	9321eef683	Merge branch 'stable'	2019-08-16 16:49:24 +01:00
Dylan K. Taylor	aa5395d6ed	Merge branch 'next-minor'	2019-08-02 16:35:17 +01:00
Dylan K. Taylor	5499ac620c	Removed pocketmine subdirectory, map PSR-4 style	2019-07-30 19:14:57 +01:00