Merge branch 'development'

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
 

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)

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,

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

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

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 from curseforge
+- Some small fixes

README.md

@@ -8,6 +8,8 @@ AtlasLoot Classic is an UI mod allowing for loot tables of bosses to be browsed
 
 [Curseforge](https://www.curseforge.com/wow/addons/atlaslootclassic)
 
+[WoWInterface](https://www.wowinterface.com/downloads/info25185-AtlasLootClassic.html)
+
 ## Features
 
 * Loottables for Dungeons and Raids
@@ -24,7 +26,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
 

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
@@ -416,8 +420,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