Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-18 00:25:32 +01:00
Code Issues Projects Releases Wiki Activity
3,409 Commits 10 Branches 68 Tags 427 MiB
c298fb9332
Commit Graph

3409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KHobbits
c298fb9332 Attempt to optimize Essentials login event. 2013-02-11 23:11:37 +00:00
KHobbits
a1f1319990 Merge pull request #325 from Skylexia/patch-2 
Fixed all "poison" typos; add ppotato alias.
 2013-02-11 15:00:14 -08:00
Skylexia
2316bfbd28 Update Essentials/src/items.csv 2013-02-11 17:57:20 -05:00
KHobbits
96348a5e92 Merge pull request #324 from Skylexia/patch-1 
Update Essentials/src/items.csv
 2013-02-11 10:41:09 -08:00
Skylexia
d9903efcf4 Update Essentials/src/items.csv 2013-02-11 13:38:11 -05:00
KHobbits
bc90deb87d Merge pull request #322 from necrodoom/patch-50 
add dye aliases to match bukkit
 2013-02-11 09:22:56 -08:00
Necrodoom
c35e5bf53a add dye aliases to match bukkit 2013-02-11 18:56:23 +02:00
KHobbits
8ea0a152d4 Merge pull request #321 from GunfighterJ/patch-10 
Fix array index out of bounds on /firework fire
 2013-02-11 08:41:47 -08:00
GunfighterJ
8e205768b3 Fix array index out of bounds on /firework fire 2013-02-11 10:35:55 -06:00
Chris Ward
05aeba521f Merge pull request #317 from necrodoom/patch-47 
update AFK documation
 2013-02-10 01:54:37 -08:00
Necrodoom
8dff1155bf update AFK documation 2013-02-10 11:46:59 +02:00
Chris Ward
b6648ad9bd Fix compilation, unreachable code. 2013-02-10 20:37:46 +11:00
Chris Ward
40f03295a1 Merge pull request #316 from necrodoom/patch-46 
throw exception on banexempt
 2013-02-10 01:34:53 -08:00
Necrodoom
5fdb10a5bf throw exception on banexempt 
match rest of moderator commands
 2013-02-10 11:04:55 +02:00
KHobbits
e9bb2df87d Fix kit messages when giving kit to another player. 2013-02-10 00:07:40 +00:00
KHobbits
be29e4da59 missing alias 2013-02-09 23:39:21 +00:00
KHobbits
d522a4230f Make /god and /god <player> behave the same. 2013-02-09 19:31:31 +00:00
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
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
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
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