mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-28 13:45:52 +00:00
Code Issues Projects Releases Wiki Activity
13,287 Commits 20 Branches 445 Tags
Commit Graph

2 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
5499ac620c Removed pocketmine subdirectory, map PSR-4 style 2019-07-30 19:14:57 +01:00