Dylan K. Taylor cb16f5c142 Merge commit '260ac47588c76a2e6814cfba46773a990fb8c5da' ...

# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/lang/Language.php
#	src/network/mcpe/protocol/AddItemActorPacket.php
#	src/network/mcpe/protocol/AddPlayerPacket.php
#	src/network/mcpe/protocol/SetActorDataPacket.php
#	src/network/mcpe/serializer/NetworkBinaryStream.php
#	src/permission/Permission.php
#	src/pocketmine/block/Leaves.php
#	src/pocketmine/entity/DataPropertyManager.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/item/Banner.php
#	src/pocketmine/item/Item.php
#	src/pocketmine/level/format/io/LevelProvider.php
#	src/pocketmine/level/format/io/LevelProviderManager.php
#	src/pocketmine/network/mcpe/protocol/AddActorPacket.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
#	src/pocketmine/tile/Banner.php
#	src/scheduler/BulkCurlTask.php
#	src/updater/AutoUpdater.php
#	src/utils/Config.php
#	src/utils/Utils.php
#	src/world/generator/Flat.php
#	src/world/generator/Generator.php

2020-01-31 21:07:34 +00:00

..

php @ 7e985c932a

update build/php submodule to pmmp/php-build-scripts@7e985c932a

2019-11-29 11:56:36 +00:00

preprocessor @ 4d4d2a74a6

Use 10 bits for Y coordinate in blockhash

2019-06-22 15:53:56 +01:00

make-release.php

build/make-release: remove redundant require_once

2019-12-17 11:47:07 +00:00

server-phar.php

Merge commit '260ac47588c76a2e6814cfba46773a990fb8c5da'

2020-01-31 21:07:34 +00:00