Skip to content

Commit

Permalink
Merge pull request #153 from ArtOfShred/develop
Browse files Browse the repository at this point in the history
6.0.4
  • Loading branch information
Shredmaster Reeman authored Mar 2, 2020
2 parents 5ba086e + 768842d commit c939382
Show file tree
Hide file tree
Showing 102 changed files with 1,277 additions and 435 deletions.
16 changes: 15 additions & 1 deletion Changelog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@
local zo_strformat = zo_strformat

local changelogMessages = {
"|cFFA500LuiExtended Version 6.0.4|r",
"",
"|cFFFF00General:|r",
"[*] Updated icons, tooltips, alerts, and cc tracker for Crypt of Hearts I.",
"[*] Updated and added a good chunk of improved custom icons.",
"",
"|cFFFF00Chat Announcements:|r",
"[*] Fixed an issue where Friend logon/logoff messages would duplicate when using pChat, now my tatsumaki is more powerful.",
"[*] Fixed an issue where the Center Screen Announcement for completing a lore collection for a zone that resulted in Mages Guild reputation gain would throw a UI error & fixed an issue where the Chat Announcement for this event had an icon that was colored by the default system text color.",
"",
"|cFFFF00Combat Info:|r",
"[*] Fixed an issue where the fallback font variable was misnamed. This could cause the addon to fail to load if for some reason the selected font wasn't found.",
"[*] Removed a debug line from Ability Alerts that could display when enemies used abilities.",
"",
"|cFFA500LuiExtended Version 6.0.3|r",
"",
"|cFFFF00Slash Commands:|r",
Expand Down Expand Up @@ -110,7 +124,7 @@ local changelogMessages = {
"",
"|cFFFF00Art Assets:|r",
"[*] Custom ability icons by and modified from eleazzaar licensed under the CC-3 License (https://creativecommons.org/licenses/by/3.0/)",
"[*] Custom ability icons by and modified from AKiZA, Angelina Avgustova, Dayed, Digital Worlds JSC, Ever Probe, HOSE, Jon Snow, Josch, Kalle Olli, Moon Tribe, N-hance Studio, PONETI, REXARD, Sky Painter, The 7 Heaven, TiGame, and TonityEden licensed under the Unity Store single entity license. (https://unity3d.com/legal/as_terms)",
"[*] Custom ability icons by and modified from AKiZA, Angelina Avgustova, Blade Dancer, ClayManStudio, Dayed, Digital Worlds JSC, Ever Probe, HOSE, Jon Snow, Josch, Kalle Olli, Moon Tribe, N-hance Studio, PONETI, REXARD, Sky Painter, The 7 Heaven, TiGame, and TonityEden licensed under the Unity Store single entity license. (https://unity3d.com/legal/as_terms)",
"[*] Custom ability icons by and modified from a-ravlik & micart licensed under the GraphicRiver regular license. (https://graphicriver.net/licenses/terms/regular)",
"[*] Custom ability icons by and modified from Forrest Imel, Frostwindz and Mizuko licensed under the GameDevMarket.net pro license. (https://www.gamedevmarket.net/terms-conditions/#pro-licence)",
"",
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

Custom Art Assets by and modified from eleazzaar licensed under the CC BY 3.0 license. (https://creativecommons.org/licenses/by/3.0/)
Custom Art Assets by and modified from AKiZA, Angelina Avgustova, Dayed, Digital Worlds JSC, Ever Probe, HOSE, Jon Snow, Josch, Kalle Olli, Moon Tribe, N-hance Studio, PONETI, REXARD, Sky Painter, The 7 Heaven, TiGame, and TonityEden licensed under the Unity Store single entity license. (https://unity3d.com/legal/as_terms)
Custom Art Assets by and modified from AKiZA, Angelina Avgustova, Blade Dancer, ClayManStudio, Dayed, Digital Worlds JSC, Ever Probe, HOSE, Jon Snow, Josch, Kalle Olli, Moon Tribe, N-hance Studio, PONETI, REXARD, Sky Painter, The 7 Heaven, TiGame, and TonityEden licensed under the Unity Store single entity license. (https://unity3d.com/legal/as_terms)
Custom Art Assets by and modified from a-ravlik & micart licensed under the GraphicRiver regular license. (https://graphicriver.net/licenses/terms/regular)
Custom Art Assets by and modified from Forrest Imel, Frostwindz and Mizuko licensed under the GameDevMarket.net pro license. (https://www.gamedevmarket.net/terms-conditions/#pro-licence)
2 changes: 1 addition & 1 deletion LuiExtended.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if LUIE == nil then LUIE = {} end

LUIE.tag = "LUIE"
LUIE.name = "LuiExtended"
LUIE.version = "6.0.3"
LUIE.version = "6.0.4"
LUIE.author = "ArtOfShred, psypanda & SpellBuilder"
LUIE.website = "https://www.esoui.com/downloads/info818-LuiExtended.html"
LUIE.github = "https://github.com/ArtOfShred/LuiExtended"
Expand Down
7 changes: 4 additions & 3 deletions LuiExtended.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Title: |cE12000L|cFFFFB0ui E|rxtended|
## Author: ArtOfShred, psypanda, SpellBuilder
## Version: 6.0.3
## Version: 6.0.4
## APIVersion: 100030
## AddOnVersion: 603
## AddOnVersion: 604
## Description: Provides UnitFrames, InfoPanel, Combat Text & Info, Buffs & Debuff Tracking, Chat Announcements and Slash Commands.
## DependsOn: LibAddonMenu-2.0 LibMediaProvider-1.0
## OptionalDependsOn: LibStub LibChatMessage
## OptionalDependsOn: LibStub LibChatMessage pChat
## IsLibrary: false
## SavedVariables: LUIESV

Expand Down Expand Up @@ -60,6 +60,7 @@ i18n/settings/Settings_$(language).lua
i18n/skills/Skills_en.lua
i18n/skills/Skills_$(language).lua

data/Globals.lua
data/AbilityTables.lua
data/Tooltips.lua
data/UnitNamesTable.lua
Expand Down
15 changes: 14 additions & 1 deletion data/AbilityTables.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1240,9 +1240,16 @@ local AbilityTables = {
Skill_Sisters_Bond = GetString(SI_LUIE_SKILL_SISTERS_BOND),
Skill_Levitate = 28570,
Skill_Essence_Siphon = 28750,
Skill_Daedric_Chaos = GetString(SI_LUIE_SKILL_DAEDRIC_CHAOS),
Skill_Chaotic_Dispersion = GetString(SI_LUIE_SKILL_CHAOTIC_DISPERSION),
Skill_Chaotic_Return = GetString(SI_LUIE_SKILL_CHAOTIC_RETURN),
Skill_Summon_Daedroth = 69356,
Skill_Resilience = GetString(SI_LUIE_SKILL_RESILIENCE),

-- Elden Hollow I
Skill_Crushing_Blow = 33189,
Skill_Executioners_Strike = 16834,
Skill_Whirling_Axe = GetString(SI_LUIE_SKILL_WHIRLING_AXE),
Skill_Crushing_Blow = 33189, -- TODO: Move to the first instance of this rename being neccesary
Skill_Measured_Uppercut = 34607,
Skill_Heal_Spores = GetString(SI_LUIE_SKILL_HEAL_SPORES),
Skill_Summon_Saplings = GetString(SI_LUIE_SKILL_SUMMON_STRANGLER_SAPLINGS),
Expand Down Expand Up @@ -1334,6 +1341,12 @@ local AbilityTables = {
Skill_Escaped_Souls = GetString(SI_LUIE_SKILL_ESCAPED_SOULS),
Skill_Overhead_Smash = 20915,

-- Crypt of Hearts I
Skill_Trample = 46947,
Skill_Immolate = 46679,
Skill_Electric_Prison = 22432,
Skill_Overwhelming_Blow = GetString(SI_LUIE_SKILL_OVERWHELMING_BLOW),

-- Frostvault
Skill_Rending_Bleed = 117286,
Skill_Leaping_Crush = 109801,
Expand Down
Loading

0 comments on commit c939382

Please sign in to comment.