mirror of
https://github.com/essentials/Essentials.git
synced 2025-09-25 05:41:36 +02:00
6488882e1a
Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java Essentials/src/com/earth2me/essentials/ISettings.java Essentials/src/com/earth2me/essentials/Settings.java Essentials/src/com/earth2me/essentials/Teleport.java Essentials/src/com/earth2me/essentials/User.java Essentials/src/com/earth2me/essentials/UserData.java Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java Essentials/src/com/earth2me/essentials/commands/Commandban.java Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java Essentials/src/com/earth2me/essentials/commands/Commandessentials.java Essentials/src/com/earth2me/essentials/commands/Commandexp.java Essentials/src/com/earth2me/essentials/commands/Commandhat.java Essentials/src/com/earth2me/essentials/commands/Commandignore.java Essentials/src/com/earth2me/essentials/commands/Commandlightning.java Essentials/src/com/earth2me/essentials/commands/Commandmail.java Essentials/src/com/earth2me/essentials/commands/Commandmsg.java Essentials/src/com/earth2me/essentials/commands/Commandpay.java Essentials/src/com/earth2me/essentials/commands/Commandr.java Essentials/src/com/earth2me/essentials/commands/Commandtempban.java Essentials/src/com/earth2me/essentials/commands/Commandtpa.java Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java Essentials/src/com/earth2me/essentials/commands/Commandvanish.java Essentials/src/com/earth2me/essentials/commands/Commandwhois.java Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java Essentials/src/items.csv EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java EssentialsChat/src/plugin.yml EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java EssentialsSpawn/src/plugin.yml lib/bukkit.jar lib/craftbukkit.jar