summaryrefslogtreecommitdiffstats
path: root/EssentialsXMPP
Commit message (Collapse)AuthorAgeLines
* Merge branch 'refs/heads/master' into 3.0snowleo2012-02-21-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/EssentialsTimer.java Essentials/src/com/earth2me/essentials/ISettings.java Essentials/src/com/earth2me/essentials/Jails.java Essentials/src/com/earth2me/essentials/OfflinePlayer.java Essentials/src/com/earth2me/essentials/Settings.java Essentials/src/com/earth2me/essentials/User.java Essentials/src/com/earth2me/essentials/UserData.java Essentials/src/com/earth2me/essentials/UserMap.java Essentials/src/com/earth2me/essentials/Util.java Essentials/src/com/earth2me/essentials/commands/Commandnear.java Essentials/src/com/earth2me/essentials/commands/Commandping.java Essentials/src/com/earth2me/essentials/commands/Commandspawner.java Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java Essentials/src/com/earth2me/essentials/commands/Commandwarp.java Essentials/src/messages_en.properties Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java EssentialsChat/src/plugin.yml EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
| * Updated Essentials to work with R5snowleo2012-02-21-4/+4
| |
| * Switch website URL's to point at wiki.KHobbits2012-01-28-1/+1
| |
* | Fix dependsKHobbits2012-01-25-2/+2
| |
* | Merge branch 'refs/heads/master' into 3.0snowleo2012-01-24-12/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Removing load info, bucket displays that now.snowleo2012-01-20-4/+0
| |
| * Update for new CraftBukkit Event Codesnowleo2012-01-20-8/+8
| | | | | | | | EssentialsSpawn can't be updated yet, because the new event system lacks dynamic priorities.
* | More work on 3.0 branchsnowleo2012-01-24-3/+28
| |
* | Merge branch 'refs/heads/master' into 3.0snowleo2012-01-18-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Did some tweaks, so that it actually works. Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/User.java Essentials/src/com/earth2me/essentials/Util.java Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java Essentials/src/com/earth2me/essentials/commands/Commandmail.java Essentials/src/com/earth2me/essentials/commands/Commandme.java Essentials/src/com/earth2me/essentials/commands/Commandmsg.java Essentials/src/com/earth2me/essentials/commands/Commandnick.java Essentials/src/com/earth2me/essentials/commands/Commandr.java Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java build.xml
| * Netbeans 7.1 stuffsnowleo2012-01-12-2/+11
| |
* | Cleanup of Console classsnowleo2012-01-06-2/+1
| |
* | I always forget thesesnowleo2012-01-03-21/+3
| |
* | Netbeans 7.1 RC2 project stuffsnowleo2012-01-02-2/+11
| |
* | Updated all modules to new api, some settings are still missingsnowleo2011-12-14-22/+27
| |
* | Moved signs code to a new modulesnowleo2011-12-14-1/+1
|/
* Update copylibs.KHobbits2011-12-13-5/+7
|
* Update Bukkit jars and paths.KHobbits2011-12-12-3/+3
|
* Updated EssentialsSpawn to use the new config codesnowleo2011-12-06-1/+2
| | | | /spawn and /home now call the PlayerRespawnEvent to make it more compatible with other plugins.
* Update of Smack to 3.2.1snowleo2011-12-01-3/+3
|
* Cleanup of the library foldersnowleo2011-12-01-2/+1
| | | | Also: we don't use the mysql.jar/sqlite.jar anymore, since it is included in craftbukkit. I don't know why this reference in config.yml still exists.
* If Essentials core fails to read one of the configs now, it will disable ↵snowleo2011-11-30-7/+11
| | | | itself. If other modules detect that Essentials is not enabled, they will be disabled too. EssentialsProtect will go into emergency mode, canceling all events that could hurt your world. Fix the file and either restart or reload the server.
* Locale.ENGLISH!!1!snowleo2011-11-27-1/+1
|
* Switch to the new I18n class and format cleanup of all classessnowleo2011-11-21-21/+24
|
* CB# 1467 B#1022snowleo2011-11-20-2/+2
|
* More code cleanup.KHobbits2011-11-18-15/+2
|
* XMPP: Don't send messages from spy users back to them.snowleo2011-10-30-4/+7
|
* Prevent that hidden players broadcast afk messagessnowleo2011-09-02-9/+13
| | | | Prevent that moving players triggers unafk too early, they can now move within a radius of 3 blocks from the position where they went afk.
* Minor cleanupsnowleo2011-08-08-2/+2
|
* XMPP: Let xmpp users see xmpp messages from other xmpp users.snowleo2011-08-08-9/+27
|
* XMPP: reconnect to server, if connection is broken.snowleo2011-08-08-0/+4
|
* Changes to build-impl by Netbeanssnowleo2011-08-08-3/+4
|
* Added code guidelines to all projects, so we don't need them globally.snowleo2011-07-24-3/+49
| | | | | | | Compress jar files Don't copy lib files into dist folders Removed vendor names Changed all java versions to 1.6 to make it consistent.
* Heavy cleanup of all classessnowleo2011-07-16-12/+14
| | | | | ItemDb is not static anymore Essentials.getStatic() removed
* Return boolean on sendMessage (XMPP)snowleo2011-07-07-7/+9
|
* Prevent loops generated by logging directly to xmppsnowleo2011-07-07-28/+117
|
* Corrected all commands of PermCommandssnowleo2011-06-26-1/+1
| | | | onCommand now supports the change of the permissions prefix
* Don't connect to example.com, the default valuesnowleo2011-06-25-1/+1
|
* Only import what we really need.snowleo2011-06-07-7/+9
|
* Fixes for XMPP: Prevent loops on errorssnowleo2011-06-03-24/+23
| | | | git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1577 e251c2fe-e539-e718-e476-b85c1f46cddb
* Fixes for XMPP: display minecraft username for players that have set their ↵snowleo2011-06-03-3/+24
| | | | | | address using /setxmpp, others will have the jabber address next to the message git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1576 e251c2fe-e539-e718-e476-b85c1f46cddb
* Fixes for XMPP: display message on /setxmpp, ignore resource on xmpp ↵snowleo2011-06-03-4/+8
| | | | | | addresses, reconnect on reload git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1575 e251c2fe-e539-e718-e476-b85c1f46cddb
* More cleanupsnowleo2011-06-02-19/+22
| | | | git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1570 e251c2fe-e539-e718-e476-b85c1f46cddb
* Code cleanupsnowleo2011-06-02-24/+29
| | | | git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1569 e251c2fe-e539-e718-e476-b85c1f46cddb
* Stupid Netbeans is stupid.snowleo2011-06-02-2/+2
| | | | git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1568 e251c2fe-e539-e718-e476-b85c1f46cddb
* Missing file for EssentialsXMPPsnowleo2011-06-02-0/+24
| | | | git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1566 e251c2fe-e539-e718-e476-b85c1f46cddb
* Added EssentialsXMPP from newplugins branch.snowleo2011-06-02-0/+1962
Updated to work with trunk. git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1564 e251c2fe-e539-e718-e476-b85c1f46cddb