Chris Ward
|
f17485b112
|
Merge remote-tracking branch 'origin/groupmanager' into 2.9
|
2013-02-09 21:55:20 +11:00 |
|
ElgarL
|
1f932434c2
|
Fix bad Git Merge
|
2013-02-09 10:51:16 +00:00 |
|
Chris Ward
|
92b0178ca7
|
Merge pull request #312 from necrodoom/patch-44
update kit link to the new one
|
2013-02-09 02:48:48 -08:00 |
|
Necrodoom
|
d30c3ca2a6
|
update kit link to the new one
|
2013-02-09 12:47:36 +02:00 |
|
Chris Ward
|
fb60272439
|
Merge pull request #311 from necrodoom/patch-43
fix itemmeta link on kit section
|
2013-02-09 02:41:01 -08:00 |
|
Necrodoom
|
80ad075f02
|
fix itemmeta link on kit section
|
2013-02-09 11:57:32 +02:00 |
|
GunfighterJ
|
37029e6b5d
|
Un-deletes deleted things.
|
2013-02-08 17:14:46 -06:00 |
|
GunfighterJ
|
631e0bbd0a
|
Merge branch '2.9' of https://github.com/essentials/Essentials into 2.9
|
2013-02-08 16:05:48 -06:00 |
|
snowleo
|
3f31dc179b
|
Fix /seen command
|
2013-02-08 22:26:21 +01:00 |
|
snowleo
|
5b975672e8
|
Don't overwrite last location on logout
Logout position is saved as logoutlocation now in users yml
|
2013-02-08 21:22:35 +01:00 |
|
snowleo
|
335d8b7f20
|
Check if player is still online
|
2013-02-08 21:18:00 +01:00 |
|
snowleo
|
379e75f3e6
|
Fix async access to bukkit code
|
2013-02-08 21:16:21 +01:00 |
|
Chris Ward
|
2ca171a3f4
|
Merge pull request #304 from necrodoom/patch-40
pull messages.properties changes to messages_en
|
2013-02-06 22:54:27 -08:00 |
|
Necrodoom
|
8036cc9924
|
pull messages.properties changes to messages_en
|
2013-02-06 16:15:18 +02:00 |
|
Chris Ward
|
6442e793a9
|
Merge pull request #300 from necrodoom/patch-39
add missing puncuation
|
2013-02-06 02:49:04 -08:00 |
|
KHobbits
|
d745b866c0
|
Don't block food recovery in god mode.
|
2013-02-05 23:34:08 +00:00 |
|
KHobbits
|
4493d7d00c
|
Merge pull request #302 from GunfighterJ/patch-9
Prevents flying from being disabled on world teleport if player has esse...
|
2013-02-05 12:07:36 -08:00 |
|
GunfighterJ
|
631692d763
|
Prevents flying from being disabled on world teleport if player has essentials.fly
|
2013-02-05 13:16:27 -06:00 |
|
GunfighterJ
|
ef341ae539
|
Adds potion meta
Some cleanup as well
|
2013-02-05 13:13:19 -06:00 |
|
Necrodoom
|
d0e3c1d946
|
fix a few errors
|
2013-02-05 16:45:30 +02:00 |
|
Necrodoom
|
82137e0703
|
add missing puncuation
probably needs extra reading though before pulling.
|
2013-02-05 13:57:27 +02:00 |
|
KHobbits
|
a3b2ffdeef
|
Merge pull request #297 from necrodoom/patch-36
fix typo at ID 22
|
2013-02-05 03:26:19 -08:00 |
|
Necrodoom
|
dd095e15cb
|
Fix typo at groupmanager config.yml
|
2013-02-05 13:13:00 +02:00 |
|
Necrodoom
|
46fc6c192c
|
fix typo at ID 22
|
2013-02-05 13:11:36 +02:00 |
|
ElgarL
|
6506c290c8
|
Revert Necro's change to mancheckw
|
2013-02-04 13:44:58 +00:00 |
|
ElgarL
|
b1bc73f938
|
Fix Necrodooms errors for not using an IDE!!!!!
|
2013-02-04 13:33:06 +00:00 |
|
ElgarL
|
09851acd1b
|
Merge pull request #291 from necrodoom/patch-32
display name instead of path for /mancheckw
|
2013-02-04 05:29:10 -08:00 |
|
ElgarL
|
df42c9051b
|
Merge pull request #290 from necrodoom/patch-30
Derp - revert incorrect modified line
|
2013-02-04 05:25:10 -08:00 |
|
KHobbits
|
24c93c11c0
|
Stylize 'bed' in /home list
|
2013-02-03 17:30:14 +00:00 |
|
Chris Ward
|
5a13e9bbe5
|
Merge pull request #294 from necrodoom/patch-35
add common cat type name aliases
|
2013-02-03 05:16:17 -08:00 |
|
Necrodoom
|
05f337c63c
|
add common cat type name aliases
|
2013-02-03 15:13:36 +02:00 |
|
KHobbits
|
eea0c9682c
|
We don't need move events if afk interact is disabled.
|
2013-02-03 05:15:25 +00:00 |
|
KHobbits
|
2f567812d2
|
Merge pull request #292 from GunfighterJ/2.9
Adds toggle to disable AFK cancel on interactions
|
2013-02-02 21:11:43 -08:00 |
|
GunfighterJ
|
88c1b785af
|
Adds toggle to disable AFK cancel on interactions
|
2013-02-02 23:06:09 -06:00 |
|
KHobbits
|
5225fb22f8
|
Minor comment updates.
|
2013-02-03 04:14:23 +00:00 |
|
Necrodoom
|
fae5780e09
|
Update EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
|
2013-02-01 16:39:18 +02:00 |
|
Necrodoom
|
7ec65bf213
|
Update EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java
|
2013-02-01 16:33:55 +02:00 |
|
Necrodoom
|
d40484d016
|
Update EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java
|
2013-02-01 16:33:37 +02:00 |
|
Necrodoom
|
971902ae38
|
Update EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java
|
2013-02-01 16:31:58 +02:00 |
|
Necrodoom
|
844be04d75
|
Derp - revert incorrect modified line
|
2013-02-01 14:14:46 +02:00 |
|
KHobbits
|
ef01332114
|
Fix missing 'bed' from home list.
|
2013-02-01 05:26:17 +00:00 |
|
KHobbits
|
705b193450
|
Let Bukkit decide if a bedspawn is valid or not.
Bukkit's bed fix forces minimum bukkit change.
|
2013-02-01 02:59:40 +00:00 |
|
KHobbits
|
20b9111495
|
[GM] Catch all of the null.
|
2013-02-01 02:52:41 +00:00 |
|
KHobbits
|
1661eddc02
|
Make gm API lookup respect offlineperms toggle properly.
|
2013-02-01 00:01:57 +00:00 |
|
KHobbits
|
15be319d3e
|
Updating groups example
|
2013-01-31 21:02:38 +00:00 |
|
KHobbits
|
fddbd7a52a
|
Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9
Conflicts:
EssentialsGroupManager/src/Changelog.txt
|
2013-01-31 20:38:36 +00:00 |
|
Iaccidentally
|
360e3e8801
|
cleanup :: fix build
|
2013-01-31 14:40:33 -05:00 |
|
Iaccidentally
|
4edc39360a
|
Refactor name of ScheduleAsyncDelayedTask to RunTaskAsynchronously
|
2013-01-31 14:16:09 -05:00 |
|
Iaccidentally
|
cd126264e0
|
Update to 1.4.7 R1 :: remove calls to ScheduleAsyncDelayedTask, as it is deprecated :: cleanup :: WARNING: This commit may or may not be stable
|
2013-01-31 14:03:27 -05:00 |
|
ElgarL
|
df0ccb5832
|
Fix Necrodooms broken code.
|
2013-01-30 19:55:38 +00:00 |
|