mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity
18,148 Commits 15 Branches 438 Tags
Commit Graph

102 Commits

Author SHA1 Message Date
Dylan K. Taylor
8d5cc9adc3
Merge branch 'stable' 2021-02-07 20:57:19 +00:00
Dylan K. Taylor
197b1a8566 Merge branch 'stable' 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/protocol/types/inventory/stackresponse/ItemStackResponseSlotInfo.php
#	src/network/mcpe/raklib/FilterTextPacket.php
#	src/pocketmine/VersionInfo.php
#	src/pocketmine/network/mcpe/protocol/PacketPool.php
#	src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php
 2020-12-08 21:34:06 +00:00
Ifera
c4b47c6c06 Implemented /clear command (#3854) 
closes #3854
 2020-12-06 15:26:12 +00:00
Dylan K. Taylor
4520e425c1 Sync BedrockData submodule with merge 
I forgot to commit this in the merge ...
 2020-11-21 21:17:23 +00:00
Dylan K. Taylor
e8ec65766c Updated resources/locale to pmmp/Language@884a0496c3 2020-10-13 17:52:47 +01:00
Dylan K. Taylor
44e446b621 Merge remote-tracking branch 'origin/stable' into master 
# Conflicts:
#	build/php
#	composer.lock
#	phpstan.neon.dist
#	resources/vanilla
#	src/pocketmine/Server.php
#	src/pocketmine/VersionInfo.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/lang/locale
#	src/utils/Timezone.php
#	tests/phpstan/bootstrap.php
#	tests/phpstan/configs/custom-leveldb.neon
 2020-10-13 17:51:49 +01:00
Dylan K. Taylor
a35ca1fa71 Merge branch 'stable' into master 2020-08-15 20:32:14 +01:00
Dylan K. Taylor
e1d80f05b1 Merge branch 'stable' into master 2020-08-03 20:14:46 +01:00
Dylan K. Taylor
7e6adc41f0 Merge 1.16 support into PM4 (with changes) 2020-06-26 22:21:09 +01:00
Dylan K. Taylor
9e98666f57 Merge commit 'c4ad39046' 
# Conflicts:
#	resources/vanilla
 2020-06-03 12:31:42 +01:00
Dylan K. Taylor
97a4a53e59 added legacy string item mappings that were unknowingly removed 
these are returned for the sake of backwards compatibility for plugins.
 2020-05-13 22:48:08 +01:00
Dylan K. Taylor
11ef9fb0c0 Item-from-string parsing no longer depends on ItemIds 
after this is done I'm banning the constant() function.
 2020-05-13 00:18:49 +01:00
Dylan K. Taylor
8efe7fcfb0 World: allow configuring blocks-per-tick for random updating 
this makes it much easier to observe and debug stuff that depends on it, such as grass, crop and tree growth, since they'll happen much faster.
A future improvement would be to have the update function use a non-global random so that the output can be reproduced using a given seed.
 2020-05-10 11:50:31 +01:00
Dylan K. Taylor
d48597ec5d move BedrockData submodule to resources/ 2020-02-01 22:14:24 +00:00
Dylan K. Taylor
fed03fd535 Merge branch 'submodule-conflict-stable' into submodule-conflict-master 2020-02-01 22:02:44 +00:00
Dylan K. Taylor
a1610500e9 Merge tag '3.11.1' 2019-12-11 23:35:20 +00:00
Dylan K. Taylor
c85c1c3c3f Merge commit '82d9e481d2a0a389fbbc6dfd3672fc366127febc' 2019-12-11 23:06:35 +00:00
Dylan K. Taylor
464b2116a6 Merge remote-tracking branch 'origin/stable' 2019-10-01 14:41:54 +01:00
Dylan K. Taylor
aa5395d6ed Merge branch 'next-minor' 2019-08-02 16:35:17 +01:00
Dylan K. Taylor
3632e07cdb EffectCommand: Remove internal ID from translated message 2019-07-18 19:29:43 +01:00
Dylan K. Taylor
6a93eb8361 Merge branch 'stable' 2019-07-13 18:08:45 +01:00
Dylan K. Taylor
0d769aab48 Removed anti-noclip checks 2019-06-29 11:10:20 +01:00
Dylan K. Taylor
8c2ca098e1 updated BedrockData submodule 2019-06-25 17:31:10 +01:00
Dylan K. Taylor
73964e6e2f Always do chunk relighting for unlit chunks on load 
this is necessary because we stopped saving light info some time ago, so it has to be calculated on load for things to work properly.
 2019-06-08 17:47:55 +01:00
Dylan K. Taylor
7ec926867f Merge branch 'stable' 2019-04-25 20:54:23 +01:00
Dylan K. Taylor
7d712d68c4 Merge branch 'stable' 2019-04-25 18:31:22 +01:00
Dylan K. Taylor
c5ca623124 Merge branch 'stable' 2019-04-25 15:27:13 +01:00
Dylan K. Taylor
c4b4575c74 Refuse to load plugins with ambiguous minAPI versions 
closes #2381
 2019-04-12 19:51:43 +01:00
Dylan K. Taylor
f0b85936cf Improved /tell 2019-03-31 19:08:35 +01:00
Dylan K. Taylor
01e048c4d1 Move networkStart message to where we actually start network 
i.e. the point at which a normal user can reasonably expect to be able to connect to the server ...
 2019-03-26 14:07:32 +00:00
Dylan K. Taylor
0811ce81e5 Query: remove useless noise 
why do we need 3 log messages for something that does ... basically nothing?
 2019-03-24 19:53:20 +00:00
Dylan T
9c76fb7d96
Implemented plugin loading whitelist/blacklist by config file (#2783) 2019-03-24 16:18:13 +00:00
Dylan K. Taylor
9cddfdf8ec Revert "Move core permissions to default_permissions.yml" 
This reverts commit 5fac5c72816c6e1b137ca59b14e567a9116c2baa.
 2019-03-23 10:41:50 +00:00
Dylan K. Taylor
2e5ef4ba03 Merge remote-tracking branch 'origin/3.7' 2019-03-20 21:35:13 +00:00
Dylan K. Taylor
fa7a4dc22e Fixed warning of bad default format on new installs 2019-03-13 21:43:07 +00:00
Dylan K. Taylor
2e4b3d3d46 Sync legacyID map (thanks @MCMrARM) 2019-03-11 17:38:02 +00:00
Dylan K. Taylor
a858103e6b Support paletted subchunks, drop all formats except leveldb 2019-03-10 19:53:24 +00:00
Dylan K. Taylor
93cd00ae8f Remove dead settings from pocketmine.yml 2019-03-03 13:28:18 +00:00
Dylan K. Taylor
2bffd5cc1c Add timer measurements for autosave 2019-03-02 18:20:25 +00:00
Dylan K. Taylor
382488dd07 sync locale submodule 2019-03-02 17:20:37 +00:00
Dylan K. Taylor
5fac5c7281 Move core permissions to default_permissions.yml 
this is one of the few things that is actually better suited to a YAML file than code
closes #2594
 2019-02-20 16:22:45 +00:00
Dylan K. Taylor
0c89159cf2 Merge branch '3.6' 2019-02-09 19:22:00 +00:00
Dylan K. Taylor
1a8a04eab8 Merge branch '3.5' 2019-02-07 17:12:49 +00:00
Dylan K. Taylor
eac8f639a7 Level: Simplify internal chunk ticking handling 2019-01-26 13:48:43 +00:00
Dylan K. Taylor
9d69154da5 Merge branch '3.5' 2019-01-24 18:45:06 +00:00
Dylan K. Taylor
d586a18a16 Updated BedrockData submodule 2019-01-20 16:57:25 +00:00
Dylan K. Taylor
f80eeee20f Merge branch '3.5' 2019-01-05 18:59:13 +00:00
Dylan K. Taylor
ffa733fe0c Merge branch 'release/3.5' 2018-12-12 19:51:41 +00:00
Dylan K. Taylor
c46475ac4a Merge branch 'release/3.4' 2018-11-30 19:28:06 +00:00
Dylan K. Taylor
45caec874e Merge branch 'release/3.4' 2018-11-12 22:18:28 +00:00