Dylan K. Taylor
|
163c3855eb
|
Merge branch 'next-minor'
# Conflicts:
# resources/vanilla
# src/plugin/PluginBase.php
# src/plugin/PluginDescription.php
# src/pocketmine/Player.php
# src/pocketmine/network/rcon/RCON.php
# src/pocketmine/network/rcon/RCONInstance.php
# src/pocketmine/scheduler/AsyncTask.php
# src/pocketmine/tile/Spawnable.php
# src/scheduler/AsyncPool.php
# src/utils/Config.php
# src/utils/Timezone.php
# src/utils/UUID.php
# src/utils/Utils.php
# src/world/format/io/region/RegionLoader.php
|
2020-04-19 11:13:41 +01:00 |
|
Dylan K. Taylor
|
fb1126797a
|
Merge branch 'stable'
|
2020-02-07 18:13:55 +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
|
721bd8f02b
|
Merge commit 'd3021c628134293c2b8af505806efc2fba4fe947'
# Conflicts:
# resources/vanilla
|
2020-01-31 20:03:27 +00:00 |
|
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 |
|
Dylan K. Taylor
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
Dylan K. Taylor
|
3ee6887792
|
populate remaining missing return types, using native returns where possible
this is done separately to stable so that stable changes can be integrated easily using an empty merge.
|
2020-01-19 10:26:35 +00:00 |
|
Dylan K. Taylor
|
96b91af66a
|
Merge branch 'stable'
|
2020-01-11 21:41:38 +00:00 |
|
Dylan K. Taylor
|
cda1143a79
|
Merge branch 'stable'
|
2020-01-09 17:17:42 +00:00 |
|
Dylan K. Taylor
|
0f718ea28b
|
Merge commit '8726604899d1a371567141e0831ed570d3233356'
|
2019-12-25 14:19:35 +00:00 |
|
Dylan K. Taylor
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|
Shoghi Cervantes
|
cbc64462e6
|
New directory structure. More powerful startup scripts
|
2014-03-08 04:41:43 +01:00 |
|
Shoghi Cervantes
|
993620341a
|
Added Villager class and NPC interface
|
2014-03-06 23:33:35 +01:00 |
|
Shoghi Cervantes
|
c08bf3ef86
|
Removed code remove comments
|
2014-03-06 13:16:44 +01:00 |
|
Shoghi Cervantes
|
5ea31b57ce
|
First step to namespaces
|
2014-03-05 23:43:16 +01:00 |
|
Shoghi Cervantes
|
23b8fc32ff
|
removed DocBlock header for logo
|
2014-03-05 11:15:47 +01:00 |
|
Shoghi Cervantes
|
3864630bcd
|
New PMF level (uses NBT Entity and TileEntity)
|
2014-02-26 17:15:31 +01:00 |
|
Shoghi Cervantes
|
7bdc48509e
|
things
|
2014-02-19 17:41:12 +01:00 |
|
Shoghi Cervantes
|
f1b5f83fd4
|
Lots of typos fixed, undefined variables, unused code
|
2014-02-19 01:55:42 +01:00 |
|
Shoghi Cervantes
|
b481c94f45
|
Added new PHP YAML extension
|
2014-01-30 00:36:44 +01:00 |
|
Shoghi Cervantes
|
1526c6cae9
|
Fixed "Take this ridiculously retarded IF formatting!" by @sekjun9878
|
2014-01-28 11:37:29 +01:00 |
|
Michael Yoo
|
a141ea5018
|
Config Object PHPDoc
|
2013-12-19 18:42:45 +10:30 |
|
Michael Yoo
|
01e9ca7852
|
Fix #971. Add lowercase checking of Config.
|
2013-12-14 16:06:28 +10:30 |
|
Michael Yoo
|
e2298d861c
|
Fix #996
|
2013-12-14 15:27:38 +10:30 |
|
Shoghi Cervantes
|
e9e59c33cc
|
Fixed 969
|
2013-12-02 17:45:01 +01:00 |
|
Shoghi Cervantes
|
3ff4b9eae0
|
Achievements API
|
2013-11-24 00:51:04 +01:00 |
|
Shoghi Cervantes
|
ae8c934b5f
|
Allow accessing Config data keys directly
|
2013-11-23 19:14:45 +01:00 |
|
Shoghi Cervantes
|
a21bb5ab6d
|
Revert "Revert "Roll back""
This reverts commit e1e804ffe35f9e6c6411b8ed6425af3f8e72f608.
|
2013-08-29 18:52:12 +02:00 |
|
Shoghi Cervantes
|
e1e804ffe3
|
Revert "Roll back"
This reverts commit 29504c09f263e73492c6ffecea201a81dcf3591d.
|
2013-08-28 20:55:58 +02:00 |
|
Shoghi Cervantes
|
093b86fa43
|
Fixed URL
|
2013-08-27 19:16:11 +02:00 |
|
Shoghi Cervantes
|
36ff8331b7
|
Updated headers
|
2013-08-27 18:16:57 +02:00 |
|
Shoghi Cervantes
|
ffc95bf311
|
Fixed {}
|
2013-08-26 11:10:25 +02:00 |
|
Michael Yoo
|
6dc33791a7
|
Reload Bugfix
|
2013-08-22 19:40:20 +09:30 |
|
Michael Yoo
|
54f058de3e
|
Config Reload
|
2013-08-22 19:30:27 +09:30 |
|
Shoghi Cervantes Pueyo
|
e0e724bcc3
|
Saving entities/tiles
|
2013-05-15 23:30:46 +02:00 |
|
Shoghi Cervantes Pueyo
|
6a4010a9af
|
Fixed plugins not generating their config file
|
2013-04-25 18:52:14 +02:00 |
|
Shoghi Cervantes Pueyo
|
70056b8d1f
|
Save config filles automatically after adding new defaults
|
2013-04-22 00:05:56 +02:00 |
|
Shoghi Cervantes Pueyo
|
c60e15a682
|
Correct Line Breaks
|
2013-03-04 21:36:07 +01:00 |
|
Shoghi Cervantes Pueyo
|
76fcad92b3
|
Pretty print options for Config JSON
|
2013-03-04 17:29:15 +01:00 |
|
Shoghi Cervantes Pueyo
|
874571d572
|
Changes made to be compatible with the DevTools plugin
|
2013-02-14 20:37:16 +01:00 |
|