Dylan K. Taylor 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

..

Enchantment.php

Merge commit '097c260db'

2020-06-14 19:28:05 +01:00

EnchantmentEntry.php

Merge commit '3b9a5c5ccc22170499b686f59ea55e8be231407a'

2020-01-31 19:21:03 +00:00

EnchantmentInstance.php

phpdoc armageddon for master, pass 1

2020-01-22 11:55:03 +00:00

EnchantmentList.php

Merge branch 'stable'

2020-02-07 18:13:55 +00:00

FireAspectEnchantment.php

…

KnockbackEnchantment.php

update pocketmine/math, adapt to add() changes

2020-05-19 12:26:18 +01:00

MeleeWeaponEnchantment.php

phpdoc armageddon for master, pass 1

2020-01-22 11:55:03 +00:00

ProtectionEnchantment.php

phpdoc armageddon for master, pass 1

2020-01-22 11:55:03 +00:00

SharpnessEnchantment.php

…