Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-08 12:00:19 +01:00
Code Issues Projects Releases Wiki Activity
2,947 Commits 11 Branches 68 Tags 426 MiB
9e4493fbb4
Commit Graph

2947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KHobbits
5cc24827fc 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
da01bdc2b0 Cleanup delhome to match normal home cases properly. 2012-09-22 20:43:27 +01:00
ElgarL
dfb81dd50f Update warning in GlobalGroups - Necrodoom. 2012-09-22 19:51:38 +01:00
ElgarL
567d52459b - 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
80a96e2a73 Reset colour code at start of default broadcast msg. 2012-09-22 15:00:00 +01:00
KHobbits
c2f8467ca9 General demo txt formatting 2012-09-22 14:44:56 +01:00
KHobbits
155ca46fef Clean chat colours. 2012-09-22 14:40:56 +01:00
KHobbits
0952150235 Clean up the info.txt 2012-09-22 14:36:07 +01:00
KHobbits
30faa39070 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
3e367912ec 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
Necrodoom
f8cff25bda fix info.txt colors and tags 2012-09-21 18:09:30 +03:00
md_5
3e80bf479e Check for explicit * permission when using PEX. 2012-09-21 19:53:20 +10:00
KHobbits
84afc80873 Update config.yml to show multiple enchantments for kits. 2012-09-21 02:10:39 +01:00
KHobbits
27a943217e Make sure we check for wildcards in PEX 2012-09-20 20:36:07 +01:00
KHobbits
16834d85c5 Switch pex permissions checks to use superperms rather than direct api call. 2012-09-20 20:21:45 +01:00
KHobbits
44d8c85450 ignoreCancelled events. 2012-09-19 21:07:50 +01:00
KHobbits
2a8e44dda8 New Permission: 
essentials.build.pickup.<id>[:<datavalue>] - Allows collecting of an item
essentials.build.drop.<id>[:<datavalue>] - Allows dropping of an item
 2012-09-19 20:57:06 +01:00
KHobbits
00e3957190 Merge branch '2.9' of github.com:essentials/Essentials into 2.9 2012-09-19 19:48:14 +01:00
KHobbits
a79b76e8d2 New Permission: 
essentials.build.craft.<id>[:<datavalue>] - Allows crafting of an item
 2012-09-19 19:47:47 +01:00
md_5
0a092ff5b3 Self indulgent commit. Door should be an alias for wood door. 2012-09-17 21:55:52 +10:00
KHobbits
e6aeefb12d Hide Protection sign option. 2012-09-17 11:29:16 +01:00
KHobbits
924b6bd2ba Fix a few minor text formatting issues. 2012-09-16 20:45:33 +01:00
KHobbits
f701090c89 Config file permissions cleanup 
Removed deprecated 'restricted-commands' section.
Deprecated 'superperms' toggle.
Remove op override on essentials permissions.
Give op's all permissions by default via superperms.
 2012-09-16 20:27:35 +01:00
KHobbits
b9195a561f Merge pull request #146 from necrodoom/patch-6 
update dualbit, fix strength, add swift aliases
 2012-09-16 08:48:16 -07:00
Necrodoom
d94e4095da update dualbit, fix strength, add swift aliases 
items.csv version 2.1_12
 2012-09-16 18:46:46 +03:00
md_5
fd61cd1750 Merge remote-tracking branch 'origin/groupmanager' into 2.9 2012-09-16 23:02:56 +10:00
Iaccidentally
e7ae8bcc47 Update Essentials/src/plugin.yml 
updating SKYNET
 2012-09-15 21:07:42 -03:00
KHobbits
edc4d62004 Missing tl key. 2012-09-15 22:06:42 +01:00
KHobbits
cdff690bb5 Add server uptime to /gc 2012-09-15 22:04:18 +01:00
KHobbits
aa14cc39d9 Add missing TL key 
Fixes #1363
 2012-09-15 21:16:31 +01:00
KHobbits
cdf2c8beed Allow bans on players who have never connected. 2012-09-15 20:57:44 +01:00
KHobbits
3e06c06827 Reduce the enchantment list some more. 2012-09-15 20:29:29 +01:00
KHobbits
a2886d76d2 Fix Essentials /sethome to more strictly obey home limits. 2012-09-15 19:55:12 +01:00
KHobbits
cc0a65bace /ess reset <player> - Clears stored data about a user. 2012-09-14 02:30:24 +01:00
KHobbits
d988546ef3 Merge branch '2.9' of github.com:essentials/Essentials into 2.9 2012-09-14 01:11:04 +01:00
KHobbits
b7f2add7b4 Fixed jail extend message - xGhOsTkiLLeRx 2012-09-14 01:10:22 +01:00
KHobbits
b07f65c58b Update Essentials/nbproject/project.properties 
Accidentally added unneeded line...
 2012-09-14 02:01:02 +02:00
KHobbits
18e315a048 Merge branch '2.9' of github.com:essentials/Essentials into 2.9 2012-09-14 00:59:25 +01:00
KHobbits
d3967297bb Don't create empty user files 2012-09-14 00:58:57 +01:00
KHobbits
ea3631ddc2 Merge pull request #141 from DerFlash/2.9 
Fix problems with async chat event not sending messages to xmpp chat spy
 2012-09-13 06:21:11 -07:00
DerFlash
992e473b72 Fix problems with async chat event not sending messages to xmpp chat spy 2012-09-13 14:57:02 +02:00
KHobbits
0296f4fcf1 remove users from bperm example, different yml file now. 2012-09-13 01:50:55 +01:00
KHobbits
2fc16250a3 Update bpermissions example 2012-09-13 01:46:23 +01:00
ElgarL
75f7b06a23 Remove unused imports. 2012-09-11 11:12:19 +01:00
KHobbits
a7e834e5f9 Couple extra /info aliases. 2012-09-11 05:05:55 +01:00
KHobbits
59086932bd Less strict matching on /realname 2012-09-11 01:07:31 +01:00
KHobbits
5611acf12c Make /realname throw an error if no matches were found 2012-09-11 00:53:32 +01:00
snowleo
60142d872f Missing final 2012-09-10 20:53:25 +02:00
snowleo
1cf0ebbd7f Thread safety for GM 2012-09-10 20:49:07 +02:00
snowleo
736a6d273a Revert bad synchronization 
This reverts commit 96ab1b4533.
 2012-09-10 19:06:17 +02:00