summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * Fix Coloursementalo2012-06-27-2/+2
| |
| * Import sappin mah sentryementalo2012-06-26-1/+0
| |
| * Add some default values to protect config.ementalo2012-06-26-1/+15
| | | | | | | | Figure out a better way to do this for HashMaps....
| * Fix GeoIP configementalo2012-06-26-6/+6
| |
| * Merge branch 'master' of https://github.com/essentials/EssentialsIaccidentally2012-06-26-20/+16
| |\
| | * Assign EssentialsTimer to the declared variable. Fixes gcementalo2012-06-26-1/+1
| | |
| | * implement request teleportementalo2012-06-26-10/+4
| | |
| | * remove deprecated codeementalo2012-06-26-3/+3
| | |
| | * fix some encoding issues for §ementalo2012-06-26-3/+5
| | | | | | | | | | | | Don't attempt to close on null objects
| | * change pattern match for essentials updateementalo2012-06-26-3/+3
| | |
| * | add fixed keepxp.Iaccidentally2012-06-26-0/+12
| |/
| * Bogus class reference to leave in jmx extensionsmd_52012-06-26-0/+1
| |
| * Bit of maven magic, no more huge EssProtect jar.md_52012-06-26-2/+4
| |
| * Fix build format on spanish properties file. 3.0 uses ${build.number} ↵Paul A.2012-06-26-1/+1
| | | | | | | | instead of TeamCity
| * Compile time fixes.md_52012-06-26-5/+14
| |
| * fixes to the spainish translation thanks to dxIaccidentally2012-06-26-92/+92
| |
| * @khobbits Add optional 2n'd param to temp ban reason TL key.ementalo2012-06-26-6/+6
| |
| * .properties updatesementalo2012-06-26-5/+3
| |
| * Merge branch '3.0'ementalo2012-06-25-9/+361
| |\ | | | | | | | | | | | | | | | Conflicts: Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java Essentials/src/items.csv
| | * @SyntaxBlitz Fix /vanish with no arguments doing nothingementalo2012-06-25-3/+2
| | |
| | * @necrodoom major slab alias expansion for items.csvementalo2012-06-25-2/+355
| | | | | | | | | | | | d0a8dc48126911f9498a8fa2d3c07cf0cf1adc63
| | * snowleo Prevent NPEs in KeywordReplacerementalo2012-06-25-4/+4
| | | | | | | | | | | | 2c6a81a916419c76b13d2b761c5bb00eee3f9307
| | * Merge branch 'master' into 3.0ementalo2012-06-25-71/+520
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | \ 3.0 is now masterementalo2012-06-25-71/+520
| |\ \ \ | | |/ / | |/| / | | |/
| | * Revert "add essentials.keepxp to allow a player to keep their level after ↵ementalo2012-06-25-9/+1
| | | | | | | | | | | | | | | | | | death." This reverts commit 3b2523575592da4aa07e3389d81fc10e42ff141e.
| | * add essentials.keepxp to allow a player to keep their level after death.Iaccidentally2012-06-24-1/+9
| | |
| | * Revert "fix /back resetting on logout"KHobbits2012-06-23-3/+1
| | | | | | | | | | | | | | | This is desired behavior, and required for other features. This reverts commit 329f93a4f67de40f3a382cd6dec91a814f679eb4.
| | * Merge pull request #89 from necrodoom/patch-7md-52012-06-23-0/+293
| | |\ | | | | | | | | major slab alias expansion for items.csv
| | | * major slab alias expansion for items.csvnecrodoom2012-06-23-0/+293
| | |/
| | * Too much space :DAlexander Schepp2012-06-22-1/+1
| | |
| | * Prevent NPEs in KeywordReplacerAlexander Schepp2012-06-22-4/+4
| | |
| | * fix /back resetting on logoutIaccidentally2012-06-22-1/+3
| | |
| | * Merge pull request #88 from SyntaxBlitz/mastermd-52012-06-21-0/+1
| | |\ | | | | | | | | Fix /vanish with no arguments doing nothing
| | | * Fix /vanish with no arguments doing nothingTimothy Aveni2012-06-21-0/+1
| | | |
| | * | Merge pull request #87 from necrodoom/patch-5md-52012-06-21-2/+60
| | |\ \ | | | | | | | | | | updated items.csv, 43:4, 43:5, 44:4, 44:5
| | | * | while enraged at mibbit and esper failing to work, updated items.csvnecrodoom2012-06-21-2/+60
| | |/ /
| | * | Merge remote-tracking branch 'origin/groupmanager'md_52012-06-21-4/+9
| | |\ \
| | | * | Better update for the User object player reference.ElgarL2012-06-16-14/+6
| | | | |
| | | * | Clear the player reference on logout so it's refreshed upon a reconnect.ElgarL2012-06-16-0/+13
| | | | |
| | * | | Update Czech translation.md_52012-06-21-2/+2
| | | | |
| | * | | change some default values Iaccidentally2012-06-21-2/+2
| | | |/ | | |/|
| | * | fixxy fixxyIaccidentally2012-06-19-1/+3
| | | |
| | * | Add Finnish translationIaccidentally2012-06-19-0/+436
| | | |
| | * | Merge branch 'master' of https://github.com/essentials/EssentialsIaccidentally2012-06-19-1/+1
| | |\ \
| | | * | *borrows snowleo's strainer*KHobbits2012-06-19-1/+1
| | | | |
| | * | | Merge branch 'master' of https://github.com/essentials/EssentialsIaccidentally2012-06-19-11/+70
| | |\| |
| | | * | Merge pull request #86 from necrodoom/patch-4Paul A.2012-06-19-0/+2
| | | |\ \ | | | | | | | | | | | | adding beef and steak to items.csv - thanks @necrodoom
| | | | * | hotfix before 2.9.2 releasenecrodoom2012-06-19-0/+2
| | | | | |
| | | * | | Little safety check for bad plugins.KHobbits2012-06-19-1/+5
| | | | | |
| | | * | | Patch to allow plugins to use ignore lookup, without updating their own code.KHobbits2012-06-19-0/+7
| | | | | |