summaryrefslogtreecommitdiffstats
path: root/Essentials2Compat
Commit message (Collapse)AuthorAgeLines
* ManagedFile was in the correct folder, but had the wrong package header.Paul Buonopane2012-02-23-0/+1
| | | | Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>
* Merge branch 'refs/heads/master' into 3.0snowleo2012-02-21-32/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* New Groups code, supports groups.yml file, gm and vault, new economy api.snowleo2012-02-06-0/+231
|
* Modified BetterLocation, and new Permission-Systemsnowleo2012-02-05-141/+49
|
* Random CleanupKHobbits2012-01-28-0/+1
|
* More work on 3.0 branchsnowleo2012-01-24-0/+2467