|
7e6adc41f0
|
Merge 1.16 support into PM4 (with changes)
|
2020-06-26 22:21:09 +01:00 |
|
|
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 |
|
|
e6a3f7baa2
|
Merge branch 'stable'
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
|
2020-06-17 22:23:17 +01:00 |
|
|
a686840e5e
|
RuntimeBlockMapping: fixed palette cache never being initialized
I must have been very tired when I wrote this code
|
2020-06-17 21:33:56 +01:00 |
|
|
333ed8ed2f
|
RuntimeBlockMapping: remove unnecessary nullable flag
|
2020-06-17 21:32:51 +01:00 |
|
|
465285b3c2
|
do not rely on GameMode::getMagicNumber() to match protocol IDs
|
2020-06-13 12:26:17 +01:00 |
|
|
570a709059
|
Merge commit '3ec2994d7f05f30e2519430379ae0f3106be5074'
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
|
2020-05-20 19:52:03 +01:00 |
|
|
07f979fbde
|
RuntimeBlockMapping: bedrockKnownStates is never null
|
2020-05-18 17:54:27 +01:00 |
|
|
6b037d6a4c
|
RuntimeBlockMapping: these IDs are not static any more
|
2020-05-11 12:40:55 +01:00 |
|
|
dbd51610c3
|
TypeConverter: use SingletonTrait
|
2020-05-05 19:22:20 +01:00 |
|
|
f9a587d40e
|
imports cleanup
|
2020-04-28 17:27:38 +01:00 |
|
|
a97cafd4f6
|
moving serializers into protocol namespace
|
2020-04-27 13:54:39 +01:00 |
|
|
0397204c68
|
network/mcpe: imports cleanup
|
2020-04-27 12:56:28 +01:00 |
|
|
b1eff87ad1
|
fix incorrect conversion of CreateItemAction, close #3436 (#3437)
|
2020-04-25 10:21:40 +01:00 |
|
|
a75241ef03
|
RuntimeBlockMapping: use SingletonTrait
|
2020-04-24 21:32:47 +01:00 |
|
|
3a42c21cc1
|
wrap up block_id_map in a class
|
2020-04-24 21:28:27 +01:00 |
|
|
ff915b829c
|
StartGamePacket: remove hardcoded cache, move to RuntimeBlockMapping
|
2020-04-24 20:50:56 +01:00 |
|
|
287bf4274f
|
move RuntimeBlockMapping to convert package
|
2020-04-24 12:42:43 +01:00 |
|
|
5a94af40e2
|
Convert ItemFactory to singleton
|
2020-04-24 00:18:31 +01:00 |
|
|
f3d7c320a1
|
move SkinAdapter stuff to convert package
|
2020-04-23 15:46:37 +01:00 |
|
|
ebcfab4b61
|
NetworkInventoryAction: move type translation to TypeConverter
|
2020-04-23 15:40:23 +01:00 |
|
|
18d48869a0
|
the great airgapping of recipes and itemstacks
|
2020-04-23 14:11:48 +01:00 |
|