Quantcast

Merge branch 'master' of git.tukui.org:repooc/elvui-shadowandlight

Repooc [10-23-14 - 23:41]
Merge branch 'master' of git.tukui.org:repooc/elvui-shadowandlight
Filename
ElvUI_SLE/core/globals.lua
ElvUI_SLE/core/toolkit.lua
ElvUI_SLE/libs/LibRealmInfo/LibRealmInfo.lua
ElvUI_SLE/modules/chat.lua
diff --git a/ElvUI_SLE/core/globals.lua b/ElvUI_SLE/core/globals.lua
index 81aabda..6236535 100644
--- a/ElvUI_SLE/core/globals.lua
+++ b/ElvUI_SLE/core/globals.lua
@@ -11,7 +11,6 @@ local friend = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\Chat_Friend:16:
 local test = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\Chat_Test:16:16|t "
 local rpg = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\Chat_RPG:13:35|t"
 local kitalie = "|TInterface\\Icons\\%s:12:12:0:0:64:64:4:60:4:60|t"
-local leader = [[|TInterface\GroupFrame\UI-Group-LeaderIcon:12:12|t]]

 E.SLEConfigs = {}

diff --git a/ElvUI_SLE/core/toolkit.lua b/ElvUI_SLE/core/toolkit.lua
index 3699ef9..e8b5647 100644
--- a/ElvUI_SLE/core/toolkit.lua
+++ b/ElvUI_SLE/core/toolkit.lua
@@ -169,7 +169,7 @@ function SLE:GetRegion()
 	local region = select(6, lib:GetRealmInfo(rid))
 	SLE.region = region

-	if not SLE.region then SLE.region = format("An error happened while processing your realm. Please report error id and realm to |cff1784d1Shadow & Light|r authors! Error id: %s. Realm: %s", rid, E.myrealm) end
+	if not SLE.region then SLE.region = format("An error happened while processing your realm. Please report error id, realm and the region you are playing to |cff1784d1Shadow & Light|r authors! Error id: %s. Realm: %s", rid, E.myrealm) end
 	if dev == "" then dev = SLE.Dev[SLE.region] end
 	if not dev then
 		SLE:Print(SLE.region)
diff --git a/ElvUI_SLE/libs/LibRealmInfo/LibRealmInfo.lua b/ElvUI_SLE/libs/LibRealmInfo/LibRealmInfo.lua
index 6709a67..e14b1af 100644
--- a/ElvUI_SLE/libs/LibRealmInfo/LibRealmInfo.lua
+++ b/ElvUI_SLE/libs/LibRealmInfo/LibRealmInfo.lua
@@ -589,7 +589,7 @@ data = {
 [1387]="Los Errantes,PVE,esES,Cruelty / Crueldad,EU",
 [570]="Lothar,PVE,deDE,Reckoning / Abrechnung,EU",
 [571]="Madmortem,PVE,deDE,Vengeance / Rache,EU",
-[622]="Magtheridon,PVE,enGB,Cruelty / Crueldad,EU",
+[3681]="Magtheridon,PVE,enGB,Cruelty / Crueldad,EU",
 [590]="Mal'Ganis,PVP,deDE,Sturmangriff / Charge,EU",
 [572]="Malfurion,PVE,deDE,Reckoning / Abrechnung,EU",
 [1324]="Malorne,PVE,deDE,Reckoning / Abrechnung,EU",
diff --git a/ElvUI_SLE/modules/chat.lua b/ElvUI_SLE/modules/chat.lua
index 4ddab2a..251ad1b 100644
--- a/ElvUI_SLE/modules/chat.lua
+++ b/ElvUI_SLE/modules/chat.lua
@@ -31,6 +31,7 @@ local rolePaths = {
 	HEALER = [[|TInterface\AddOns\ElvUI\media\textures\healer:15:15:0:0:64:64:2:56:2:56|t]],
 	DAMAGER = [[|TInterface\AddOns\ElvUI\media\textures\dps:15:15|t]]
 }
+local leader = [[|TInterface\GroupFrame\UI-Group-LeaderIcon:12:12|t]]
 local specialChatIcons

 local function Style(self, frame)