summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| | * 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
| | | | | |
| | | * | | Add optional 2n'd param to temp ban reason TL key.KHobbits2012-06-19-6/+6
| | | |/ /
| | | * | Fixing vanish on off argumentsementalo2012-06-18-2/+1
| | | | |
| | | * | Use the assigned variable when looking at durability in itemdbementalo2012-06-18-1/+1
| | | | |
| | | * | Add sign throttle config option.KHobbits2012-06-17-2/+49
| | | | | | | | | | | | | | | | | | | | Allows you to limit how often an Essentials sign can be spammed per player.
| | * | | The French are weird : they use colons like this.Iaccidentally2012-06-17-8/+8
| | | | |
| | * | | fix spacing issue in messages.propertiesIaccidentally2012-06-17-8/+8
| | |/ /
| | * | Using /exp, show can't find player message, if no matching player is found.KHobbits2012-06-16-23/+30
| | | |
| | * | Added missing syntax to plugin.ymlKHobbits2012-06-16-2/+2
| | | |
| | * | Fix playerlistname update when prefix/suffix option is disabled.KHobbits2012-06-16-1/+3
| | | | | | | | | | | | | | | | Fixes #2216
| | * | Adjust kit delay description.KHobbits2012-06-16-1/+1
| | | | | | | | | | | | | | | | Fixes #1580
| | * | Prevent joinbots from triggering join code, unless they are actually ↵KHobbits2012-06-16-0/+4
| | | | | | | | | | | | | | | | connected to the server and online.
| | * | Added TL key for ban syntax,KHobbits2012-06-16-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Default message: "Banned: <reason>" Default reason: The Ban Hammer has spoken! Optional 2nd param to banReason, {1}, will contain user who made the ban. Example use: "banReason=Banned for {0} by {1}"
| | * | Fix teleport cooldowns - thanks @basicsenseiKHobbits2012-06-16-2/+2
| | | | | | | | | | | | | | | | Fixes #2260
| | * | Players should not be able to ignore ConsoleKHobbits2012-06-16-33/+34
| | | | | | | | | | | | | | | | Also implement chat exempt permission in other commands.
| | * | Fix chat showing [spy] prefix when social spy was not required to see the ↵KHobbits2012-06-16-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | message. Fixes #2263
| | * | Replace op ignore exempt with ignore exempt chat permission:KHobbits2012-06-16-2/+1
| | | | | | | | | | | | | | | | | | | | essentials.chat.ignoreexempt This permission won't prevent a player from ignoring the player, but the player will see the chat messages anyway.
| | * | Fix /exp so it can be used in the consoleKHobbits2012-06-16-33/+65
| | | |
| | * | Avoid silent command failures on /hat (ie typing /hat fish will no longer ↵KHobbits2012-06-16-23/+22
| | | | | | | | | | | | | | | | silently return as if broken)
| | * | Added missing TL key 'hatRemoved'KHobbits2012-06-16-3/+13
| | | |
| | * | Make /vanish follow the same rules as /fly, /god and /gamemodeKHobbits2012-06-16-14/+18
| | | |
| | * | Merge pull request #85 from kukelekuuk00/masterIaccidentally2012-06-15-164/+164
| | |\ \ | | | | | | | | | | Updated dutch translation and fixed many grammar and spelling mistakes.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 20:43:39 +0000