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
..
2020-06-14 19:28:05 +01:00
2020-01-22 11:55:03 +00:00
2020-01-22 11:55:03 +00:00
2020-06-03 12:31:17 +01:00
2020-04-24 00:18:31 +01:00
2020-04-28 17:27:38 +01:00
2020-01-22 11:55:03 +00:00
2020-04-28 17:27:38 +01:00
2020-05-19 21:32:44 +01:00