mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-10 21:45:35 +00:00
Code Issues Projects Releases Wiki Activity
PocketMine-MP/src
History
Dylan K. Taylor 3a68f5e3d0 Merge commit 'da43ae82fe3b8839a4d153b0365f815cf9859d77' 
# Conflicts:
#	resources/vanilla
#	src/utils/Config.php
#	src/utils/Timezone.php
#	src/utils/Utils.php
2020-01-31 20:02:39 +00:00
..
block
Merge commit '92a752053df598e5fe9366601bef070d967374fc'
2020-01-31 19:50:33 +00:00
command
Merge commit 'e61c3e8bf697e5c5c6cddb4843b24279faaf25cb'
2020-01-31 19:12:32 +00:00
crafting
Merge commit '4c36ca58e2710c8fd03eec1f50a885fb97fd9b68'
2020-01-31 19:19:06 +00:00
entity
Merge commit '839a789180cb3acd2e16006afa9b787903ffbbcd'
2020-01-31 19:16:09 +00:00
event
Merge commit 'a67fa5c007de3a5e7e689c63955849ceba9d7541'
2020-01-31 19:18:35 +00:00
form
phpdoc armageddon for master, pass 1
2020-01-22 11:55:03 +00:00
inventory
CallbackInventoryChangeListener: provide signature information for closures
2020-01-27 18:08:59 +00:00
item
Merge commit '3b9a5c5ccc22170499b686f59ea55e8be231407a'
2020-01-31 19:21:03 +00:00
lang
Merge commit '8bf469f7fcd428ebc8c3c9b9ab777c79e2824c67'
2020-01-31 19:22:14 +00:00
network
Merge commit 'fc0619ee6e4fa08aba2719e58a9289edd11f0b6e'
2020-01-31 19:42:07 +00:00
permission
Merge commit '58bc08838ba18df6361cede4b420d87d5973090a'
2020-01-31 19:45:31 +00:00
player
strip extra blank lines (php-cs-fixer)
2020-01-22 15:14:10 +00:00
plugin
Merge commit 'd94995e161d71659e2fe6ec1df47621f2de4b494'
2020-01-31 19:46:28 +00:00
resourcepacks
strip extra blank lines (php-cs-fixer)
2020-01-22 15:14:10 +00:00
scheduler
Merge commit '0537c66849b307465159306981bad78ba902f30b'
2020-01-31 19:47:59 +00:00
thread
phpdoc armageddon for master, pass 1
2020-01-22 11:55:03 +00:00
timings
added some callable prototypes for phpstan
2020-01-29 19:56:16 +00:00
updater
Merge commit '60b405d944254c940f818ebd0b7aa2603d7968a7'
2020-01-31 19:55:43 +00:00
utils
Merge commit 'da43ae82fe3b8839a4d153b0365f815cf9859d77'
2020-01-31 20:02:39 +00:00
wizard
strip extra blank lines (php-cs-fixer)
2020-01-22 15:14:10 +00:00
world
Merge commit 'a5764b3ae98a70fe8f20f9b403a4ab84b51b11d8'
2020-01-31 19:32:38 +00:00
CoreConstants.php
Merge commit 'aad1eb5b3e9b2e3b3db968a000e5454152195d7f'
2020-01-22 15:01:46 +00:00
CrashDump.php
Merge branch 'stable'
2020-01-11 22:36:57 +00:00
GlobalConstants.php
Merge tag '3.9.8'
2019-12-08 17:49:39 +00:00
MemoryManager.php
strip extra blank lines (php-cs-fixer)
2020-01-22 15:14:10 +00:00
PocketMine.php
Merge commit '651ef500a3be530f5bf1f72990c711706eab3ca7'
2020-01-13 19:29:38 +00:00
Server.php
strip extra blank lines (php-cs-fixer)
2020-01-22 15:14:10 +00:00
VersionInfo.php
strip extra blank lines (php-cs-fixer)
2020-01-22 15:14:10 +00:00