mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-11 14:05:35 +00:00
Code Issues Projects Releases Wiki Activity
12,421 Commits 16 Branches 441 Tags
Commit Graph

11 Commits

Author SHA1 Message Date
Dylan K. Taylor
98db4c5200 Merge branch 'stable' into master 
# Conflicts:
#	.gitmodules
#	composer.lock
#	resources/vanilla
#	src/network/mcpe/protocol/PlayerAuthInputPacket.php
#	src/pocketmine/Player.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
 2020-08-10 17:55:49 +01:00
Dylan K. Taylor
3473254d01 added Timings::INCLUDED_BY_OTHER_TIMINGS constant 2020-05-24 16:09:45 +01:00
Dylan K. Taylor
fb1126797a Merge branch 'stable' 2020-02-07 18:13:55 +00:00
Dylan K. Taylor
5c4487c980 added some callable prototypes for phpstan 2020-01-29 19:56:16 +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
0050e12515 Merge commit '9232f4509c4b74718bce2d8f33ba71ca74b38d97' 
# Conflicts:
#	resources/vanilla
 2020-01-04 16:21:31 +00:00
Dylan K. Taylor
d25e0c3d98 Merge commit 'cef77907c6b21e1fb167bc3085d00a5b1e740813' 
# Conflicts:
#	resources/vanilla
#	src/timings/TimingsHandler.php
 2020-01-04 16:21:05 +00:00
Dylan K. Taylor
6968a4232e Merge commit 'd83820477fe905a85a4d1fd11bad1dba211f0f4f' 2019-12-25 14:20:38 +00:00
Dylan K. Taylor
a9c09e4517 Merge branch 'next-minor' 2019-12-12 13:52:14 +00:00
Dylan K. Taylor
5499ac620c Removed pocketmine subdirectory, map PSR-4 style 2019-07-30 19:14:57 +01:00