Browse Source

Merge branch 'master' of https://sinistea.pkmn.cloud/Quildra/WoWInterface

# Conflicts:
#	Interface/AddOns/BigWigs/BigWigs.toc
#	Interface/AddOns/BigWigs/CHANGELOG.md
#	Interface/AddOns/BigWigs/Loader.lua
#	Interface/AddOns/BigWigs_CastleNathria/BigWigs_CastleNathria.toc
#	Interface/AddOns/BigWigs_Core/BigWigs_Core.toc
#	Interface/AddOns/BigWigs_Options/BigWigs_Options.toc
#	Interface/AddOns/BigWigs_Plugins/BigWigs_Plugins.toc
#	Interface/AddOns/BigWigs_SanctumOfDomination/BigWigs_SanctumOfDomination.toc
#	Interface/AddOns/BigWigs_SepulcherOfTheFirstOnes/BigWigs_SepulcherOfTheFirstOnes.toc
#	Interface/AddOns/BigWigs_Voice/BigWigs_Voice.toc
#	Interface/AddOns/BigWigs_Voice/CHANGELOG.md
#	Interface/AddOns/DBM-CastleNathria/StoneborneGenerals.lua
#	Interface/AddOns/DBM-Core/DBM-Core.lua
#	Interface/AddOns/DBM-Core/DBM-Core.toc
#	Interface/AddOns/DBM-GUI/DBM-GUI.toc
#	Interface/AddOns/DBM-SanctumOfDomination/GuardianoftheFirstOnes.lua
#	Interface/AddOns/DBM-Sepulcher/AnduinWrynn.lua
#	Interface/AddOns/DBM-Sepulcher/ArtificerXymox.lua
#	Interface/AddOns/DBM-Sepulcher/DBM-Sepulcher.toc
#	Interface/AddOns/DBM-Sepulcher/Halondrus.lua
#	Interface/AddOns/DBM-Sepulcher/Lihuvim.lua
#	Interface/AddOns/DBM-Sepulcher/PrototypePantheon.lua
#	Interface/AddOns/DBM-Sepulcher/TheJailer.lua
#	Interface/AddOns/DBM-Sepulcher/VigilantGuardian.lua
#	Interface/AddOns/DBM-Sepulcher/localization.ru.lua
#	Interface/AddOns/DBM-Sepulcher/localization.tw.lua
#	Interface/AddOns/DBM-Shadowlands/CHANGELOG.md
#	Interface/AddOns/DBM-Shadowlands/DBM-Shadowlands.toc
#	Interface/AddOns/DBM-StatusBarTimers/DBM-StatusBarTimers.toc
#	Interface/AddOns/DBM-VPVEM/DBM-VPVEM.toc
#	Interface/AddOns/ElvUI/ElvUI_Mainline.toc
#	Interface/AddOns/ElvUI/Mainline/Modules/Skins/Binding.lua
#	Interface/AddOns/ElvUI_OptionsUI/ActionBars.lua
#	Interface/AddOns/GatherMate2/CHANGELOG.md
#	Interface/AddOns/GatherMate2/Constants.lua
#	Interface/AddOns/GatherMate2/GatherMate2.toc
#	Interface/AddOns/GatherMate2/Libs/HereBeDragons/HereBeDragons.toc
#	Interface/AddOns/HandyNotes_LostAndFound/CHANGELOG.md
#	Interface/AddOns/HandyNotes_LostAndFound/HandyNotes_LostAndFound.toc
#	Interface/AddOns/HandyNotes_Shadowlands/common.lua
#	Interface/AddOns/HandyNotes_Shadowlands/core/localization/zhCN.lua
#	Interface/AddOns/HandyNotes_Shadowlands/core/localization/zhTW.lua
#	Interface/AddOns/HandyNotes_Shadowlands/core/nodes.lua
#	Interface/AddOns/HandyNotes_Shadowlands/localization/deDE.lua
#	Interface/AddOns/HandyNotes_Shadowlands/localization/enUS.lua
#	Interface/AddOns/HandyNotes_Shadowlands/localization/esES.lua
#	Interface/AddOns/HandyNotes_Shadowlands/localization/frFR.lua
#	Interface/AddOns/HandyNotes_Shadowlands/localization/ruRU.lua
#	Interface/AddOns/HandyNotes_Shadowlands/localization/zhCN.lua
#	Interface/AddOns/HandyNotes_Shadowlands/localization/zhTW.lua
#	Interface/AddOns/HandyNotes_Shadowlands/zones/zereth_mortis.lua
#	Interface/AddOns/Hekili/BfA/AzeritePowers.lua
#	Interface/AddOns/Hekili/CHANGELOG.md
#	Interface/AddOns/Hekili/Classes.lua
#	Interface/AddOns/Hekili/Classes/DeathKnightFrost.lua
#	Interface/AddOns/Hekili/Classes/DeathKnightUnholy.lua
#	Interface/AddOns/Hekili/Classes/DruidFeral.lua
#	Interface/AddOns/Hekili/Classes/HunterMarksmanship.lua
#	Interface/AddOns/Hekili/Classes/HunterSurvival.lua
#	Interface/AddOns/Hekili/Classes/MageArcane.lua
#	Interface/AddOns/Hekili/Classes/MonkWindwalker.lua
#	Interface/AddOns/Hekili/Classes/Notes/90_Death_Knight_Frost.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Death_Knight_Unholy.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Druid_Feral.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Hunter_Survival.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Mage_Arcane.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Monk_Windwalker.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Paladin_Retribution.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Rogue_Assassination.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Rogue_Outlaw.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Shaman_Elemental.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Shaman_Enhancement.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Warlock_Affliction.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Warlock_Demonology.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Warlock_Destruction.simc
#	Interface/AddOns/Hekili/Classes/Notes/90_Warrior_Fury.simc
#	Interface/AddOns/Hekili/Classes/PaladinRetribution.lua
#	Interface/AddOns/Hekili/Classes/PriestShadow.lua
#	Interface/AddOns/Hekili/Classes/RogueAssassination.lua
#	Interface/AddOns/Hekili/Classes/RogueOutlaw.lua
#	Interface/AddOns/Hekili/Classes/ShamanElemental.lua
#	Interface/AddOns/Hekili/Classes/ShamanEnhancement.lua
#	Interface/AddOns/Hekili/Classes/WarlockAffliction.lua
#	Interface/AddOns/Hekili/Classes/WarlockDemonology.lua
#	Interface/AddOns/Hekili/Classes/WarlockDestruction.lua
#	Interface/AddOns/Hekili/Classes/WarriorArms.lua
#	Interface/AddOns/Hekili/Classes/WarriorFury.lua
#	Interface/AddOns/Hekili/Core.lua
#	Interface/AddOns/Hekili/Hekili.toc
#	Interface/AddOns/Hekili/Options.lua
#	Interface/AddOns/Hekili/Shadowlands/Trinkets.lua
#	Interface/AddOns/Hekili/State.lua
#	Interface/AddOns/Hekili/UI.lua
#	Interface/AddOns/Leatrix_Plus/CHANGELOG.txt
#	Interface/AddOns/Leatrix_Plus/Leatrix_Plus.lua
#	Interface/AddOns/Leatrix_Plus/Leatrix_Plus.toc
#	Interface/AddOns/MythicDungeonTools/CHANGELOG.txt
#	Interface/AddOns/MythicDungeonTools/Locales/zhCN.lua
#	Interface/AddOns/MythicDungeonTools/MythicDungeonTools.lua
#	Interface/AddOns/MythicDungeonTools/MythicDungeonTools.toc
#	Interface/AddOns/MythicDungeonTools/Shadowlands/TazaveshLower.lua
#	Interface/AddOns/MythicDungeonTools/Shadowlands/TazaveshUpper.lua
#	Interface/AddOns/SavedInstances/CHANGELOG.md
#	Interface/AddOns/SavedInstances/Core/Core.lua
#	Interface/AddOns/SavedInstances/Modules/MythicPlus.lua
#	Interface/AddOns/SavedInstances/Modules/Progress.lua
#	Interface/AddOns/SavedInstances/SavedInstances.toc
#	Interface/AddOns/SilverDragon/CHANGELOG.md
#	Interface/AddOns/SilverDragon/RECENT_CHANGES.md
#	Interface/AddOns/SilverDragon/SilverDragon.toc
#	Interface/AddOns/SilverDragon/achievements.lua
#	Interface/AddOns/SilverDragon/core.lua
#	Interface/AddOns/SilverDragon_BattleForAzeroth/SilverDragon_BattleForAzeroth.toc
#	Interface/AddOns/SilverDragon_BurningCrusade/SilverDragon_BurningCrusade.toc
#	Interface/AddOns/SilverDragon_Cataclysm/SilverDragon_Cataclysm.toc
#	Interface/AddOns/SilverDragon_Legion/SilverDragon_Legion.toc
#	Interface/AddOns/SilverDragon_Mists/SilverDragon_Mists.toc
#	Interface/AddOns/SilverDragon_Overlay/SilverDragon_Overlay.toc
#	Interface/AddOns/SilverDragon_RangeExtender/SilverDragon_RangeExtender.toc
#	Interface/AddOns/SilverDragon_Shadowlands/SilverDragon_Shadowlands.toc
#	Interface/AddOns/SilverDragon_Shadowlands/module.lua
#	Interface/AddOns/SilverDragon_Vanilla/SilverDragon_Vanilla.toc
#	Interface/AddOns/SilverDragon_Warlords/SilverDragon_Warlords.toc
#	Interface/AddOns/SilverDragon_Wrath/SilverDragon_Wrath.toc
#	Interface/AddOns/TheUndermineJournal/MarketData-EU.lua
#	Interface/AddOns/TheUndermineJournal/MarketData-KR.lua
#	Interface/AddOns/TheUndermineJournal/MarketData-TW.lua
#	Interface/AddOns/TheUndermineJournal/MarketData-US.lua
#	Interface/AddOns/TheUndermineJournal/TheUndermineJournal.toc
#	Interface/AddOns/WeakAuras/CHANGELOG.md
#	Interface/AddOns/WeakAuras/Init.lua
#	Interface/AddOns/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.toc
#	Interface/AddOns/WeakAuras/Locales/zhCN.lua
#	Interface/AddOns/WeakAuras/WeakAuras.toc
#	Interface/AddOns/WeakAurasArchive/WeakAurasArchive.toc
#	Interface/AddOns/WeakAurasModelPaths/WeakAurasModelPaths.toc
#	Interface/AddOns/WeakAurasOptions/WeakAurasOptions.toc
#	Interface/AddOns/WeakAurasTemplates/WeakAurasTemplates.toc
#	WTF/Account/OMNIDRAGON/Deathwing/Quillidania/SavedVariables/DBM-Core.lua
#	WTF/Account/OMNIDRAGON/Deathwing/Quillidania/SavedVariables/Details.lua
#	WTF/Account/OMNIDRAGON/Deathwing/Quillidania/SavedVariables/Details_EncounterDetails.lua
#	WTF/Account/OMNIDRAGON/Deathwing/Quillidania/SavedVariables/Details_TimeLine.lua
#	WTF/Account/OMNIDRAGON/Deathwing/Quillidania/SavedVariables/ElvUI.lua
#	WTF/Account/OMNIDRAGON/Deathwing/Quillidania/cache.md5
#	WTF/Account/OMNIDRAGON/Deathwing/Quillidania/config-cache.old
#	WTF/Account/OMNIDRAGON/Deathwing/Quillidania/config-cache.wtf
#	WTF/Account/OMNIDRAGON/SavedVariables/!BugGrabber.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/!KalielsTracker.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/AngryKeystones.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/AzeriteTooltip.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/BestInSlotRedux.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Blizzard_CombatLog.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/DBM-Core.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/DBM-StatusBarTimers.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Details.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Details_Streamer.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/ElvUI.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/ElvUI_SLE.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Executive_Assistant.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/GatherMate2.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/HandyNotes.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/HandyNotes_Shadowlands.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Leatrix_Plus.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/LoggerHead.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/MRT.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/MythicDungeonTools.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Narcissus.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/OPie.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Plater.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/ProjectAzilroka.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Rematch.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Routes.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/SavedInstances.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Scorpio.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/Sorted.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/TomTom.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/WIM.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/WeakAuras.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/WeakAurasCompanion.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/WorldQuestsList.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/XLoot.lua
#	WTF/Account/OMNIDRAGON/SavedVariables/tdBattlePetScript.lua
#	WTF/Account/OMNIDRAGON/cache.md5
#	WTF/Account/OMNIDRAGON/config-cache.old
#	WTF/Account/OMNIDRAGON/config-cache.wtf
#	WTF/Account/OMNIDRAGON/macros-cache.txt
#	WTF/Config.wtf
#	WTF/SavedVariables/Blizzard_Console.lua
2022-06-07
Quildra 4 years ago
parent
commit
b59274512f

Diff Content Not Available