summaryrefslogtreecommitdiffstats
path: root/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
Commit message (Collapse)AuthorAgeLines
* Merge branch 'refs/heads/master' into 3.0snowleo2012-01-24-5/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes to EssChat have not been merged Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java Essentials/src/com/earth2me/essentials/ISettings.java Essentials/src/com/earth2me/essentials/OfflinePlayer.java Essentials/src/com/earth2me/essentials/Settings.java Essentials/src/com/earth2me/essentials/Util.java Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java Essentials/src/messages.properties Essentials/src/messages_da.properties Essentials/src/messages_de.properties Essentials/src/messages_en.properties Essentials/src/messages_es.properties Essentials/src/messages_fr.properties Essentials/src/messages_nl.properties EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
| * Update for new CraftBukkit Event Codesnowleo2012-01-20-5/+7
| | | | | | | | EssentialsSpawn can't be updated yet, because the new event system lacks dynamic priorities.
* | Updated all modules to new api, some settings are still missingsnowleo2011-12-14-5/+5
|/
* More cleanupsnowleo2011-06-02-0/+1
| | | | git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1570 e251c2fe-e539-e718-e476-b85c1f46cddb
* Added EssentialsXMPP from newplugins branch.snowleo2011-06-02-0/+55
Updated to work with trunk. git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1564 e251c2fe-e539-e718-e476-b85c1f46cddb