64 Commits

Author SHA1 Message Date
Dylan K. Taylor
f1fd8a13e9 Merge commit '1fb5043eb1b495e6926caecf3fb493837724c770'
# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l8-baseline.neon
2020-06-17 20:46:18 +01:00
Dylan K. Taylor
1fb5043eb1 build/server-phar: fixed a phpstan level 8 error 2020-06-15 23:16:40 +01:00
Dylan K. Taylor
586f265033 update build/php submodule to pmmp/php-build-scripts@2f422db397 2020-06-13 11:17:58 +01:00
Dylan K. Taylor
a219b727f2 updated build/php submodule to pmmp/php-build-scripts@cec63c3093 2020-06-13 11:14:21 +01:00
Dylan K. Taylor
f3bcd04e87 update build/php submodule to pmmp/php-build-scripts@fd749b299a 2020-06-04 14:16:45 +01:00
Dylan K. Taylor
00916ade0c update build/php submodule to pmmp/php-build-scripts@0aa88d2765 2020-06-04 13:55:03 +01:00
Dylan K. Taylor
1974afec78 updated build/php submodule to pmmp/pthreads@653d685628 2020-05-31 15:04:37 +01:00
Dylan K. Taylor
10279e11ed updated build/php submodule to pmmp/php-build-scripts@d475b694e4 2020-05-31 14:33:26 +01:00
Dylan K. Taylor
3c367c70cd update build/php submodule to pmmp/php-build-scripts@8084604600 2020-05-18 10:44:29 +01:00
Dylan K. Taylor
f1d378468e updated build/php submodule to pmmp/php-build-scripts@a6ab41089e 2020-05-18 09:44:43 +01:00
Dylan K. Taylor
67247b2e81 fix make-release 2020-04-19 13:53:06 +01:00
Dylan K. Taylor
35be36961d Merge tag '3.11.7' 2020-04-18 11:29:47 +01:00
Dylan K. Taylor
5f33ef35e3 build: allow providing a git hash 2020-04-09 21:13:54 +01:00
Dylan K. Taylor
af53c85e6a Merge branch 'next-minor' 2020-03-12 11:48:26 +00:00
Dylan K. Taylor
2020fcd18e updated build/php submodule 2020-03-12 11:47:15 +00:00
Dylan K. Taylor
8a770d837e Merge branch 'stable' 2020-02-24 20:32:43 +00:00
Dylan K. Taylor
dbe7caab7b updated build/preprocessor submodule 2020-02-14 08:21:46 +00:00
Dylan K. Taylor
b581fab31a updated build/php submodule 2020-02-14 08:19:23 +00:00
Dylan K. Taylor
fb1126797a Merge branch 'stable' 2020-02-07 18:13:55 +00:00
Dylan K. Taylor
fa82cb26d8 added native types to closures (phpstan-strict-rules) 2020-02-05 16:35:10 +00:00
Dylan K. Taylor
fd2a7797bd include make-release.php in phpstan analysis 2020-02-05 15:55:41 +00:00
Dylan K. Taylor
e1eb9186fe Merge branch 'stable' 2020-02-03 19:57:21 +00:00
Dylan K. Taylor
0e35ee8cb7 build/server-phar: drop unused imports 2020-02-03 11:18:21 +00:00
Dylan K. Taylor
da5b7f47df build/server-phar: import global functions 2020-02-03 11:17:51 +00:00
Dylan K. Taylor
d418dd7a09 build/make-release: fix formatting 2020-02-03 11:17:16 +00:00
Dylan K. Taylor
f3209ccc33 build/make-release: remove unused import 2020-02-03 11:16:51 +00:00
Dylan K. Taylor
afeb9838e4 Merge branch 'stable' 2020-02-02 16:47:19 +00:00
Dylan K. Taylor
963abb718f build/server-phar: compress using gzip (except stub)
this produces a 75% reduction in phar size, at the expense of a slight degradation of autoloading speed and needing a writable tmpdir.
2020-02-02 16:27:38 +00:00
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
Dylan K. Taylor
96ac95798b Merge commit '4ff4434a220813e446efde4a38e48a0416476dba'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/item/Banner.php
#	src/pocketmine/item/Item.php
2020-01-31 20:11:29 +00:00
Dylan K. Taylor
260ac47588 add some phpstan array types 2020-01-30 22:23:11 +00:00
Dylan K. Taylor
4ff4434a22 build/server-phar: mark metadata as mixed[] 2020-01-30 21:49:52 +00:00
Dylan K. Taylor
dd5be9692c Merge commit '5cd7e11b298a35bf796b41b577c28441e41ff411' 2020-01-04 16:24:29 +00:00
Dylan K. Taylor
08e3b8ffdc build: added specialized script to create a server phar
this is much easier to use than devtools, and allows us to make additional specializations for PM build that would otherwise just be a colossal pain in the ass.
2020-01-04 14:56:53 +00:00
Dylan K. Taylor
e845415b17 Merge commit 'b08c38f8f9615e47ae3e5df8267b8986aadabead'
# Conflicts:
#	resources/vanilla
2019-12-25 13:52:50 +00:00
Dylan K. Taylor
b08c38f8f9 build/make-release: remove redundant require_once
this is included by vendor/autoload.php since 3.7.x.
2019-12-17 11:47:07 +00:00
Dylan K. Taylor
994781494f Merge branch 'next-minor' 2019-11-29 12:06:27 +00:00
Dylan K. Taylor
8ee3d4486a update build/php submodule to pmmp/php-build-scripts@7e985c932a 2019-11-29 11:56:36 +00:00
Dylan K. Taylor
3e4e0d51df Merge branch 'stable' into next-minor 2019-11-29 11:55:12 +00:00
Dylan K. Taylor
f2ac63d235 update build/php submodule to pmmp/php-build-scripts@8308571448 2019-11-29 11:54:42 +00:00
SOFe
cb76f8a5df
Merge branch 'stable' into next-minor 2019-11-21 23:21:16 +08:00
Dylan K. Taylor
314ce1d012 build/make-release: push after 5 seconds instead of 10 2019-11-11 16:41:50 +00:00
Dylan K. Taylor
c16337a80f Merge branch 'stable' with changes 2019-11-09 18:01:04 +00:00
Dylan K. Taylor
2a6ffb5aa9 updated build/php submodule 2019-11-09 17:33:25 +00:00
Dylan K. Taylor
e4d2a4d911 canary: update build/php submodule 2019-10-24 13:30:05 +01:00
Dylan K. Taylor
86c7870427 update build/php submodule 2019-10-24 13:28:27 +01:00
Dylan K. Taylor
0591458ef6 Merge branch 'stable' into next-minor 2019-10-22 18:49:22 +01:00
Dylan K. Taylor
f63857deed update build/php submodule to pmmp/php-build-scripts@1b3fe3120c 2019-10-22 10:15:29 +01:00
Dylan K. Taylor
6dd1cdc413 sync php submodule version 2019-08-14 18:22:08 +01:00
Dylan K. Taylor
200bcb485e Merge branch 'stable' 2019-08-14 18:20:55 +01:00