|
|
7e6adc41f0
|
Merge 1.16 support into PM4 (with changes)
|
2020-06-26 22:21:09 +01:00 |
|
|
|
d0c8d64b40
|
Merge commit '097c260db'
# Conflicts:
# resources/vanilla
# src/item/enchantment/Enchantment.php
# src/plugin/PluginDescription.php
# src/pocketmine/entity/Effect.php
# src/pocketmine/item/ItemFactory.php
# src/pocketmine/plugin/PluginManager.php
|
2020-06-14 19:28:05 +01:00 |
|
|
|
45bed454f2
|
Merge commit '3d2ca45'
|
2020-04-25 12:14:45 +01:00 |
|
|
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
|
|
5c95e25326
|
Enchantment: use a simple array instead of SplFixedArray
|
2019-08-01 16:03:08 +01:00 |
|
|
|
5499ac620c
|
Removed pocketmine subdirectory, map PSR-4 style
|
2019-07-30 19:14:57 +01:00 |
|
