mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +00:00
Code Issues Projects Releases Wiki Activity
12,006 Commits 19 Branches 449 Tags
64e9647334b0dbe5c637e416c4ff40f408dac104
Commit Graph

3 Commits

Author SHA1 Message Date
Dylan K. Taylor
64e9647334 Merge branch 'stable' 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/convert/LegacySkinAdapter.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/phpstan-bugs.neon
 2020-06-19 10:48:27 +01:00
Dylan K. Taylor
e6a3f7baa2 Merge branch 'stable' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-17 22:23:17 +01:00
Dylan K. Taylor
f3d7c320a1 move SkinAdapter stuff to convert package 2020-04-23 15:46:37 +01:00