Commit graph

2899 commits

Author SHA1 Message Date
KHobbits d7829bef28 Merge pull request #163 from chrisgward/patch-1
Fixes #2933
2012-10-01 03:27:37 -07:00
Chris Ward d436d10b00 Typo (Ticket 2933) 2012-10-01 20:12:13 +10:00
KHobbits 2d9254eb28 Merge pull request #158 from necrodoom/patch-10
update potion aliases- add all unused potions
2012-09-30 13:55:20 -07:00
KHobbits 23393aea5f Merge pull request #162 from necrodoom/patch-12
small fixes to items.csv
2012-09-30 13:55:09 -07:00
KHobbits e1562e38bf Restore removed tp method, it is used in other plugins. 2012-09-30 18:15:46 +01:00
Necrodoom 29fa2f0f19 small fixes to items.csv 2012-09-30 19:22:14 +03:00
KHobbits b850ae93e9 Merge branch 'release' of github.com:essentials/Essentials into 2.9 2012-09-30 17:21:09 +01:00
Necrodoom 21cb8efb90 update kit sign permission check 2012-09-30 17:16:03 +01:00
Necrodoom cd7be1bb86 update warp sign permission check 2012-09-30 17:15:57 +01:00
KHobbits 69cd17a1b1 Should fix tpaccept charge bug - needs testing 2012-09-30 17:15:40 +01:00
KHobbits 872bc4df4c New permission: essentials.teleport.timer.move - allow players to move during tp delay 2012-09-29 23:48:59 +01:00
KHobbits 3083ba2627 Little bit DRYer 2012-09-29 23:41:12 +01:00
KHobbits 35259892b8 Merge branch '2.9' of github.com:essentials/Essentials into 2.9 2012-09-29 23:35:09 +01:00
KHobbits fbc0f13b2b Properly handle tphere requests so the right user is in control/charged. 2012-09-29 23:34:46 +01:00
KHobbits aa7f49cb85 Tidy Teleport file 2012-09-29 23:33:32 +01:00
KHobbits 720676542e Merge pull request #161 from necrodoom/patch-11
update signs permission check
2012-09-29 13:52:07 -07:00
Necrodoom 1d7eb77f27 update kit sign permission check 2012-09-29 15:57:31 +03:00
Necrodoom 895f6269fc update warp sign permission check 2012-09-29 15:55:47 +03:00
KHobbits 4bf0d3ab24 Should fix tpaccept charge bug - needs testing 2012-09-29 03:59:31 +01:00
KHobbits afccda6350 Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9 2012-09-28 23:01:32 +01:00
KHobbits c0a176825c Add potion effect clearing on /heal - Chris Ward 2012-09-28 20:56:03 +01:00
KHobbits db6512b702 Cleanup of god mode effects, suggested by gravypod. 2012-09-28 20:45:56 +01:00
KHobbits 46d3f0827a God mode cancel potion effects - Chris ward
Revert heal changes.
2012-09-28 20:35:13 +01:00
Necrodoom 838d7dd8f9 update potion aliases- add all unused potions
items.csv version 2.1_13
2012-09-28 17:02:43 +03:00
Paul A. b9e5c8827f Fix updating version on items.csv 2012-09-27 16:39:23 +02:00
Paul A. b8e000c7f9 Merge pull request #156 from evonuts/patch-1
Minor spelling/grammatical fixes
2012-09-27 05:47:31 -07:00
evonuts 5e7af93c77 Minor spelling/grammatical fixes 2012-09-28 00:42:25 +12:00
Paul A. 077ad8cd0f Merge pull request #154 from necrodoom/patch-9
typo fix in config.yml as found by @Evonuts
2012-09-27 05:22:09 -07:00
Necrodoom 0bf954e467 typo fix in config.yml 2012-09-27 15:19:14 +03:00
KHobbits 8a55afc4e1 Remove debug comments. 2012-09-25 22:37:58 +01:00
KHobbits 2bc9f2e386 Handle negated wildcard perms in generic superperms 2012-09-25 22:21:15 +01:00
ElgarL 920e1a3b1f Update users.yml to follow new ordering. 2012-09-25 20:41:16 +01:00
ElgarL 353253b9c5 No need for a new array. 2012-09-25 20:39:24 +01:00
ElgarL 1438230b70 Add alphabetically sorted user lists. 2012-09-25 13:23:19 +01:00
KHobbits 240aebde98 Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9 2012-09-25 13:16:41 +01:00
ElgarL d4e2ed782e Change order of data in Users.yml to [name, Group, SubGroup,
Permissions, Info nodes].
2012-09-25 13:09:26 +01:00
ElgarL f025cd9d2f Commenting 2012-09-25 11:27:36 +01:00
ElgarL 1ff7082892 Fix javadocs 2012-09-25 11:25:19 +01:00
ElgarL 15fa10dd29 Minor typo fix - Necrodoom 2012-09-25 11:15:28 +01:00
KHobbits 00b4bdadd4 Revert "Clean up imports"
This reverts commit d2546ebd36.
2012-09-24 23:04:33 +01:00
KHobbits 3055dd93a5 Improve fake sign check. 2012-09-24 23:01:58 +01:00
Paul A. 94dc29cc4d Merge pull request #151 from gravypod/patch-2
Clean up imports
2012-09-24 14:34:36 -07:00
KHobbits 22d1db5463 Envelope new drop/pickup/craft perms under 'essentials.build'. 2012-09-24 12:48:07 +01:00
KHobbits f2b4bb00b6 Minor cleanup 2012-09-24 03:16:15 +01:00
gravypod d2546ebd36 Clean up imports 2012-09-23 22:06:39 -03:00
KHobbits f1930e76d6 Fix and give better sign errors. 2012-09-24 00:19:39 +01:00
KHobbits d722e6a9f0 Less sign checking if certain signs aren't enabled. 2012-09-23 23:51:57 +01:00
KHobbits 8e6d4b1595 config typo. 2012-09-23 23:18:17 +01:00
KHobbits 72065c81f3 Minor colour change 2012-09-23 23:08:35 +01:00
KHobbits 2864d0186c Move wildcard perm check to superperms handler, rather than being PEX specific. 2012-09-23 23:01:14 +01:00