Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 462703a
Author: Paweł Jastrzębski <[email protected]>
Date:   Wed Apr 24 23:14:01 2024 +0200

    Updated Crest DataText

commit fe2970a
Author: Simpy <[email protected]>
Date:   Mon Apr 22 16:24:39 2024 -0400

    can't use this on classic anymore

commit 0da6a29
Author: Eltreum <[email protected]>
Date:   Sun Apr 21 15:17:41 2024 -0300

    update ptBR locale (tukui-org#1199)

commit df355e0
Author: namreeb <[email protected]>
Date:   Sun Apr 21 08:17:23 2024 -1000

    Added workaround for direct heals not reported by client when HealComm is present (tukui-org#1198)

commit 57835e6
Author: Simpy <[email protected]>
Date:   Sat Apr 20 18:19:15 2024 -0400

    oUF-wow/oUF#677

commit 6a9e514
Author: Simpy <[email protected]>
Date:   Sat Apr 20 18:14:34 2024 -0400

    oUF-wow/oUF#675

commit c202dbe
Author: Simpy <[email protected]>
Date:   Sat Apr 20 18:13:29 2024 -0400

    oUF-wow/oUF#674

commit f309445
Author: Simpy <[email protected]>
Date:   Sat Apr 20 17:54:49 2024 -0400

    fix interrupt msg for a832617

commit 8bc196f
Author: Simpy <[email protected]>
Date:   Sat Apr 20 17:20:49 2024 -0400

    dont need to translate

commit a832617
Author: anon1231823 <[email protected]>
Date:   Sat Apr 20 17:19:57 2024 -0400

    Update esMX.lua (tukui-org#1197)

commit 775f502
Author: Simpy <[email protected]>
Date:   Sat Apr 20 16:40:01 2024 -0400

    prefer C functions first

commit 1b4bab7
Author: Simpy <[email protected]>
Date:   Sat Apr 20 16:33:27 2024 -0400

    deprecated stuff

commit 205a5d2
Author: Simpy <[email protected]>
Date:   Sat Apr 20 15:53:55 2024 -0400

    move this

commit 8ea6f2f
Author: Simpy <[email protected]>
Date:   Sat Apr 20 15:49:16 2024 -0400

    testing func

commit e6e09d4
Author: Simpy <[email protected]>
Date:   Sat Apr 20 15:42:07 2024 -0400

    update blizz addon list

commit e6d9c23
Author: Simpy <[email protected]>
Date:   Tue Apr 16 21:12:08 2024 -0400

    add sunken temple difficulty id

commit d798dad
Author: Simpy <[email protected]>
Date:   Tue Apr 16 20:54:01 2024 -0400

    handle this another way

commit 857670c
Author: Luckyone <[email protected]>
Date:   Sun Apr 14 16:01:22 2024 +0200

    RaidBuffs: Sunken Temple 20man

commit c6f5ee2
Author: Luckyone <[email protected]>
Date:   Sun Apr 14 16:01:13 2024 +0200

    RaidDebuffs: Sunken Temple 20man

commit 5d0ddcb
Author: Darth Predator <[email protected]>
Date:   Sun Apr 14 02:55:18 2024 +0300

    Locales and stuff

commit 4f115b0
Author: Simpy <[email protected]>
Date:   Sat Apr 13 18:34:31 2024 -0400

    meow

commit 227aeda
Author: Simpy <[email protected]>
Date:   Sat Apr 13 18:09:45 2024 -0400

    think this is only broke on retail, others might double click otherwise

commit ea73e68
Author: Simpy <[email protected]>
Date:   Sat Apr 13 17:59:02 2024 -0400

    more accurate function name

commit b37261c
Author: Simpy <[email protected]>
Date:   Sat Apr 13 17:55:38 2024 -0400

    huh

commit 409d6dd
Author: Simpy <[email protected]>
Date:   Sat Apr 13 17:54:05 2024 -0400

    still false

commit c20d4df
Author: Simpy <[email protected]>
Date:   Sat Apr 13 17:47:02 2024 -0400

    update raid utility to work regardless of having leader/assist

commit f38ee28
Author: Repooc <[email protected]>
Date:   Sat Apr 13 16:06:50 2024 -0400

    update repooc's text

commit 9515250
Author: Simpy <[email protected]>
Date:   Sat Apr 13 14:12:19 2024 -0400

    pull char skin update from cata branch

commit 19d5eea
Author: Simpy <[email protected]>
Date:   Tue Apr 9 20:35:53 2024 -0400

    locales

commit e13ba2e
Author: Simpy <[email protected]>
Date:   Tue Apr 9 20:20:55 2024 -0400

    option to show high threat but not as primary target

commit 769260d
Author: Simpy <[email protected]>
Date:   Tue Apr 9 19:40:45 2024 -0400

    option to handle tukui-org#1187

commit 0a5c87f
Author: Simpy <[email protected]>
Date:   Tue Apr 9 19:36:27 2024 -0400

    new tag [threat:lead]

commit c0bb3f0
Author: Simpy <[email protected]>
Date:   Tue Apr 9 15:00:29 2024 -0400

    locales for the new option

commit 9bb41fe
Author: Simpy <[email protected]>
Date:   Tue Apr 9 14:53:47 2024 -0400

    retail changes from cata branch

commit 927ab2b
Author: Simpy <[email protected]>
Date:   Tue Apr 9 14:51:47 2024 -0400

    aura indicator override for pets (can uncheck Pet Specific to use profile or global)

commit e68e20d
Author: Simpy <[email protected]>
Date:   Sun Apr 7 19:15:03 2024 -0400

    bump minor version

commit b5c4ede
Author: Simpy <[email protected]>
Date:   Sun Apr 7 19:14:17 2024 -0400

    clean up some DT format

commit 8653c55
Author: Simpy <[email protected]>
Date:   Sun Apr 7 18:36:02 2024 -0400

    note for c6c5db5

commit c6c5db5
Author: Simpy <[email protected]>
Date:   Sun Apr 7 18:34:06 2024 -0400

    fix Range Check by using names again unless it's special

commit 87ba151
Author: Simpy <[email protected]>
Date:   Sun Apr 7 16:08:10 2024 -0400

    Revert "fix range check not working when you load in with spell ranks off (this uses the same method we use in  LibDispel)"

    This reverts commit 6a9205d.

commit 8522f97
Author: Simpy <[email protected]>
Date:   Sun Apr 7 15:04:00 2024 -0400

    it's SoD specific, whoops

commit 4d3d11e
Author: Simpy <[email protected]>
Date:   Sun Apr 7 14:48:53 2024 -0400

    update dualspec lua

commit d4a36bd
Author: Simpy <[email protected]>
Date:   Sun Apr 7 14:46:06 2024 -0400

    move DualSpec DT to Core since it's no longer for Wrath only

commit 6a9205d
Author: Simpy <[email protected]>
Date:   Sun Apr 7 14:42:44 2024 -0400

    fix range check not working when you load in with spell ranks off (this uses the same method we use in  LibDispel)

commit 467f032
Merge: 5248e24 1ea2165
Author: Repooc <[email protected]>
Date:   Thu Apr 4 12:47:54 2024 -0400

    Merge branch 'main' of https://github.com/tukui-org/ElvUI

commit 5248e24
Author: Repooc <[email protected]>
Date:   Thu Apr 4 12:47:42 2024 -0400

    min width set to 15 instead of 40 now per request from Jiberish

commit 1ea2165
Author: Luckyone <[email protected]>
Date:   Thu Apr 4 14:49:21 2024 +0200

    Load DualSpec DT for SoD

commit ffff65f
Author: Simpy <[email protected]>
Date:   Wed Apr 3 15:51:54 2024 -0400

    CHAT_MSG_GUILD_DEATHS was removed

commit a9d6198
Author: Simpy <[email protected]>
Date:   Wed Apr 3 14:53:33 2024 -0400

    priest paging on classic

commit 7e93f36
Author: Luckyone <[email protected]>
Date:   Wed Apr 3 12:53:06 2024 +0200

    Fix lib not loading

commit 588e246
Author: Luckyone <[email protected]>
Date:   Wed Apr 3 12:33:59 2024 +0200

    Lib is updated, testing now

commit df463ad
Author: Simpy <[email protected]>
Date:   Tue Apr 2 22:05:43 2024 -0400

    hUh

commit 24022ee
Author: Simpy <[email protected]>
Date:   Tue Apr 2 21:55:08 2024 -0400

    13.61

commit 179e613
Author: Simpy <[email protected]>
Date:   Tue Apr 2 21:28:17 2024 -0400

    cant do this with the lib outdated

commit 0e48785
Author: Luckyone <[email protected]>
Date:   Tue Apr 2 21:48:49 2024 +0200

    Added Mind Sear ChannelTicks

commit 83c4b6a
Author: Luckyone <[email protected]>
Date:   Tue Apr 2 21:48:31 2024 +0200

    Updated STV Event Auras

commit f2ed2ca
Author: Simpy <[email protected]>
Date:   Tue Apr 2 11:44:10 2024 -0400

    dual spec for SOD

commit f29d02c
Author: Luckyone <[email protected]>
Date:   Tue Apr 2 14:47:14 2024 +0200

    Updated Seasonal Toons

commit c5dbf4c
Author: Merathilis <[email protected]>
Date:   Tue Apr 2 12:23:11 2024 +0200

    Updated some of my toon

commit 17dd243
Author: Simpy <[email protected]>
Date:   Mon Apr 1 16:01:16 2024 -0400

    fix afk/dnd on chat

commit fc75691
Author: Luckyone <[email protected]>
Date:   Mon Apr 1 16:09:51 2024 +0200

    Updated Skins\PerksProgram

commit b39f4af
Author: Merathilis <[email protected]>
Date:   Mon Apr 1 12:34:10 2024 +0200

    Updated the Monthly Activities on the EncounterJournal Skin

commit 0f9d6b5
Author: Paweł Jastrzębski <[email protected]>
Date:   Sun Mar 31 10:21:34 2024 +0200

    Packager cleanup

commit 4d87ca0
Author: Simpy <[email protected]>
Date:   Sun Mar 31 02:40:30 2024 -0400

    revert this part

commit 725f98e
Author: Simpy <[email protected]>
Date:   Sun Mar 31 01:47:35 2024 -0400

    no point to strfind this its gonna be the same

commit 18b599c
Author: Simpy <[email protected]>
Date:   Sat Mar 30 20:19:55 2024 -0400

    git one as well

commit 67d3908
Author: Simpy <[email protected]>
Date:   Sat Mar 30 19:36:05 2024 -0400

    reimplement version check to dev builds
  • Loading branch information
Hendo72 committed Apr 26, 2024
1 parent 29bbe3a commit a94bbb6
Show file tree
Hide file tree
Showing 96 changed files with 2,250 additions and 1,791 deletions.
30 changes: 26 additions & 4 deletions .pkgmeta
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,32 @@ manual-changelog:
markup-type: markdown

ignore:
- README.md
- CHANGELOG.md
- LICENSE.md
- ThirdPartyNotices.md
- "*.md"
- "*.textile"
- ElvUI_Libraries/Core/LibStub/tests

plain-copy:
- ElvUI/Classic
- ElvUI/Core
- ElvUI/Locales
- ElvUI/Mainline
- ElvUI/Wrath
- ElvUI_Libraries/Classic/LibClassicSpecs
- ElvUI_Libraries/Core/Ace3
- ElvUI_Libraries/Core/Ace3-ElvUI
- ElvUI_Libraries/Core/LibAceConfigHelper
- ElvUI_Libraries/Core/LibActionButton-1.0
- ElvUI_Libraries/Core/LibAnim
- ElvUI_Libraries/Core/LibDeflate
- ElvUI_Libraries/Core/LibElvUIPlugin-1.0
- ElvUI_Libraries/Core/LibRangeCheck-3.0
- ElvUI_Libraries/Core/LibSimpleSticky
- ElvUI_Libraries/Core/oUF
- ElvUI_Libraries/Core/oUF_Plugins
- ElvUI_Libraries/Mainline
- ElvUI_Libraries/Wrath
- ElvUI_Options/Core
- ElvUI_Options/Locales

move-folders:
ElvUI/ElvUI: ElvUI
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
### Version 13.61 [ April 2nd 2024 ]
* Microbar Support Ticket button in middle of screen.
* Minimap Icons not hiding when using the keybind for Toggle Minimap.
* No Label, Decimal Length, Custom Label options for the Leech Datatext.
* Minimap Difficulty icon not respecting offsets on Wrath.
* Party and RaidPets not spawning until after combat.
* SoD Mage at low level having incorrect range on friendly NPCs.
* Wrath Nightelf Shadowmeld causing a taint during combat.
* LibDispel Bleed list updated again.
* Chat AFK and DND not displaying on Retail.

### Version 13.60 [ March 19th 2024 ]
* Difficulty Icon on Minimap improved, resolving an issue with the mouseover tooltip.
* Pet Battle XP bar overlapped Pass button.
Expand Down
23 changes: 11 additions & 12 deletions ElvUI/Cata/Modules/DataTexts/DualSpec.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
local E, L, V, P, G = unpack(ElvUI)
if not (E.Wrath or E.ClassicSOD) then return end
local DT = E:GetModule('DataTexts')

local _G = _G
Expand All @@ -20,27 +21,28 @@ local GetTalentTabInfo = GetTalentTabInfo
local LoadAddOn = (C_AddOns and C_AddOns.LoadAddOn) or LoadAddOn

local displayString, db = ''
local primaryStr, secondaryStr, activeGroup, hasDualSpec
local primaryStr, secondaryStr, activeGroup, hasDualSpec = '', ''

local function BuildTalentString(talentGroup)
local str = ''

for i = 1, MAX_TALENT_TABS do
<<<<<<<< HEAD:ElvUI/Cata/Modules/DataTexts/DualSpec.lua
local _, _, _, _, pointsSpent = GetTalentTabInfo(i, false, false, talentGroup)
if (str == '') then
str = pointsSpent
else
str = strjoin('/', str, pointsSpent)
end
========
local _, _, pointsSpent = GetTalentTabInfo(i, false, false, talentGroup)
str = (str == '' and pointsSpent) or strjoin('/', str, pointsSpent)
>>>>>>>> upstream/main:ElvUI/Core/Modules/DataTexts/DualSpec.lua
end

return str
end

local function ColorText(str, hex)
return format('|cff%s%s|r',hex,str)
end

local function OnEvent(self)
primaryStr, secondaryStr = BuildTalentString(1), BuildTalentString(2)

Expand All @@ -56,11 +58,10 @@ end

local function OnEnter()
DT.tooltip:ClearLines()

DT.tooltip:AddDoubleLine(format('%s: %s', ColorText(PRIMARY, activeGroup == 1 and '0CD809' or 'FFFFFF'), primaryStr))
DT.tooltip:AddLine(format('|cff%s%s:|r %s', activeGroup == 1 and '0CD809' or 'FFFFFF', PRIMARY, primaryStr), 1, 1, 1)

if hasDualSpec then
DT.tooltip:AddDoubleLine(format('%s: %s', ColorText(SECONDARY, activeGroup == 2 and '0CD809' or 'FFFFFF'), secondaryStr))
DT.tooltip:AddLine(format('|cff%s%s:|r %s', activeGroup == 2 and '0CD809' or 'FFFFFF', SECONDARY, secondaryStr), 1, 1, 1)
end

DT.tooltip:AddLine(' ')
Expand All @@ -85,10 +86,8 @@ local function OnClick(_, button)
else
HideUIPanel(_G.PlayerTalentFrame)
end
else
if hasDualSpec then
SetActiveTalentGroup(activeGroup == 1 and 2 or 1)
end
elseif hasDualSpec then
SetActiveTalentGroup(activeGroup == 1 and 2 or 1)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion ElvUI/Cata/Modules/DataTexts/Load_DataTexts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
<Script file='..\..\..\Core\Modules\DataTexts\SpellHit.lua'/>
<Script file='..\..\..\Core\Modules\DataTexts\SpellPower.lua'/>
<Script file='..\..\..\Core\Modules\DataTexts\Spirit.lua'/>
<Script file='DualSpec.lua'/>
<Script file='..\..\..\Core\Modules\DataTexts\DualSpec.lua'/>
</Ui>
5 changes: 2 additions & 3 deletions ElvUI/Cata/Modules/Skins/AddonManager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue

local GetNumAddOns = GetNumAddOns
local GetAddOnInfo = GetAddOnInfo
local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap

function S:AddonList()
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.addonManager) then return end
Expand Down Expand Up @@ -52,10 +51,10 @@ function S:AddonList()
if character == true then
character = nil
else
checkall = GetAddOnEnableState(nil, index)
checkall = E:GetAddOnEnableState(nil, index)
end

local checkstate = GetAddOnEnableState(character, index)
local checkstate = E:GetAddOnEnableState(character, index)
local enabled = checkstate > 0

entryTitle:SetFontObject('ElvUIFontNormal')
Expand Down
5 changes: 3 additions & 2 deletions ElvUI/Cata/Modules/Skins/Alerts.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ local S = E:GetModule('Skins')

local _G = _G
local unpack = unpack
local hooksecurefunc = hooksecurefunc

local CreateFrame = CreateFrame
local GetItemInfo = GetItemInfo
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo

local ITEM_QUALITY_COLORS = ITEM_QUALITY_COLORS
local hooksecurefunc = hooksecurefunc

local function forceAlpha(self, alpha, forced)
if alpha ~= 1 and forced ~= true then
Expand Down
4 changes: 2 additions & 2 deletions ElvUI/Cata/Modules/Skins/AuctionHouse.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ local next = next
local pairs = pairs
local unpack = unpack

local GetAuctionSellItemInfo = GetAuctionSellItemInfo
local GetItemQualityColor = GetItemQualityColor
local CreateFrame = CreateFrame
local GetAuctionSellItemInfo = GetAuctionSellItemInfo
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor

function S:Blizzard_AuctionUI()
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.auctionhouse) then return end
Expand Down
12 changes: 6 additions & 6 deletions ElvUI/Cata/Modules/Skins/Bags.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ local _G = _G
local select, unpack = select, unpack
local hooksecurefunc = hooksecurefunc

local ContainerIDToInventoryID = ContainerIDToInventoryID or (C_Container and C_Container.ContainerIDToInventoryID)
local GetContainerNumFreeSlots = GetContainerNumFreeSlots or (C_Container and C_Container.GetContainerNumFreeSlots)
local GetContainerItemLink = GetContainerItemLink or (C_Container and C_Container.GetContainerItemLink)
local GetInventoryItemLink = GetInventoryItemLink or (C_Container and C_Container.GetInventoryItemLink)
local GetItemQualityColor = GetItemQualityColor
local ContainerIDToInventoryID = (C_Container and C_Container.ContainerIDToInventoryID) or ContainerIDToInventoryID
local GetContainerNumFreeSlots = (C_Container and C_Container.GetContainerNumFreeSlots) or GetContainerNumFreeSlots
local GetContainerItemLink = (C_Container and C_Container.GetContainerItemLink) or GetContainerItemLink
local GetInventoryItemLink = (C_Container and C_Container.GetInventoryItemLink) or GetInventoryItemLink
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
local GetInventoryItemID = GetInventoryItemID
local GetItemInfo = GetItemInfo

local BANK_CONTAINER = Enum.BagIndex.Bank
local LE_ITEM_CLASS_QUESTITEM = LE_ITEM_CLASS_QUESTITEM
Expand Down
4 changes: 2 additions & 2 deletions ElvUI/Cata/Modules/Skins/Character.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ local _G = _G
local next = next
local unpack = unpack
local ipairs, pairs = ipairs, pairs
local hooksecurefunc = hooksecurefunc

local HasPetUI = HasPetUI
local hooksecurefunc = hooksecurefunc
local GetPetHappiness = GetPetHappiness
local GetSkillLineInfo = GetSkillLineInfo
local GetItemQualityColor = GetItemQualityColor
local GetInventoryItemQuality = GetInventoryItemQuality
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor

local NUM_FACTIONS_DISPLAYED = NUM_FACTIONS_DISPLAYED
local NUM_COMPANIONS_PER_PAGE = NUM_COMPANIONS_PER_PAGE
Expand Down
6 changes: 3 additions & 3 deletions ElvUI/Cata/Modules/Skins/Collectables.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ local S = E:GetModule('Skins')

local _G = _G
local next, unpack = next, unpack
local hooksecurefunc = hooksecurefunc

local GetItemInfo = GetItemInfo
local PlayerHasToy = PlayerHasToy
local hooksecurefunc = hooksecurefunc
local GetItemQualityColor = GetItemQualityColor
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
local C_Heirloom_PlayerHasHeirloom = C_Heirloom.PlayerHasHeirloom

local QUALITY_7_R, QUALITY_7_G, QUALITY_7_B = GetItemQualityColor(7)
Expand Down
6 changes: 3 additions & 3 deletions ElvUI/Cata/Modules/Skins/Inspect.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ local S = E:GetModule('Skins')

local _G = _G
local ipairs, unpack = ipairs, unpack
local hooksecurefunc = hooksecurefunc

local GetInventoryItemID = GetInventoryItemID
local GetItemQualityColor = GetItemQualityColor
local GetItemInfo = GetItemInfo
local hooksecurefunc = hooksecurefunc
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo

local MAX_ARENA_TEAMS = MAX_ARENA_TEAMS

Expand Down
3 changes: 2 additions & 1 deletion ElvUI/Cata/Modules/Skins/Loot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ local _G = _G
local next = next
local unpack = unpack

local GetItemInfo = GetItemInfo
local GetLootSlotInfo = GetLootSlotInfo
local hooksecurefunc = hooksecurefunc
local IsFishingLoot = IsFishingLoot
local UnitIsDead = UnitIsDead
local UnitIsFriend = UnitIsFriend
local UnitName = UnitName

local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo

local C_LootHistory_GetNumItems = C_LootHistory.GetNumItems
local C_LootHistory_GetItem = C_LootHistory.GetItem
local ITEM_QUALITY_COLORS = ITEM_QUALITY_COLORS
Expand Down
7 changes: 4 additions & 3 deletions ElvUI/Cata/Modules/Skins/Mail.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ local S = E:GetModule('Skins')

local _G = _G
local unpack = unpack
local hooksecurefunc = hooksecurefunc

local GetInboxHeaderInfo = GetInboxHeaderInfo
local GetInboxItemLink = GetInboxItemLink
local GetInboxNumItems = GetInboxNumItems
local GetItemInfo = GetItemInfo
local GetItemQualityColor = GetItemQualityColor
local GetSendMailItem = GetSendMailItem
local hooksecurefunc = hooksecurefunc

local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor

local function MailFrameSkin()
for i = 1, _G.ATTACHMENTS_MAX_SEND do
Expand Down
6 changes: 3 additions & 3 deletions ElvUI/Cata/Modules/Skins/Merchant.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ local S = E:GetModule('Skins')

local _G = _G
local unpack = unpack
local hooksecurefunc = hooksecurefunc

local GetItemInfo = GetItemInfo
local GetItemQualityColor = GetItemQualityColor
local GetBuybackItemInfo = GetBuybackItemInfo
local GetNumBuybackItems = GetNumBuybackItems
local GetMerchantNumItems = GetMerchantNumItems
local hooksecurefunc = hooksecurefunc
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor

local function merchantItemPoint()
S:HandlePointXY(_G.MerchantItem1, 6, -40)
Expand Down
6 changes: 3 additions & 3 deletions ElvUI/Cata/Modules/Skins/Quest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ local S = E:GetModule('Skins')
local _G = _G
local gsub, strmatch, unpack = gsub, strmatch, unpack
local next, pairs = next, pairs
local hooksecurefunc = hooksecurefunc

local GetMoney = GetMoney
local GetItemInfo = GetItemInfo
local GetItemQualityColor = GetItemQualityColor
local GetNumQuestLeaderBoards = GetNumQuestLeaderBoards
local GetNumQuestLogEntries = GetNumQuestLogEntries
local GetQuestItemLink = GetQuestItemLink
Expand All @@ -17,11 +16,12 @@ local GetQuestLogRequiredMoney = GetQuestLogRequiredMoney
local GetQuestLogTitle = GetQuestLogTitle
local GetQuestMoneyToGet = GetQuestMoneyToGet
local IsQuestComplete = IsQuestComplete
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor

local MAX_NUM_ITEMS = MAX_NUM_ITEMS
local MAX_NUM_QUESTS = MAX_NUM_QUESTS
local MAX_REQUIRED_ITEMS = MAX_REQUIRED_ITEMS
local hooksecurefunc = hooksecurefunc

local function UpdateGreetingFrame()
local i = 1
Expand Down
4 changes: 2 additions & 2 deletions ElvUI/Cata/Modules/Skins/TradeSkill.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ local _G = _G
local unpack = unpack
local hooksecurefunc = hooksecurefunc

local GetItemInfo = GetItemInfo
local GetTradeSkillNumReagents = GetTradeSkillNumReagents
local GetTradeSkillInfo = GetTradeSkillInfo
local GetItemQualityColor = GetItemQualityColor
local GetTradeSkillItemLink = GetTradeSkillItemLink
local GetTradeSkillReagentInfo = GetTradeSkillReagentInfo
local GetTradeSkillReagentItemLink = GetTradeSkillReagentItemLink
local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor

function S:Blizzard_TradeSkillUI()
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.tradeskill) then return end
Expand Down
Loading

0 comments on commit a94bbb6

Please sign in to comment.