summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge branch 'refs/heads/master' into releasestable-2.6.4snowleo2011-10-22-968/+10248
|\
| * Fix Testsnowleo2011-10-21-2/+63
| * Use of lomboks delegate on player wrappingsnowleo2011-10-21-848/+58
| * CB#1337snowleo2011-10-21-0/+0
| * Merge branch 'refs/heads/groupmanager'snowleo2011-10-21-14/+32
| |\
| | * Added data.save.hours setting to config. This allow control over howElgarL2011-10-16-4/+14
| | * Simplified config.yml while retaining backwards compatibility.ElgarL2011-10-16-6/+13
| | * Fixed reading world mirrors from the config.ElgarL2011-10-16-8/+9
| * | Cleanupsnowleo2011-10-19-25/+25
| * | Moved all config options to new Settings classessnowleo2011-10-19-45/+410
| * | Cleanupsnowleo2011-10-19-36/+44
| * | Merge pull request #30 from tustin2121/mastersnowleo2011-10-19-33/+164
| |\ \
| | * | Minor fixes. Basic testing shows all works.Tim P2011-10-18-6/+26
| | * | Made a concerted effort to change the messages.properties in the various lang...Tim P2011-10-18-20/+20
| | * | Made a couple commands available for the console (ones that make sense to be ...Tim P2011-10-18-13/+124
| * | | Save the ban reason, not the command name.KHobbits2011-10-18-1/+1
| * | | Removing debugging.KHobbits2011-10-18-9/+7
| * | | More debuggingKHobbits2011-10-18-2/+5
| * | | Adding a debug note.KHobbits2011-10-18-1/+3
| |/ /
| * | Updated german translation by HDSsnowleo2011-10-16-17/+16
| * | Revert bed fix, because it's fixed in Bukkit now. Thanks to feildmastersnowleo2011-10-15-13/+0
| * | Test if objects can be read from yaml in the original sortsnowleo2011-10-15-1/+5
| * | Correctly fix the N/S directionsnowleo2011-10-15-13/+40
| * | Moving apikey outside main file.KHobbits2011-10-13-2/+9
| * | Merge branch 'master' of github.com:essentials/Essentials into essmasterKHobbits2011-10-13-3/+450
| |\ \
| | * | New storage system for settings (WIP)snowleo2011-10-13-3/+450
| * | | Made a silly little upload script, for uploading things to dev bukkit.KHobbits2011-10-13-0/+1901
| |/ /
| * | Merge remote branch 'remotes/ess/groupmanager' into essmasterKHobbits2011-10-12-24/+56
| |\|
| | * Added a config setting - bukkit_perms_override: falseElgarL2011-10-12-12/+41
| | * v 1.4:ElgarL2011-10-11-14/+17
| * | Cleanupsnowleo2011-10-12-25/+51
| * | Replacing martyr with Pircbot 1.5snowleo2011-10-12-10946/+4166
| * | EssentialsUpdate WIPsnowleo2011-10-12-1/+13835
* | | Fixing typo in release build.stable-2.6.3KHobbits2011-10-11-1/+1
* | | Merge branch 'essmaster' into essreleaseKHobbits2011-10-11-1/+1
|\| |
| * | Fixing german translation error.KHobbits2011-10-11-1/+1
| |/
* | Merge remote branch 'remotes/ess/master' into essreleaseKHobbits2011-10-11-12/+91
|\|
| * Added two new permission nodes - groupmanager.notify.self &ElgarL2011-10-11-1/+34
| * Merge branch 'master' into groupmanagersnowleo2011-10-11-111/+654
| |\
| | * Changes for new Bukkitsnowleo2011-10-11-3/+40
| | * CB#1317snowleo2011-10-11-0/+0
| | * Changing essentials URL, we should at least give one that works, although buk...KHobbits2011-10-11-1/+1
| * | Removed null supression in GroupManager.javaElgarL2011-10-11-1/+1
| * | Merge branch 'groupmanager' ofElgarL2011-10-11-2/+1
| |\ \
| | * \ Merge branch 'master' into groupmanagersnowleo2011-10-04-405/+32
| | |\ \
| * | | | Fixed manudelsub not correctly selecting the group to remove.ElgarL2011-10-11-406/+34
| * | | | Fixed manudelsub not correctly selecting the group to remove.ElgarL2011-10-11-1/+8
| |/ / /
| * | | Comment config.yml to prevent creation of world4 data filesElgarL2011-10-04-2/+2
| * | | Updating ReadmeKHobbits2011-10-04-1/+3
* | | | Merge remote branch 'remotes/ess/master' into essreleaseKHobbits2011-10-10-0/+4
|\ \ \ \ | | |_|/ | |/| |