minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-10-04 01:51:58 +02:00
Code Issues Releases Wiki Activity
2,927 Commits 7 Branches 42 Tags
41946a2da9199e5fafadeea4716daf389752fd9c
Commit Graph

2927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snowleo
8aa260ee34 Minor fix to french translation 2012-01-26 04:49:26 +01:00
Léa Gris
25976edc2b i18n added to command nuke 2012-01-26 04:46:00 +01:00
Léa Gris
8e9094a3ef Updated translations to Essentials Dev2.7.191 2012-01-26 04:45:16 +01:00
KHobbits
16bde87982 Merge branch 'master' into release 2012-01-26 00:31:05 +00:00
KHobbits
b8944d0b25 Set min bukkit to 1818 - RB 2012-01-26 00:30:33 +00:00
KHobbits
69209eeb2f Merge remote branch 'remotes/origin/groupmanager' 2012-01-26 00:28:10 +00:00
KHobbits
72ed86e0dd Tidy chat. 2012-01-26 00:01:49 +00:00
KHobbits
c689b55c4d Fix depends 2012-01-25 23:56:54 +00:00
ElgarL
746eb353a2 Fixed an infinite loop error when using '/manudel' on a logged in 
player. It caused setDefaultGroup to trigger a bukkit update when no GM
User existed yet.
 2012-01-25 23:44:14 +00:00
ElgarL
3708f2b3bb Trap errors in fetching the mirrors map. 2012-01-25 22:43:07 +00:00
ElgarL
e563405a7d Check for a null player object in the PlayerTeleportEvent. 2012-01-25 22:35:24 +00:00
ElgarL
ae2cf3d95c Fixed subgroups (I broke earlier). 2012-01-25 22:33:22 +00:00
ementalo
270533652b Merge branch 'master' into release 2012-01-25 14:29:05 +00:00
paul.aston
324dd05c97 CB #1818 
RB #1200
 2012-01-25 14:23:46 +00:00
Paul A.
2a0c3eebbc Merge pull request #43 from essentials/groupmanager 
Fix trying to modify an unmodifiable collection breaking superperms.
 2012-01-24 17:29:08 -08:00
ElgarL
e1660d47ba Fix trying to modify an unmodifiable collection breaking superperms. 2012-01-25 01:20:44 +00:00
ementalo
cbee61093e Fix exception when getting displayname 
Fix exception if null values are in settings groups.yml
 2012-01-25 01:09:32 +00:00
KHobbits
03d640260d Merge branch 'master' into release 2012-01-25 00:04:08 +00:00
KHobbits
da3a6af92d Merge remote branch 'remotes/origin/groupmanager' 2012-01-25 00:02:15 +00:00
KHobbits
df061749dd 2nd sweep over Essentials Chat, to implement 2.8 changes. 
Formatting cache still needs reimplemented.
 2012-01-24 23:20:00 +00:00
KHobbits
38a9327284 Merge branch '3.0' of github.com:essentials/Essentials into 3.0 
Conflicts:
	Essentials/src/messages_en.properties
 2012-01-24 22:56:53 +00:00
ementalo
307c6c7bf0 remove merge leftovers 
Don't try to spawn users who have disconnected before we have a chance to spawn them
 2012-01-24 22:50:34 +00:00
ementalo
593cb8d56e Don't try to spawn users who have disconnected before we have a chance to spawn them 2012-01-24 22:43:33 +00:00
KHobbits
bdc695c85b First sweep over Essentials Chat, to implement 2.8 changes. 
Formatting cache still needs reimplemented.
 2012-01-24 22:08:20 +00:00
KHobbits
8c54f37092 Fix messages file 2012-01-24 20:47:11 +00:00
ElgarL
f40f5f880b Fix typo/wording in changelog 
Allow negation to the * permission node when populating superperms.
 2012-01-24 19:41:22 +00:00
ElgarL
8390594682 Allow negations with the * permission node when population superperms. 2012-01-24 19:38:22 +00:00
ElgarL
a13740f638 Fix hasOwnData to return a correct result with new mirroring system 2012-01-24 15:37:21 +00:00
ElgarL
5f19cbf17b Fixed isInList 2012-01-24 15:35:20 +00:00
ElgarL
145b0be2f3 addSubGroup now returns a boolean for success/failure. 
'/manuaddsub' now correctly reports if it was able to add the sub
group.
 2012-01-24 14:21:07 +00:00
ElgarL
1dab4f95dd Added recursive loop detection for World mirroring (you may not set the 
main world as a mirror of another).
Fixed fetching world data so it no longer returns the mirrored world
for groups. Each world data holder now points to the correct data set,
so can be returned as an object.
 2012-01-24 14:08:53 +00:00
snowleo
f27b2290dc Merge branch 'refs/heads/master' into release 2012-01-24 03:43:49 +01:00
snowleo
0ea41d9169 Merge branch 'refs/heads/groupmanager' 2012-01-24 03:43:17 +01:00
snowleo
cc0e9aa84b Merge branch 'refs/heads/master' into 3.0 
The changes to EssChat have not been merged

Conflicts:
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
	Essentials/src/com/earth2me/essentials/ISettings.java
	Essentials/src/com/earth2me/essentials/OfflinePlayer.java
	Essentials/src/com/earth2me/essentials/Settings.java
	Essentials/src/com/earth2me/essentials/Util.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
	Essentials/src/messages.properties
	Essentials/src/messages_da.properties
	Essentials/src/messages_de.properties
	Essentials/src/messages_en.properties
	Essentials/src/messages_es.properties
	Essentials/src/messages_fr.properties
	Essentials/src/messages_nl.properties
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
	EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
	EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
	EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
	EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
 2012-01-24 00:52:08 +01:00
snowleo
6af054631f More work on 3.0 branch 2012-01-24 00:01:31 +01:00
ementalo
01a37df700 Add new permission essentials.protect.alerts.notrigger 
If user has this permisson they do not trigger EssProtect block alerts
Fix spawnmob sign command args
 2012-01-23 16:00:23 +00:00
ementalo
f93769dd1d Add new permission essentials.protect.alerts.notrigger 
If user has this permisson they do not trigger EssProtect block alerts
 2012-01-23 15:48:56 +00:00
ElgarL
125ea7c701 Fixed infinite loop error on player join. 
Optimized code to only update the player logging in instead of all
players online.
 2012-01-22 23:46:26 +00:00
ElgarL
6e03ea7b7d Separated all events to be independent classes. 2012-01-21 20:18:40 +00:00
ElgarL
9041596384 Fixed a random null error upon a player portaling. 2012-01-21 19:09:08 +00:00
KHobbits
efda9beece Merge branch 'master' into release 2012-01-21 17:19:12 +00:00
ElgarL
4b61ac9043 Update to new Bukkit Event system. 
Update GroupManagerBridge for new event system.
 2012-01-21 11:47:08 +00:00
KHobbits
72edfacfb8 Catching throwable leads to madness, lets do this safely. 2012-01-21 00:19:13 +00:00
KHobbits
aa88205d95 Catch errors too, incase the class doesn't exist. 2012-01-21 00:01:43 +00:00
KHobbits
8d441a4cc7 Messages Cleanup 2012-01-20 23:13:37 +00:00
KHobbits
766935871f If vault throws an exception, it should not be enabled. 2012-01-20 23:04:43 +00:00
KHobbits
f5d65371b2 Adding translation keys for [L] and [Spy] 2012-01-20 22:57:35 +00:00
KHobbits
662749be8b Check shout/question messages are longer than 1 character. 2012-01-20 22:54:47 +00:00
snowleo
e46fe381b4 Removing load info, bucket displays that now. 2012-01-20 05:52:35 +01:00
snowleo
04a43eb5d0 New Event code for EssentialsSpawn 2012-01-20 05:34:28 +01:00