From 89ead9b19e56f82d92c2239ec0b0c131f907200f Mon Sep 17 00:00:00 2001 From: Lag Date: Tue, 27 Aug 2019 02:54:03 +0200 Subject: [PATCH 1/6] add WoWInterface ID for packager --- AtlasLootClassic/AtlasLootClassic.toc | 1 + 1 file changed, 1 insertion(+) diff --git a/AtlasLootClassic/AtlasLootClassic.toc b/AtlasLootClassic/AtlasLootClassic.toc index b9454aa9..2b73d3b2 100644 --- a/AtlasLootClassic/AtlasLootClassic.toc +++ b/AtlasLootClassic/AtlasLootClassic.toc @@ -35,6 +35,7 @@ ## X-License: GPL v2 ## X-Localizations: enUS, deDE, frFR, esES, koKR, zhCN, zhTW, esMX, ptBR, ruRU, itIT ## X-Curse-Project-ID: 326516 +## X-WoWI-ID: 25185 embeds.xml From 7e815fab7e38abd0eaf43b0d313d359823c59d81 Mon Sep 17 00:00:00 2001 From: Lag Date: Tue, 27 Aug 2019 03:03:02 +0200 Subject: [PATCH 2/6] update readme images and changelog --- AtlasLootClassic/Documentation/Release_Notes.md | 7 +++++++ CHANGELOG.md | 8 +++----- README.md | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md index 849c7c0b..26db617a 100644 --- a/AtlasLootClassic/Documentation/Release_Notes.md +++ b/AtlasLootClassic/Documentation/Release_Notes.md @@ -2,6 +2,13 @@ This mod is distributed under Version 2 of the GPL. A copy of the GPL is included in this zip file with links to non-english translations. +## v1.1.6-beta (Aug. 25, 2019) + +- Big thanks for the translation work at curseforge! +- Favourites tooltip icon and lists can now enabled separately +- Add faction mounts, some have bad modelzoom but can't fix that now +- Cleanup Phase 2/3 items with new info from blizzards AmA + ## v1.1.5-beta (Aug. 19, 2019) - Add a GUI for favourites diff --git a/CHANGELOG.md b/CHANGELOG.md index db587928..f0c01293 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,7 @@ This mod is distributed under Version 2 of the GPL. A copy of the GPL is includ [Changelog history](https://github.com/Hoizame/AtlasLootClassic/blob/master/AtlasLootClassic/Documentation/Release_Notes.md) -## v1.1.6-beta (Aug. 25, 2019) +## v1.1.7-beta (Aug. 27, 2019) -- Big thanks for the translation work at curseforge! -- Favourites tooltip icon and lists can now enabled separately -- Add faction mounts, some have bad modelzoom but can't fix that now -- Cleanup Phase 2/3 items with new info from blizzards AmA +- Translation update +- Some small fixes diff --git a/README.md b/README.md index e59f3e40..0d08bc96 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ AtlasLoot Classic is an UI mod allowing for loot tables of bosses to be browsed * Import and export your lists * A GUI that let you plan your gear and shows a indicator if you already own an item -![image](https://drive.google.com/uc?export=view&id=1ExzBOWRcefewTRHA9BQOdz9m7FFY-zzP)![image](https://drive.google.com/uc?export=view&id=187PAs2VYp2b6AQqIvq1Dcstb-B1DXJJx) +![image](https://media.forgecdn.net/attachments/260/125/atlasloot-fav-gui.png)![image](https://media.forgecdn.net/attachments/260/931/atlasloot-fav-tt.png) ## Favourites import/export format From 8928e146f8203031986ad2839a1df9c496902b10 Mon Sep 17 00:00:00 2001 From: Lag Date: Tue, 27 Aug 2019 03:21:13 +0200 Subject: [PATCH 3/6] add WoWI into readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0d08bc96..4288167d 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ AtlasLoot Classic is an UI mod allowing for loot tables of bosses to be browsed ## Download [Curseforge](https://www.curseforge.com/wow/addons/atlaslootclassic) +[WoWInterface](https://www.wowinterface.com/downloads/info25185-AtlasLootClassic.html) ## Features From 0cec29b3ec21653b9b27dc491af7f2513fb9d91c Mon Sep 17 00:00:00 2001 From: Lag Date: Tue, 27 Aug 2019 23:51:02 +0200 Subject: [PATCH 4/6] some content phase fixes --- AtlasLootClassic/Core/Tooltip.lua | 3 ++- AtlasLootClassic/Data/ContentPhase.lua | 6 +++--- AtlasLootClassic_DungeonsAndRaids/data.lua | 4 ++++ README.md | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/AtlasLootClassic/Core/Tooltip.lua b/AtlasLootClassic/Core/Tooltip.lua index f82ee827..e7c7b4e5 100644 --- a/AtlasLootClassic/Core/Tooltip.lua +++ b/AtlasLootClassic/Core/Tooltip.lua @@ -117,7 +117,8 @@ end AtlasLoot:AddInitFunc(HookInit) local PLAYER_GUID_REGISTER = { - --["Player-4618-000DD289"] = format(GOLD, "Test"), + ["Player-4463-003F795C"] = format(GOLD, "AtlasLoot Author"), + ["Player-4455-00D28DDC"] = format(SILVER, "AtlasLoot Friend"), } local function AddText(self) diff --git a/AtlasLootClassic/Data/ContentPhase.lua b/AtlasLootClassic/Data/ContentPhase.lua index fe7f9b83..26ff163a 100644 --- a/AtlasLootClassic/Data/ContentPhase.lua +++ b/AtlasLootClassic/Data/ContentPhase.lua @@ -73,7 +73,7 @@ local PHASE_ITEMS = { [18401] = 2, [18348] = 2, [11737] = 2, [11647] = 2, [11648] = 2, [11649] = 2, [11645] = 2, [11646] = 2, [11734] = 2, [11643] = 2, [11732] = 2, [11622] = 2, [11736] = 2, [11644] = 2, [18329] = 2, [18356] = 2, [11642] = 2, [18357] = 2, [18358] = 2, [18359] = 2, [18360] = 2, [18361] = 2, [18362] = 2, [18363] = 2, [18364] = 2, [18330] = 2, [18331] = 2, [11733] = 2, [18249] = 2, - [17623] = 2, [18045] = 2, + [17623] = 2, [18045] = 2, [18663] = 2, -- Phase 3 [2806] = 3, [5998] = 3, [13015] = 3, [13047] = 3, [16818] = 3, [16832] = 3, [16897] = 3, [16898] = 3, [16899] = 3, [16902] = 3, @@ -126,7 +126,7 @@ local PHASE_ITEMS = { [19066] = 3, [19067] = 3, -- Phase 4 - [12470] = 4, [19574] = 4, [19575] = 4, [19576] = 4, [19577] = 4, [19579] = 4, [19585] = 4, [19586] = 4, [19588] = 4, [19591] = 4, + [19574] = 4, [19575] = 4, [19576] = 4, [19577] = 4, [19579] = 4, [19585] = 4, [19586] = 4, [19588] = 4, [19591] = 4, [19592] = 4, [19593] = 4, [19594] = 4, [19598] = 4, [19599] = 4, [19600] = 4, [19601] = 4, [19602] = 4, [19603] = 4, [19604] = 4, [19605] = 4, [19606] = 4, [19607] = 4, [19608] = 4, [19609] = 4, [19610] = 4, [19611] = 4, [19612] = 4, [19613] = 4, [19614] = 4, [19615] = 4, [19616] = 4, [19617] = 4, [19618] = 4, [19619] = 4, [19620] = 4, [19621] = 4, [19682] = 4, [19683] = 4, [19684] = 4, @@ -188,7 +188,7 @@ local PHASE_ITEMS = { [21116] = 4, [21117] = 4, [21118] = 4, [22932] = 4, [23794] = 4, [23795] = 4, [23796] = 4, [19727] = 4, [19820] = 4, [19818] = 4, [19819] = 4, [19814] = 4, [19821] = 4, [19816] = 4, [19817] = 4, [19815] = 4, [19813] = 4, [19789] = 4, [19787] = 4, [19788] = 4, [19784] = 4, [19790] = 4, [19785] = 4, [19786] = 4, [19783] = 4, [19782] = 4, [19975] = 4, [21119] = 4, [20223] = 4, [20235] = 4, - [20222] = 4, [20234] = 4, [20224] = 4, [20232] = 4, [21120] = 4, [19931] = 4, [20074] = 4, + [20222] = 4, [20234] = 4, [20224] = 4, [20232] = 4, [21120] = 4, [19931] = 4, [20074] = 4, [19974] = 4, -- Phase 5 [5355] = 5, [12471] = 5, [17061] = 5, [20415] = 5, [20722] = 5, [20726] = 5, [20727] = 5, [20728] = 5, [20729] = 5, [20730] = 5, diff --git a/AtlasLootClassic_DungeonsAndRaids/data.lua b/AtlasLootClassic_DungeonsAndRaids/data.lua index 1d060d8f..a97fa1d4 100644 --- a/AtlasLootClassic_DungeonsAndRaids/data.lua +++ b/AtlasLootClassic_DungeonsAndRaids/data.lua @@ -469,6 +469,7 @@ data["ShadowfangKeep"] = { name = AL["Sever"], npcId = 14682, DisplayIDs = {{1061}}, + ContentPhase = 6, [NORMAL_DIFF] = { { 1, 23173 }, -- Abomination Skin Leggings { 2, 23171 }, -- The Axe of Severing @@ -1207,6 +1208,7 @@ data["RazorfenDowns"] = { name = AL["Lady Falther'ess"], npcId = 14686, DisplayIDs = {{10698}}, + ContentPhase = 6, [NORMAL_DIFF] = { { 1, 23178 }, -- Mantle of Lady Falther'ess { 2, 23177 }, -- Lady Falther'ess' Finger @@ -1520,6 +1522,7 @@ data["Zul'Farrak"] = { name = AL["Dustwraith"], npcId = 10081, DisplayIDs = {{9292}}, + ContentPhase = 5, [NORMAL_DIFF] = { { 1, 12471 }, -- Desertwalker Cane }, @@ -3635,6 +3638,7 @@ data["Stratholme"] = { name = AL["Balzaphon"], npcId = 14684, DisplayIDs = {{7919}}, + ContentPhase = 6, [NORMAL_DIFF] = { { 1, 23125 }, -- Chains of the Lich { 2, 23126 }, -- Waistband of Balzaphon diff --git a/README.md b/README.md index 4288167d..621c3165 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ AtlasLoot Classic is an UI mod allowing for loot tables of bosses to be browsed ## Download [Curseforge](https://www.curseforge.com/wow/addons/atlaslootclassic) + [WoWInterface](https://www.wowinterface.com/downloads/info25185-AtlasLootClassic.html) ## Features From e258d2023eeb339100d0226b87e76435c7166685 Mon Sep 17 00:00:00 2001 From: Lag Date: Wed, 28 Aug 2019 10:51:31 +0200 Subject: [PATCH 5/6] update babelfish --- babelfish.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/babelfish.lua b/babelfish.lua index 20022c68..423fbe9e 100644 --- a/babelfish.lua +++ b/babelfish.lua @@ -416,8 +416,6 @@ local function BuildLocaleList(fileList) end local function getJsonFormattedString(s) - s = string.gsub(s, "<", "\\f<\\f") - s = string.gsub(s, ">", "\\f>\\f") return s end From 222d6b63f714eb673e5772869dce9e22a9a72bad Mon Sep 17 00:00:00 2001 From: Lag Date: Wed, 28 Aug 2019 11:15:15 +0200 Subject: [PATCH 6/6] changelog --- CHANGELOG.md | 2 +- babelfish.lua | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0c01293..2c85affe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,5 +6,5 @@ This mod is distributed under Version 2 of the GPL. A copy of the GPL is includ ## v1.1.7-beta (Aug. 27, 2019) -- Translation update +- Translation update from curseforge - Some small fixes diff --git a/babelfish.lua b/babelfish.lua index 423fbe9e..78b09d33 100644 --- a/babelfish.lua +++ b/babelfish.lua @@ -218,6 +218,10 @@ local function ParseLuaFile(fileName) if not oneLineCom and not multiComment then if tmp == IDENTIFIER and c == "[" then start = true + elseif tmp == IDENTIFIER and c ~= "[" then + loc, start, tmp = nil, false, "" + elseif start and c ~= "\"" and not loc then --start + loc, start, tmp = nil, false, "" elseif start and c == "\"" and not loc then --start loc = "" elseif loc and start and c == "\"" and lastC ~= "\\" then