1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-24 21:31:32 +02:00
Commit Graph

2887 Commits

Author SHA1 Message Date
KHobbits
ecc03a9d54 Little bit DRYer 2012-09-29 23:41:12 +01:00
KHobbits
026ddbbf67 Merge branch '2.9' of github.com:essentials/Essentials into 2.9 2012-09-29 23:35:09 +01:00
KHobbits
356c750c6f Properly handle tphere requests so the right user is in control/charged. 2012-09-29 23:34:46 +01:00
KHobbits
202fc901a9 Tidy Teleport file 2012-09-29 23:33:32 +01:00
KHobbits
f74f7910ff Merge pull request #161 from necrodoom/patch-11
update signs permission check
2012-09-29 13:52:07 -07:00
Necrodoom
8b89ffa965 update kit sign permission check 2012-09-29 15:57:31 +03:00
Necrodoom
a3aed7eb9b update warp sign permission check 2012-09-29 15:55:47 +03:00
KHobbits
8cadbed40b Should fix tpaccept charge bug - needs testing 2012-09-29 03:59:31 +01:00
KHobbits
c0721e7085 Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9 2012-09-28 23:01:32 +01:00
KHobbits
f4d95c0442 Add potion effect clearing on /heal - Chris Ward 2012-09-28 20:56:03 +01:00
KHobbits
eae2294673 Cleanup of god mode effects, suggested by gravypod. 2012-09-28 20:45:56 +01:00
KHobbits
0d59f78465 God mode cancel potion effects - Chris ward
Revert heal changes.
2012-09-28 20:35:13 +01:00
Paul A.
eae246dc90 Fix updating version on items.csv 2012-09-27 16:39:23 +02:00
Paul A.
291781a891 Merge pull request #156 from evonuts/patch-1
Minor spelling/grammatical fixes
2012-09-27 05:47:31 -07:00
evonuts
d097d9e04c Minor spelling/grammatical fixes 2012-09-28 00:42:25 +12:00
Paul A.
5e4e8081b6 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
c5263dcc34 typo fix in config.yml 2012-09-27 15:19:14 +03:00
KHobbits
99f5f93e06 Remove debug comments. 2012-09-25 22:37:58 +01:00
KHobbits
931a76fb0f Handle negated wildcard perms in generic superperms 2012-09-25 22:21:15 +01:00
ElgarL
493b041704 Update users.yml to follow new ordering. 2012-09-25 20:41:16 +01:00
ElgarL
a4df448d23 No need for a new array. 2012-09-25 20:39:24 +01:00
ElgarL
48f502f679 Add alphabetically sorted user lists. 2012-09-25 13:23:19 +01:00
KHobbits
a357c7e5b5 Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9 2012-09-25 13:16:41 +01:00
ElgarL
5a137842e5 Change order of data in Users.yml to [name, Group, SubGroup,
Permissions, Info nodes].
2012-09-25 13:09:26 +01:00
ElgarL
b4a8f357bd Commenting 2012-09-25 11:27:36 +01:00
ElgarL
99a4f6d366 Fix javadocs 2012-09-25 11:25:19 +01:00
ElgarL
d7cecb1758 Minor typo fix - Necrodoom 2012-09-25 11:15:28 +01:00
KHobbits
611de7d725 Revert "Clean up imports"
This reverts commit 276cc71db0.
2012-09-24 23:04:33 +01:00
KHobbits
ebd6d03108 Improve fake sign check. 2012-09-24 23:01:58 +01:00
Paul A.
dd12013329 Merge pull request #151 from gravypod/patch-2
Clean up imports
2012-09-24 14:34:36 -07:00
KHobbits
0c8975db45 Envelope new drop/pickup/craft perms under 'essentials.build'. 2012-09-24 12:48:07 +01:00
KHobbits
c356e92287 Minor cleanup 2012-09-24 03:16:15 +01:00
gravypod
276cc71db0 Clean up imports 2012-09-23 22:06:39 -03:00
KHobbits
2bc87841d1 Fix and give better sign errors. 2012-09-24 00:19:39 +01:00
KHobbits
8745568a69 Less sign checking if certain signs aren't enabled. 2012-09-23 23:51:57 +01:00
KHobbits
378ed75ecc config typo. 2012-09-23 23:18:17 +01:00
KHobbits
f9a014a08b Minor colour change 2012-09-23 23:08:35 +01:00
KHobbits
8470b05a6c Move wildcard perm check to superperms handler, rather than being PEX specific. 2012-09-23 23:01:14 +01:00
KHobbits
fc5c0e3e7a Lower reporting level of metrics errors. 2012-09-23 18:08:43 +01:00
KHobbits
11c68e03b6 Support new lines in newbie welcome message. 2012-09-22 21:15:04 +01:00
KHobbits
8949cbc5fb Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9
Resolved Conflicts:
	EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
2012-09-22 20:44:45 +01:00
KHobbits
143d9d2089 Cleanup delhome to match normal home cases properly. 2012-09-22 20:43:27 +01:00
ElgarL
f9dafb06be Update warning in GlobalGroups - Necrodoom. 2012-09-22 19:51:38 +01:00
ElgarL
1dc93a7a85 - Fix Synchronization on adding subgroups (thanks snowleo).
- Remove info node support from GlobalGroups. It should not have them
as GlobalGroups are only permission collections.
2012-09-22 19:18:51 +01:00
KHobbits
daa517c5a2 Reset colour code at start of default broadcast msg. 2012-09-22 15:00:00 +01:00
KHobbits
a49570605a General demo txt formatting 2012-09-22 14:44:56 +01:00
KHobbits
ee647e1fae Clean chat colours. 2012-09-22 14:40:56 +01:00
KHobbits
416eee97ad Clean up the info.txt 2012-09-22 14:36:07 +01:00
KHobbits
f905ae8701 Merge pull request #148 from necrodoom/patch-7
fix info.txt colors and tags
I'll do a little manual cleanup.
2012-09-22 06:21:51 -07:00
KHobbits
71d39bc23b Possibly solve info writing issues in globalgroups
Editing this on the ess branch, cause i'm sure there is a better fix.
2012-09-22 04:35:55 +02:00