diff --git a/ElvUI/Locales/Chinese_UI.lua b/ElvUI/Locales/Chinese_UI.lua index 94a26cc..678f458 100644 --- a/ElvUI/Locales/Chinese_UI.lua +++ b/ElvUI/Locales/Chinese_UI.lua @@ -251,7 +251,6 @@ L["TargetTarget Frame"] = "目标的目标框架" L["TargetTargetTarget Frame"] = "目标的目标的目标框架" L["Time Manager Frame"] = true; L["Tooltip"] = "鼠标提示" -L["Vehicle Seat Frame"] = "载具座位框" L["Watch Frame"] = true; L["Weapons"] = true; L["DESC_MOVERCONFIG"] = "Movers unlocked. Move them now and click Lock when you are done./nOptions:/nShift + RightClick - Hides mover temporarily./nCtrl + RightClick - Resets mover position to default." diff --git a/ElvUI/Locales/English_UI.lua b/ElvUI/Locales/English_UI.lua index c8b85e7..4f2210e 100644 --- a/ElvUI/Locales/English_UI.lua +++ b/ElvUI/Locales/English_UI.lua @@ -251,7 +251,6 @@ L["TargetTarget Frame"] = true; --Also used in UnitFrames L["TargetTargetTarget Frame"] = true; --Also used in UnitFrames L["Time Manager Frame"] = true; L["Tooltip"] = true; -L["Vehicle Seat Frame"] = true; L["Watch Frame"] = true; L["Weapons"] = true; L["DESC_MOVERCONFIG"] = "Movers unlocked. Move them now and click Lock when you are done.\nOptions:\nShift + RightClick - Hides mover temporarily.\nCtrl + RightClick - Resets mover position to default." diff --git a/ElvUI/Locales/French_UI.lua b/ElvUI/Locales/French_UI.lua index 16380b3..bc95f78 100644 --- a/ElvUI/Locales/French_UI.lua +++ b/ElvUI/Locales/French_UI.lua @@ -251,7 +251,6 @@ L["TargetTarget Frame"] = "Cadre de la cible de votre cible" --Also used in Unit L["TargetTargetTarget Frame"] = "Cadre de la cible de la cible de la cible" L["Time Manager Frame"] = true; L["Tooltip"] = "Infobulle" -L["Vehicle Seat Frame"] = "Cadre de siège du véhicule" L["Watch Frame"] = true; L["Weapons"] = true; L["DESC_MOVERCONFIG"] = "Movers unlocked. Move them now and click Lock when you are done./nOptions:/nShift + RightClick - Hides mover temporarily./nCtrl + RightClick - Resets mover position to default." diff --git a/ElvUI/Locales/German_UI.lua b/ElvUI/Locales/German_UI.lua index 23808d4..cf3462d 100644 --- a/ElvUI/Locales/German_UI.lua +++ b/ElvUI/Locales/German_UI.lua @@ -251,7 +251,6 @@ L["TargetTarget Frame"] = "Ziel des Ziels Fenster" --Also used in UnitFrames L["TargetTargetTarget Frame"] = "Ziel des Ziels des Ziels Fenster" L["Time Manager Frame"] = true; L["Tooltip"] = "Tooltip" -L["Vehicle Seat Frame"] = "Fahrzeugfenster" L["Watch Frame"] = true; L["Weapons"] = true; L["DESC_MOVERCONFIG"] = "Movers unlocked. Move them now and click Lock when you are done./nOptions:/nShift + RightClick - Hides mover temporarily./nCtrl + RightClick - Resets mover position to default." diff --git a/ElvUI/Locales/Korean_UI.lua b/ElvUI/Locales/Korean_UI.lua index c8ae067..cf72b27 100644 --- a/ElvUI/Locales/Korean_UI.lua +++ b/ElvUI/Locales/Korean_UI.lua @@ -251,7 +251,6 @@ L["TargetTarget Frame"] = "대상의대상 프레임" L["TargetTargetTarget Frame"] = "대상의대상의대상 프레임" L["Time Manager Frame"] = true; L["Tooltip"] = "툴팁" -L["Vehicle Seat Frame"] = "차량 좌석 프레임" L["Watch Frame"] = true; L["Weapons"] = true; L["DESC_MOVERCONFIG"] = "Movers unlocked. Move them now and click Lock when you are done./nOptions:/nShift + RightClick - Hides mover temporarily./nCtrl + RightClick - Resets mover position to default." diff --git a/ElvUI/Locales/Portuguese_UI.lua b/ElvUI/Locales/Portuguese_UI.lua index baf8e23..64ddb33 100644 --- a/ElvUI/Locales/Portuguese_UI.lua +++ b/ElvUI/Locales/Portuguese_UI.lua @@ -251,7 +251,6 @@ L["TargetTarget Frame"] = "Quadro do Alvo do Alvo" L["TargetTargetTarget Frame"] = true; L["Time Manager Frame"] = true; L["Tooltip"] = "Tooltip" -L["Vehicle Seat Frame"] = "Quadro de Assento de Veículo" L["Watch Frame"] = true; L["Weapons"] = true; L["DESC_MOVERCONFIG"] = "Movers unlocked. Move them now and click Lock when you are done./nOptions:/nShift + RightClick - Hides mover temporarily./nCtrl + RightClick - Resets mover position to default." diff --git a/ElvUI/Locales/Russian_UI.lua b/ElvUI/Locales/Russian_UI.lua index 6a774a7..35a9284 100644 --- a/ElvUI/Locales/Russian_UI.lua +++ b/ElvUI/Locales/Russian_UI.lua @@ -251,7 +251,6 @@ L["TargetTarget Frame"] = "Цель цели" --Also used in UnitFrames L["TargetTargetTarget Frame"] = "Цель цели цели" L["Time Manager Frame"] = true; L["Tooltip"] = "Подсказка" -L["Vehicle Seat Frame"] = "Техника" L["Watch Frame"] = "Задания" L["Weapons"] = "Оружие" L["DESC_MOVERCONFIG"] = "Movers unlocked. Move them now and click Lock when you are done./nOptions:/nShift + RightClick - Hides mover temporarily./nCtrl + RightClick - Resets mover position to default." diff --git a/ElvUI/Locales/Spanish_UI.lua b/ElvUI/Locales/Spanish_UI.lua index 6e8d572..2376aa3 100644 --- a/ElvUI/Locales/Spanish_UI.lua +++ b/ElvUI/Locales/Spanish_UI.lua @@ -251,7 +251,6 @@ L["TargetTarget Frame"] = "Marco de Objetivo de Objetivo" L["TargetTargetTarget Frame"] = "Marco del Objetivo del Objetivo del Objetivo" L["Time Manager Frame"] = true; L["Tooltip"] = "Descripción Emergente" -L["Vehicle Seat Frame"] = "Marco del Asiento del Vehículo" L["Watch Frame"] = true; L["Weapons"] = true; L["DESC_MOVERCONFIG"] = "Movers unlocked. Move them now and click Lock when you are done./nOptions:/nShift + RightClick - Hides mover temporarily./nCtrl + RightClick - Resets mover position to default." diff --git a/ElvUI/Locales/Taiwanese_UI.lua b/ElvUI/Locales/Taiwanese_UI.lua index 5153f25..c04b0ca 100644 --- a/ElvUI/Locales/Taiwanese_UI.lua +++ b/ElvUI/Locales/Taiwanese_UI.lua @@ -251,7 +251,6 @@ L["TargetTarget Frame"] = "目標的目標框架" --Also used in UnitFrames L["TargetTargetTarget Frame"] = "目標的目標的目標框架" L["Time Manager Frame"] = true; L["Tooltip"] = "浮動提示" -L["Vehicle Seat Frame"] = "載具座位框" L["Watch Frame"] = true; L["Weapons"] = true; L["DESC_MOVERCONFIG"] = "Movers unlocked. Move them now and click Lock when you are done./nOptions:/nShift + RightClick - Hides mover temporarily./nCtrl + RightClick - Resets mover position to default." diff --git a/ElvUI/Modules/ActionBars/Microbar.lua b/ElvUI/Modules/ActionBars/Microbar.lua index d409f0c..0716bde 100644 --- a/ElvUI/Modules/ActionBars/Microbar.lua +++ b/ElvUI/Modules/ActionBars/Microbar.lua @@ -9,7 +9,7 @@ local mod = math.mod --WoW API / Variables local CreateFrame = CreateFrame -local microBar = CreateFrame("Frame", "microBar", E.UIParent) +local microBar = CreateFrame("Frame", "ElvUI_MicroBar", E.UIParent) microBar:SetFrameStrata("BACKGROUND") local MICRO_BUTTONS = { diff --git a/ElvUI/Modules/UnitFrames/Elements/AuraBars.lua b/ElvUI/Modules/UnitFrames/Elements/AuraBars.lua index 36040df..ecd1d26 100644 --- a/ElvUI/Modules/UnitFrames/Elements/AuraBars.lua +++ b/ElvUI/Modules/UnitFrames/Elements/AuraBars.lua @@ -236,7 +236,7 @@ function UF:AuraBarFilter(unit, name, _, _, _, debuffType, duration, _, unitCast if db.priority ~= "" then noDuration = (not duration or duration == 0) isFriend = unit and UnitIsFriend("player", unit) and not UnitCanAttack("player", unit) - isPlayer = (unitCaster == "player" or unitCaster == "vehicle") + isPlayer = (unitCaster == "player") isUnit = unit and unitCaster and UnitIsUnit(unit, unitCaster) canDispell = (self.type == "Buffs" and isStealable) or (self.type == "Debuffs" and debuffType and E:IsDispellableByMe(debuffType)) allowDuration = noDuration or (duration and (duration > 0) and (db.maxDuration == 0 or duration <= db.maxDuration) and (db.minDuration == 0 or duration >= db.minDuration)) diff --git a/ElvUI/Modules/UnitFrames/Elements/Auras.lua b/ElvUI/Modules/UnitFrames/Elements/Auras.lua index 1eb8911..c1778cf 100644 --- a/ElvUI/Modules/UnitFrames/Elements/Auras.lua +++ b/ElvUI/Modules/UnitFrames/Elements/Auras.lua @@ -435,7 +435,7 @@ function UF:AuraFilter(unit, button, texture, count, dispelType, duration, expir if not name then return nil end local filterCheck, isUnit, isFriend, isPlayer, canDispell, allowDuration, noDuration, spellPriority - isPlayer = (caster == "player" or caster == "vehicle") + isPlayer = (caster == "player") isFriend = unit and UnitIsFriend("player", unit) and not UnitCanAttack("player", unit) button.isPlayer = isPlayer diff --git a/ElvUI/Settings/Profile.lua b/ElvUI/Settings/Profile.lua index 8dc2020..8378a8e 100644 --- a/ElvUI/Settings/Profile.lua +++ b/ElvUI/Settings/Profile.lua @@ -71,16 +71,9 @@ P["general"] = { ["position"] = "TOPLEFT", ["xOffset"] = 0, ["yOffset"] = 0, - }, - ["vehicleLeave"] = { - ["scale"] = 1, - ["position"] = "BOTTOMLEFT", - ["xOffset"] = 2, - ["yOffset"] = 2, - ["hide"] = false, - }, + } } - }, + } } -- Data Bars diff --git a/ElvUI_Config/Locales/Chinese_Config.lua b/ElvUI_Config/Locales/Chinese_Config.lua index ce462c1..c307784 100644 --- a/ElvUI_Config/Locales/Chinese_Config.lua +++ b/ElvUI_Config/Locales/Chinese_Config.lua @@ -413,7 +413,6 @@ L["General"] = "一般" L["Height of the watch tracker. Increase size to be able to see more objectives."] = "任务框体的高度.增加大小以看到更多目标" L["Hide At Max Level"] = "在最高等级时隐藏" L["Hide Error Text"] = "隐藏错误文字" -L["Hide In Vehicle"] = "骑乘时隐藏" L["Hides the red error text at the top of the screen while in combat."] = "战斗中隐藏屏幕顶部红字错误信息" L["Log Taints"] = "错误记录" L["Login Message"] = "登陆信息" diff --git a/ElvUI_Config/Locales/English_Config.lua b/ElvUI_Config/Locales/English_Config.lua index 42ea1b3..7c66591 100644 --- a/ElvUI_Config/Locales/English_Config.lua +++ b/ElvUI_Config/Locales/English_Config.lua @@ -402,7 +402,6 @@ L["General"] = true; L["Height of the watch tracker. Increase size to be able to see more objectives."] = true; L["Hide At Max Level"] = true; L["Hide Error Text"] = true; -L["Hide In Vehicle"] = true; L["Hides the red error text at the top of the screen while in combat."] = true; L["Log Taints"] = true; L["Login Message"] = true; diff --git a/ElvUI_Config/Locales/French_Config.lua b/ElvUI_Config/Locales/French_Config.lua index bce6b21..699c131 100644 --- a/ElvUI_Config/Locales/French_Config.lua +++ b/ElvUI_Config/Locales/French_Config.lua @@ -413,7 +413,6 @@ L["General"] = "Général" L["Height of the watch tracker. Increase size to be able to see more objectives."] = "Hauteur de la fenêtre des suivis d'objectif, augmenter pour afficher plus d'objectifs" L["Hide At Max Level"] = true; L["Hide Error Text"] = "Cacher les textes d'erreurs" -L["Hide In Vehicle"] = true; L["Hides the red error text at the top of the screen while in combat."] = "Cacher les textes d'erreurs en haut de l'écran en combat." L["Log Taints"] = "Journal des corruptions" L["Login Message"] = "Message de connexion" diff --git a/ElvUI_Config/Locales/German_Config.lua b/ElvUI_Config/Locales/German_Config.lua index 0d8bf5b..1e1e3ed 100644 --- a/ElvUI_Config/Locales/German_Config.lua +++ b/ElvUI_Config/Locales/German_Config.lua @@ -413,7 +413,6 @@ L["General"] = "Allgemein" L["Height of the watch tracker. Increase size to be able to see more objectives."] = "Höhe des Questfenster. Größe verändern um mehr Ziele zu sehen." L["Hide At Max Level"] = "Auf max. Level vestecken" L["Hide Error Text"] = "Fehlertext verstecken" -L["Hide In Vehicle"] = "Im Fahrzeug verstecken" L["Hides the red error text at the top of the screen while in combat."] = "Den roten Fehlertext im oberen Teil des Bildschirms im Kampf verstecken" L["Log Taints"] = "Log Fehler" L["Login Message"] = "Login Nachricht" diff --git a/ElvUI_Config/Locales/Korean_Config.lua b/ElvUI_Config/Locales/Korean_Config.lua index 61d7b8c..fe04598 100644 --- a/ElvUI_Config/Locales/Korean_Config.lua +++ b/ElvUI_Config/Locales/Korean_Config.lua @@ -461,7 +461,6 @@ L["General"] = "일반" L["Height of the watch tracker. Increase size to be able to see more objectives."] = "퀘스트프레임의 길이를 결정합니다." L["Hide At Max Level"] = true; L["Hide Error Text"] = "전투중 에러 숨기기" -L["Hide In Vehicle"] = true; L["Hides the red error text at the top of the screen while in combat."] = "화면 중앙 상단에 뜨는 여러 에러메시지(ex : 사정거리 부족)를 전투 중에는 띄우지 않게 합니다." L["Log Taints"] = "Taint 에러 표시" L["Login Message"] = "로그인 메세지 표시" diff --git a/ElvUI_Config/Locales/Portuguese_Config.lua b/ElvUI_Config/Locales/Portuguese_Config.lua index 43e8043..3b4e38d 100644 --- a/ElvUI_Config/Locales/Portuguese_Config.lua +++ b/ElvUI_Config/Locales/Portuguese_Config.lua @@ -413,7 +413,6 @@ L["General"] = "Geral" L["Height of the watch tracker. Increase size to be able to see more objectives."] = true; L["Hide At Max Level"] = true; L["Hide Error Text"] = "Esconder Texto de Erro" -L["Hide In Vehicle"] = true; L["Hides the red error text at the top of the screen while in combat."] = "Esconde o texto de erro vermelho do topo da tela quando em combate." L["Log Taints"] = "Capturar Problemas" L["Login Message"] = "Mensagem de Entrada" diff --git a/ElvUI_Config/Locales/Russian_Config.lua b/ElvUI_Config/Locales/Russian_Config.lua index 987df8c..1130342 100644 --- a/ElvUI_Config/Locales/Russian_Config.lua +++ b/ElvUI_Config/Locales/Russian_Config.lua @@ -413,7 +413,6 @@ L["General"] = "Общие" L["Height of the watch tracker. Increase size to be able to see more objectives."] = "Высота списка заданий. Увеличение размера позволить видеть большее количество." L["Hide At Max Level"] = "Прятать на максимальном уровне" L["Hide Error Text"] = "Прятать сообщения об ошибках" -L["Hide In Vehicle"] = "Прятать в транспорте" L["Hides the red error text at the top of the screen while in combat."] = "Скрывать красный текст ошибок вверху экрана в бою." L["Log Taints"] = "Отслеживать недочеты" L["Login Message"] = "Сообщение загрузки" diff --git a/ElvUI_Config/Locales/Spanish_Config.lua b/ElvUI_Config/Locales/Spanish_Config.lua index 9d05aa9..6f3d773 100644 --- a/ElvUI_Config/Locales/Spanish_Config.lua +++ b/ElvUI_Config/Locales/Spanish_Config.lua @@ -413,7 +413,6 @@ L["General"] = "General" L["Height of the watch tracker. Increase size to be able to see more objectives."] = true; L["Hide At Max Level"] = true; L["Hide Error Text"] = "Ocultar Texto de Error" -L["Hide In Vehicle"] = true; L["Hides the red error text at the top of the screen while in combat."] = "Oculta el texto rojo de error en la parte superior de la pantalla mientras estás en combate." L["Log Taints"] = "Registro Exhaustivo" L["Login Message"] = "Mensaje de inicio" diff --git a/ElvUI_Config/Locales/Taiwanese_Config.lua b/ElvUI_Config/Locales/Taiwanese_Config.lua index 77d7c86..cd46be8 100644 --- a/ElvUI_Config/Locales/Taiwanese_Config.lua +++ b/ElvUI_Config/Locales/Taiwanese_Config.lua @@ -413,7 +413,6 @@ L["General"] = "一般設定" L["Height of the watch tracker. Increase size to be able to see more objectives."] = "任務框體的高度.增加大小以看到更多目標" L["Hide At Max Level"] = "在最高等級時隱藏" L["Hide Error Text"] = "隱藏錯誤文字" -L["Hide In Vehicle"] = "騎乘時隱藏" L["Hides the red error text at the top of the screen while in combat."] = "戰鬥中隱藏螢幕頂部紅字錯誤信息." L["Log Taints"] = "錯誤記錄" L["Login Message"] = "登入資訊" diff --git a/ElvUI_Config/Maps.lua b/ElvUI_Config/Maps.lua index fe44b3e..c909175 100644 --- a/ElvUI_Config/Maps.lua +++ b/ElvUI_Config/Maps.lua @@ -275,7 +275,7 @@ E.Options.args.maps = { mail = { order = 2, type = "group", - name = "MAIL_LABEL", + name = MAIL_LABEL, get = function(info) return E.db.general.minimap.icons.mail[ info[getn(info)] ]; end, set = function(info, value) E.db.general.minimap.icons.mail[ info[getn(info)] ] = value; MM:UpdateSettings(); end, args = { @@ -439,59 +439,6 @@ E.Options.args.maps = { min = -50, max = 50, step = 1 } } - }, - vehicleLeave = { - order = 6, - type = "group", - name = "LEAVE_VEHICLE", - get = function(info) return E.db.general.minimap.icons.vehicleLeave[ info[getn(info)] ]; end, - set = function(info, value) E.db.general.minimap.icons.vehicleLeave[ info[getn(info)] ] = value; E:GetModule("ActionBars"):UpdateVehicleLeave(); end, - args = { - hide = { - order = 1, - type = "toggle", - name = HIDE - }, - spacer = { - order = 2, - type = "description", - name = "", - width = "full" - }, - position = { - order = 3, - type = "select", - name = L["Position"], - values = { - ["LEFT"] = L["Left"], - ["RIGHT"] = L["Right"], - ["TOP"] = L["Top"], - ["BOTTOM"] = L["Bottom"], - ["TOPLEFT"] = L["Top Left"], - ["TOPRIGHT"] = L["Top Right"], - ["BOTTOMLEFT"] = L["Bottom Left"], - ["BOTTOMRIGHT"] = L["Bottom Right"] - } - }, - scale = { - order = 4, - type = "range", - name = L["Scale"], - min = 0.5, max = 2, step = 0.05, - }, - xOffset = { - order = 5, - type = "range", - name = L["xOffset"], - min = -50, max = 50, step = 1 - }, - yOffset = { - order = 6, - type = "range", - name = L["yOffset"], - min = -50, max = 50, step = 1 - } - } } } }