Merge branch 'master' of git.tukui.org:repooc/elvui-shadowandlight
Repooc [11-29-14 - 21:34]
Merge branch 'master' of git.tukui.org:repooc/elvui-shadowandlight
Signed-off-by: Repooc <repooc82@gmail.com>
diff --git a/ElvUI_SLE/core/install.lua b/ElvUI_SLE/core/install.lua
index 45125ad..48a9380 100644
--- a/ElvUI_SLE/core/install.lua
+++ b/ElvUI_SLE/core/install.lua
@@ -209,10 +209,16 @@ function AI:DarthSetup() --The function to switch from classic ElvUI settings to
E.db["unitframe"]["fontOutline"] = "OUTLINE"
E.db["unitframe"]["statusbar"] = "Polished Wood"
E.db["unitframe"]["font"] = "ElvUI Font"
- E.db["unitframe"]["colors"]["castNoInterrupt"]["b"] = 0.250980392156863
- E.db["unitframe"]["colors"]["castNoInterrupt"]["g"] = 0.250980392156863
- E.db["unitframe"]["colors"]["castNoInterrupt"]["r"] = 0.780392156862745
- E.db["unitframe"]["colors"]["auraBarBuff"]["b"] = 0.109803921568627
+ E.db["unitframe"]["colors"]["castNoInterrupt"] = {
+ ["r"] = 0.780392156862745,
+ ["g"] = 0.250980392156863,
+ ["b"] = 0.250980392156863,
+ }
+ E.db["unitframe"]["colors"]["castColor"] = {
+ ["r"] = 0.803921568627451,
+ ["g"] = 0.76078431372549,
+ ["b"] = 0.180392156862745,
+ }
E.db["unitframe"]["colors"]["auraBarBuff"]["g"] = 0.552941176470588
E.db["unitframe"]["colors"]["auraBarBuff"]["r"] = 0.317647058823529
E.db["unitframe"]["colors"]["colorhealthbyvalue"] = false
@@ -505,7 +511,6 @@ function AI:DarthSetup() --The function to switch from classic ElvUI settings to
E.private["sle"]["minimap"]["mapicons"]["enable"] = true
E.private["sle"]["equip"]["spam"] = true
E.private["sle"]["equip"]["setoverlay"] = true
- E.private["sle"]["marks"]["marks"] = true
E.private["ElvUI_Currency"]["Unused"] = false
E.private["ElvUI_Currency"]["Archaeology"] = false
diff --git a/ElvUI_SLE/modules/bags.lua b/ElvUI_SLE/modules/bags.lua
index e688974..5d8d6f9 100755
--- a/ElvUI_SLE/modules/bags.lua
+++ b/ElvUI_SLE/modules/bags.lua
@@ -134,6 +134,7 @@ end
function SB:Initialize()
self.hookedBags = {};
+ if not E.private.bags.enable then return end
local BUpdateSlot = B.UpdateSlot;
local SBUpdateSlot = SB.UpdateSlot;
for _, bagFrame in pairs(B.BagFrames) do