Quantcast

Merge branch 'master' into dev

Repooc [09-18-17 - 04:31]
Merge branch 'master' into dev
Filename
Description for Wowinterface and Curse.txt
ElvUI_SLE/ElvUI_SLE.toc
ElvUI_SLE/modules/professions/deconstruct.lua
README.md
diff --git a/Description for Wowinterface and Curse.txt b/Description for Wowinterface and Curse.txt
index ac03b6d..23b7dca 100644
--- a/Description for Wowinterface and Curse.txt
+++ b/Description for Wowinterface and Curse.txt
@@ -6,11 +6,11 @@ Originally this project started as two personal edits of ElvUI by Darth Predator
 You'll find Shadow & Light options under it's own configuration category in ElvUI's config section by typing /ec

 [color="#3e8ac6"][b]Suggestions/Concerns:[/b][/color]
-[list][url=http://git.tukui.org/repooc/elvui-shadowandlight/issues]Ticket System[/url]
+[list][url=https://git.tukui.org/Darth_Predator/elvui-shadowandlight/issues]Ticket System[/url]
 [/list]

 [color="#3e8ac6"][b]Download Locations:[/b][/color]
-[list][url=http://www.tukui.org/addons/index.php?act=view&id=42]Tukui[/url]
+[list][url=https://www.tukui.org/addons.php?id=38]Tukui[/url]
 [*][url=http://www.wowinterface.com/downloads/fileinfo.php?id=20927]Wowinterface[/url]
 [*][url=http://www.curse.com/addons/wow/shadow-and-light-edit]Curse[/url]
 [/list]
@@ -56,10 +56,10 @@ You'll find Shadow & Light options under it's own configuration category in ElvU
 Did we forget anyone? O_o

 [color="#ff0000"][b]Technical Support:[/b][/color]
-If you have any questions or concerns, we want to hear about it.  You are welcome to post it via the [url=http://git.tukui.org/repooc/elvui-shadowandlight/issues]Ticket System[/url].
+If you have any questions or concerns, we want to hear about it.  You are welcome to post it via the [url=https://git.tukui.org/Darth_Predator/elvui-shadowandlight/issues]Ticket System[/url].

 Darth Predator and I will do our best to address everyone's concern.  We typically need some information from you other than the problem you are having.  Before posting, PLEASE, make sure you are running the latest version of Shadow & Light as well as ElvUI and that you <b>DISABLE ALL</b> addons except for those two and try to reproduce the issue.  It is important that you do that so we can narrow down what is causing the problem in the first place.
-
+s
 Information to provide when posting:
 1.) Shadow & Light Version
 2.) ElvUI Version
diff --git a/ElvUI_SLE/ElvUI_SLE.toc b/ElvUI_SLE/ElvUI_SLE.toc
index 8a77e49..c5d888d 100644
--- a/ElvUI_SLE/ElvUI_SLE.toc
+++ b/ElvUI_SLE/ElvUI_SLE.toc
@@ -2,7 +2,7 @@
 ## Title: |cff1784d1ElvUI|r |cff9482c9Shadow & Light|r
 ## Author: Darth Predator, Repooc
 ## Version: 3.27
-## Notes: Plugin-edit for |cff1784d1ElvUI|r implementing additional features.
+## Notes: Plugin-edit for |cff1784d1ElvUI|r adding additional features.
 ## Notes-ruRU: Плагин-редакция для |cff1784d1ElvUI|r, добавляющий новые функции.
 ## URL: http://tukui.org/
 ## RequiredDeps: ElvUI
@@ -20,4 +20,4 @@ defaults\load_defaults.xml
 modules\load_modules.xml
 skins\load_skins.xml
 options\load_options.xml
-Bindings.xml
+Bindings.xml
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/professions/deconstruct.lua b/ElvUI_SLE/modules/professions/deconstruct.lua
index efc1b72..babb722 100644
--- a/ElvUI_SLE/modules/professions/deconstruct.lua
+++ b/ElvUI_SLE/modules/professions/deconstruct.lua
@@ -211,6 +211,7 @@ function Pr:DeconstructParser(tt)
 	local _, id = T.split(":", itemString)
 	if not id or id == "" then return end
 	if(item and not T.InCombatLockdown()) and (Pr.DeconstructMode == true or (E.global.sle.LOCK.TradeOpen and self:GetOwner():GetName() == "TradeRecipientItem7ItemButton")) then
+		local r, g, b
 		if lib:IsOpenable(id) and Pr:IsUnlockable(link) then
 			r, g, b = 0, 1, 1
 			Pr:ApplyDeconstruct(link, Pr.LOCKname, "spell", r, g, b)
diff --git a/README.md b/README.md
index c98c767..ef457ba 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,5 @@ we be the lazy peeps -Repooc
 By ((two)) three lazy asses lol :D
 ^ REALLY LAZY ASSES
 Doing test commit
-Some people like Kiritsu and placo have no life and want to start shit
\ No newline at end of file
+Some people like Kiritsu and placo have no life and want to start shit
+Test
\ No newline at end of file