summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'refs/heads/master' into 3.0snowleo2012-01-02-0/+5
|\
| * Merge pull request #42 from jjkoletar/patch-1snowleo2012-01-01-0/+5
| |\ | | | | | | No sending to all players, must specify target.
| | * No sending to all players, must specify target.Jeremy2012-01-01-0/+5
| |/
* | More work done on the 3.0 branchsnowleo2011-12-23-374/+1372
| |
* | Merge branch 'refs/heads/master' into 3.0snowleo2011-12-22-20/+40
|\| | | | | | | | | Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java
| * Only info not a warning if a file is missingsnowleo2011-12-20-3/+1
| |
| * Correctly match release and non release versions of bukkit.snowleo2011-12-20-1/+1
| |
| * Fix sending our player object to other plugins.snowleo2011-12-20-1/+1
| |
| * Always return an offlineplayer object with the name, that the user wants.snowleo2011-12-19-7/+23
| |
| * Fix double names in /balancetop and show display name in balancetopsnowleo2011-12-19-8/+8
| |
| * Merge branch 'master' of github.com:essentials/EssentialsKHobbits2011-12-19-2/+8
| |\
| | * More null checks for Jailssnowleo2011-12-19-2/+8
| | |
| * | Prevent future warps being named as numbers.KHobbits2011-12-19-0/+4
| |/
* | Removing duplicate messages fileKHobbits2011-12-18-406/+0
| | | | | | | | This causes confusion when trying to override messages in the ess folder.
* | Adding /join as alias to /tpa, and /come as alias to /tpahereKHobbits2011-12-18-2/+2
| |
* | Essentials now throws a custom event, to handle local chat. KHobbits2011-12-17-1/+1
| | | | | | (Changing event name, so we don't get custom event conflicts.)
* | EssentialsChat cleaning.KHobbits2011-12-17-261/+355
| |
* | Merge branch 'master' into 3.0KHobbits2011-12-15-4/+1
|\|
| * Merge branch 'master' of github.com:essentials/EssentialsKHobbits2011-12-15-1/+1
| |\
| * | Make powertool use a chat event, instead of just messaging each user.KHobbits2011-12-15-4/+1
| | |
* | | Merge branch 'refs/heads/master' into 3.0snowleo2011-12-15-1/+1
|\ \ \ | | |/ | |/|
| * | Corrected version match for 1597 build versionsnowleo2011-12-15-1/+1
| |/
* | Updated all modules to new api, some settings are still missingsnowleo2011-12-14-88/+106
| |
* | Added EssentialsSigns to build.xmlsnowleo2011-12-14-0/+1
| |
* | Moved signs code to a new modulesnowleo2011-12-14-53/+1435
| |
* | Fail merge :Dsnowleo2011-12-14-12/+3
| |
* | Merge branch 'refs/heads/master' into 3.0snowleo2011-12-14-346/+768
|\| | | | | | | | | | | | | | | Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/IUser.java Essentials/src/com/earth2me/essentials/Trade.java Essentials/src/com/earth2me/essentials/User.java
| * Fix failing override for /enchant /eco /extsnowleo2011-12-14-1/+1
| |
| * Merge branch 'refs/heads/groupmanager'snowleo2011-12-14-42/+47
| |\
| | * deleting the contents of GlobalGroups.yml will no longer thrown aElgarL2011-12-14-42/+47
| | | | | | | | | NullPointerException.
| * | Read current exp, instead of stored exp.KHobbits2011-12-14-6/+23
| | | | | | | | | | | | This means that exp used in enchanting is subtracted from total exp.
| * | Merge branch 'refs/heads/groupmanager'snowleo2011-12-13-11/+291
| |\|
| | * GM now registers with Bukkits ServicesManager.ElgarL2011-12-13-1/+12
| | |
| | * Update event Action names to be uniqueElgarL2011-12-13-7/+217
| | |
| | * Added custom events so plugins can now be notified of changes withinElgarL2011-12-13-11/+70
| | | | | | | | | GroupManager.
| * | Fixing killall command definition.KHobbits2011-12-13-2/+2
| | |
| * | Renamed /butcher to /killall and fixes to the code.snowleo2011-12-13-21/+33
| | |
| * | Netbeans 7.1 changes for EssentialsUpdatesnowleo2011-12-13-5/+7
| | |
| * | Tiny fix to the last commit.snowleo2011-12-13-1/+2
| | |
| * | Better exp fix and allow exp on buy and sell signs.snowleo2011-12-13-118/+118
| | |
| * | Disabling exp as currency. Normal money will be used.snowleo2011-12-13-1/+2
| | |
| * | Update exp trade signs on purchase.KHobbits2011-12-13-4/+15
| | |
| * | Fixing Sell/Buy Signs which use EXP as a currency.KHobbits2011-12-13-6/+36
| | |
| * | Merge branch 'master' of github.com:essentials/EssentialsKHobbits2011-12-13-0/+2
| |\ \
| | * | Inform user that they were healed.KHobbits2011-12-13-0/+2
| | | |
| * | | Update copylibs.KHobbits2011-12-13-45/+63
| |/ /
| * | Updating min Bukkit version.KHobbits2011-12-12-2/+2
| | |
| * | Updating to RBKHobbits2011-12-12-0/+38
| | | | | | | | | | | | CraftBukkit #1597 Bukkit #1073
| * | Merge remote branch 'remotes/origin/groupmanager'KHobbits2011-12-12-112/+102
| |\| | | | | | | | | | Adjusting bukkit paths to remove version number.
| | * Offline player checks now support partial name matches.ElgarL2011-12-12-3/+11
| | |