Merge remote-tracking branch 'master/dev' into dev
Merathilis [09-16-17 - 19:28]
Merge remote-tracking branch 'master/dev' into dev
diff --git a/ElvUI_SLE/modules/minimap/locationbar.lua b/ElvUI_SLE/modules/minimap/locationbar.lua
index bb355fc..be82643 100644
--- a/ElvUI_SLE/modules/minimap/locationbar.lua
+++ b/ElvUI_SLE/modules/minimap/locationbar.lua
@@ -79,7 +79,7 @@ LP.PortItems = {
{140324, nil, true}, --Mobile Telemancy Beacon
{129276}, --Beginner's Guide to Dimensional Rifting
{140493}, --Adept's Guide to Dimensional Rifting
- [112059, nil, true], --Wormhole Generator: Argus
+ {112059, nil, true}, --Wormhole Generator: Argus
}
LP.Spells = {
["DEATHKNIGHT"] = {
@@ -526,4 +526,4 @@ function LP:Initialize()
LP:RegisterEvent("PLAYER_ENTERING_WORLD")
end
-SLE:RegisterModule(LP:GetName())
\ No newline at end of file
+SLE:RegisterModule(LP:GetName())
diff --git a/ElvUI_SLE/modules/professions/deconstruct.lua b/ElvUI_SLE/modules/professions/deconstruct.lua
index 0cef511..efc1b72 100644
--- a/ElvUI_SLE/modules/professions/deconstruct.lua
+++ b/ElvUI_SLE/modules/professions/deconstruct.lua
@@ -33,7 +33,8 @@ Pr.ItemTable = {
["11287"] = true, --Lesser Magic Wand
["11288"] = true, --Greater Magic Wand
["116985"] = true, --Archeology Mail Hat
- ["136630"] = true, --Eng reagent rifle
+ ["136629"] = true, --Eng reagent rifle
+ ["136630"] = true, --Eng reagent rifle 2
},
--Bnet bound treasures in Pandaria
["PandariaBoA"] = {