fix: wrong merge

Localization/enUS.lua

@@ -4,10 +4,10 @@ if not L then
 end
 -- @locale:language=enUS@
 L = L or {}
-L["Inspect mouseover"] = true
-L["Inspect target"] = true
-L["Last update:"] = true
-L["Show Model"] = true
+L['Inspect mouseover'] = true
+L['Inspect target'] = true
+L['Last update:'] = true
+L['Show Model'] = true
 -- @end-locale@
 -- @debug@
 -- @import@
@@ -16,6 +16,7 @@ L['Last update:'] = true
 L['Data source:'] = true
 L['Inspect target'] = true
 L['Inspect mouseover'] = true
+L['iLvl:'] = true
 -- @locale-fill@
 -- @end-import@
 -- @end-debug@

Localization/zhCN.lua

@@ -9,6 +9,7 @@ L['Last update:'] = '最后更新：'
 L['Inspect target'] = '观察目标'
 L['Inspect mouseover'] = '观察鼠标悬停目标'
 L['Data source:'] = '数据来源：'
+L['iLvl:'] = true
 -- @locale-fill@
 
 -- @end-import@

UI/CharacterGearFrame.lua

@@ -18,6 +18,10 @@ function CharacterGearFrame:OnShow()
     self:RegisterEvent('UNIT_INVENTORY_CHANGED')
     self:RegisterEvent('UNIT_LEVEL', 'UNIT_INVENTORY_CHANGED')
     self:Update()
+
+    if GearManagerDialog then
+        GearManagerDialog:SetFrameLevel(self:GetFrameLevel() + 10)
+    end
 end
 
 function CharacterGearFrame:UNIT_INVENTORY_CHANGED(_, unit)

UI/GearFrame.lua

@@ -32,11 +32,7 @@ local SPACING_V = 3
 local SPACING_H = 5
 local PADDING = 10
 
-<<<<<<< Updated upstream
----@class UI.GearFrame : Frame, BackdropTemplate, AceEvent-3.0
-=======
 ---@class UI.GearFrame : AceEvent-3.0, Frame, BackdropTemplate
->>>>>>> Stashed changes
 local GearFrame = ns.Addon:NewClass('UI.GearFrame', 'Frame')
 
 function GearFrame:Create(parent)
@@ -54,10 +50,7 @@ function GearFrame:Constructor()
     LevelColumn:SetHeight(1)
     self.LevelColumn = LevelColumn
 
-<<<<<<< Updated upstream
-=======
     ---@type table<number, UI.GearItem>
->>>>>>> Stashed changes
     self.gears = {}
     self.columnWidths = {}
 
@@ -106,21 +99,13 @@ end
 function GearFrame:SetClass(class)
     self.class = class
 
-<<<<<<< Updated upstream
-    local color = RAID_CLASS_COLORS[class]
-    self.Name:SetTextColor(color.r, color.g, color.b)
-    self:SetBackdropBorderColor(color.r, color.g, color.b)
-    self.Portrait.PortraitRingQuality:SetVertexColor(color.r, color.g, color.b)
-    self.Portrait.LevelBorder:SetVertexColor(color.r, color.g, color.b)
-=======
     if class then
         local color = RAID_CLASS_COLORS[class]
         self.Name:SetTextColor(color.r, color.g, color.b)
         self:SetBackdropBorderColor(color.r, color.g, color.b)
         self.Portrait.PortraitRingQuality:SetVertexColor(color.r, color.g, color.b)
         self.Portrait.LevelBorder:SetVertexColor(color.r, color.g, color.b)
     end
->>>>>>> Stashed changes
 end
 
 function GearFrame:SetUnit(unit, name)
@@ -130,15 +115,10 @@ function GearFrame:SetUnit(unit, name)
 
     if unit then
         SetPortraitTexture(self.Portrait.Portrait, unit)
-<<<<<<< Updated upstream
-    else
-        -- self.Portrait.Portrait:SetTexture([[Interface\CharacterFrame\TempPortrait]])
-=======
         self.Portrait.Portrait:SetTexCoord(0, 1, 0, 1)
     elseif self.class then
         self.Portrait.Portrait:SetTexture([[Interface\TargetingFrame\UI-Classes-Circles]])
         self.Portrait.Portrait:SetTexCoord(unpack(CLASS_ICON_TCOORDS[self.class]))
->>>>>>> Stashed changes
     end
 end
 

UI/InspectGearFrame.lua

@@ -30,11 +30,8 @@ function InspectGearFrame:OnShow()
 end
 
 function InspectGearFrame:OnHide()
-<<<<<<< Updated upstream
-=======
     self.unit = nil
     self.class = nil
->>>>>>> Stashed changes
     self:UnregisterAllEvents()
     self:UnregisterAllMessages()
 end
@@ -56,13 +53,8 @@ function InspectGearFrame:Update()
     local dataSource = Inspect:GetDataSource()
     local lastUpdate = Inspect:GetLastUpdate()
 
-<<<<<<< Updated upstream
     self:SetClass(classFileName)
     self:SetUnit(Inspect:GetUnit())
-=======
-    self:SetUnit(Inspect:GetUnit())
-    self:SetClass(classFileName)
->>>>>>> Stashed changes
     self:SetLevel(Inspect:GetUnitLevel())
     self:SetItemLevel(Inspect:GetItemLevel())
     self.DataSource:SetFormattedText('%s|cffffffff%s|r  %s|cffffffff%s|r', L['Data source:'], dataSource,

UI/Template.xml

@@ -65,7 +65,7 @@
                         <Anchor point="TOPLEFT" x="66" y="-18"/>
                     </Anchors>
                 </FontString>
-                <FontString parentKey="ItemLevel" height="12" outline="NORMAL" inherits="Tooltip_Small">
+                <FontString parentKey="ItemLevel" inherits="Tooltip_Small">
                     <Color r="1.0" g="0.82" b="0"/>
                     <Anchors>
                         <Anchor point="TOPLEFT" x="66" y="-42"/>
@@ -84,6 +84,7 @@
                     insets = {left = 4, right = 4, top = 4, bottom = 4},
                 }
                 self:SetBackdropColor(0, 0, 0, 0.95)
+                self.ItemLevel:SetFont(self.ItemLevel:GetFont(), 12, "OUTLINE")
             </OnLoad>
         </Scripts>
     </Frame>