mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity
PocketMine-MP/src
History
Dylan K. Taylor e9eadd3a26 Merge commit '8480ee82e' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
#	src/pocketmine/block/CraftingTable.php
2020-07-04 22:19:43 +01:00
..
block
Block: fixed crash on block factory clone
2020-06-29 22:40:35 +01:00
command
ConsoleCommandSender: inject Language via constructor
2020-07-01 13:38:05 +01:00
crafting
Merge 1.16 support into PM4 (with changes)
2020-06-26 22:21:09 +01:00
data/bedrock
cumulative imports cleanup (again)
2020-05-12 22:38:59 +01:00
entity
Position: rename getWorldNonNull() to getWorld(), remove original getWorld()
2020-06-29 21:19:46 +01:00
event
InventoryEvent: fix wrong return type on getViewers()
2020-06-29 21:55:21 +01:00
form
phpdoc armageddon for master, pass 1
2020-01-22 11:55:03 +00:00
inventory
InventoryAction: replace isValid() with validate() which throws TransactionValidationException
2020-07-04 19:38:34 +01:00
item
Add Releasable interface (#3664)
2020-06-30 21:09:10 +01:00
lang
Merge commit '2b6dcbc2e2f1dc8d629225c19cbcedfb9ae969c4'
2020-06-26 18:46:29 +01:00
network
Merge commit '8480ee82e'
2020-07-04 22:19:43 +01:00
permission
Merge commit '189f12a644aa6474bc91650cce0eb0ae9735db91'
2020-05-18 10:34:00 +01:00
player
Add Releasable interface (#3664)
2020-06-30 21:09:10 +01:00
plugin
DiskResourceProvider: do not trim backslashes from path when we're not on Windows
2020-05-24 14:26:12 +01:00
resourcepacks
Resource packs: modules field is required in manifest.json
2020-06-21 23:19:15 +01:00
scheduler
make more use of igbinary_serialize() and igbinary_unserialize()
2020-06-17 23:03:03 +01:00
stats
Extract ServerConfigGroup from Server
2020-05-24 15:48:03 +01:00
thread
Merge commit '763c8ebfe3bb8a597768d86040fee130c8fc7ab8'
2020-06-26 18:46:01 +01:00
timings
added Timings::INCLUDED_BY_OTHER_TIMINGS constant
2020-05-24 16:09:45 +01:00
updater
CS: strip unneeded phpdoc
2020-06-18 20:01:49 +01:00
utils
Merge commit 'df76c02e7ac3bfbde8ecb597653779e8e1516f58'
2020-06-26 19:14:25 +01:00
wizard
strip extra blank lines (php-cs-fixer)
2020-01-22 15:14:10 +00:00
world
Position: rename getWorldNonNull() to getWorld(), remove original getWorld()
2020-06-29 21:19:46 +01:00
CoreConstants.php
Merge branch 'next-minor'
2020-03-10 13:05:37 +00:00
CrashDump.php
Merge commit '097c260db'
2020-06-14 19:28:05 +01:00
MemoryManager.php
Merge commit '097c260db'
2020-06-14 19:28:05 +01:00
PocketMine.php
Merge commit 'df76c02e7ac3bfbde8ecb597653779e8e1516f58'
2020-06-26 19:14:25 +01:00
Server.php
ConsoleCommandSender: inject Language via constructor
2020-07-01 13:38:05 +01:00
ServerConfigGroup.php
Extract ServerConfigGroup from Server
2020-05-24 15:48:03 +01:00
VersionInfo.php
Merge branch 'next-minor'
2020-03-10 13:05:37 +00:00