Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Hoizame committed Sep 14, 2019
2 parents 6606349 + f34ed24 commit a036bda
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 39 deletions.
8 changes: 4 additions & 4 deletions AtlasLootClassic/Data/ContentPhase.lua
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,13 @@ local PHASE_ITEMS = {
[22087] = 5, [22088] = 5, [22089] = 5, [22090] = 5, [22091] = 5, [22092] = 5, [22093] = 5, [22095] = 5, [22096] = 5, [22097] = 5,
[22098] = 5, [22099] = 5, [22100] = 5, [22101] = 5, [22102] = 5, [22106] = 5, [22107] = 5, [22108] = 5, [22109] = 5, [22110] = 5,
[22111] = 5, [22112] = 5, [22113] = 5, [22149] = 5, [22150] = 5, [22191] = 5, [22194] = 5, [22195] = 5, [22196] = 5, [22197] = 5,
[22198] = 5, [22202] = 5, [22203] = 5, [22204] = 5, [22205] = 5, [22207] = 5, [22208] = 5, [22209] = 5, [22212] = 5, [22214] = 5,
[22219] = 5, [22220] = 5, [22221] = 5, [22222] = 5, [22223] = 5, [22225] = 5, [22231] = 5, [22232] = 5, [22234] = 5, [22240] = 5,
[22198] = 5, [22202] = 5, [22203] = 5, [22204] = 5, [22205] = 5, [22207] = 5, [22209] = 5, [22212] = 5, [22214] = 5,
[22219] = 5, [22220] = 5, [22221] = 5, [22222] = 5, [22223] = 5, [22225] = 5, [22231] = 5,
[22241] = 5, [22242] = 5, [22245] = 5, [22247] = 5, [22248] = 5, [22249] = 5, [22251] = 5, [22252] = 5, [22253] = 5, [22254] = 5,
[22255] = 5, [22256] = 5, [22257] = 5, [22266] = 5, [22267] = 5, [22268] = 5, [22269] = 5, [22270] = 5, [22271] = 5, [22275] = 5,
[22276] = 5, [22277] = 5, [22278] = 5, [22279] = 5, [22280] = 5, [22281] = 5, [22282] = 5, [22301] = 5, [22302] = 5, [22303] = 5,
[22304] = 5, [22305] = 5, [22306] = 5, [22307] = 5, [22308] = 5, [22309] = 5, [22310] = 5, [22311] = 5, [22312] = 5, [22313] = 5,
[22314] = 5, [22315] = 5, [22317] = 5, [22318] = 5, [22319] = 5, [22321] = 5, [22322] = 5, [22325] = 5, [22326] = 5, [22327] = 5,
[22304] = 5, [22305] = 5, [22306] = 5, [22307] = 5, [22308] = 5, [22309] = 5, [22310] = 5, [22311] = 5, [22312] = 5,
[22314] = 5, [22315] = 5, [22317] = 5, [22318] = 5, [22319] = 5, [22322] = 5, [22325] = 5, [22326] = 5, [22327] = 5,
[22328] = 5, [22329] = 5, [22330] = 5, [22331] = 5, [22332] = 5, [22333] = 5, [22334] = 5, [22335] = 5, [22336] = 5, [22337] = 5,
[22339] = 5, [22340] = 5, [22342] = 5, [22343] = 5, [22345] = 5, [22347] = 5, [22348] = 5, [22377] = 5, [22378] = 5, [22379] = 5,
[22380] = 5, [22383] = 5, [22384] = 5, [22385] = 5, [22388] = 5, [22389] = 5, [22390] = 5, [22392] = 5, [22393] = 5, [22394] = 5,
Expand Down
8 changes: 8 additions & 0 deletions AtlasLootClassic/Documentation/Release_Notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

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.10 (Sep. 14, 2019)

- Profession rank updates
- Add most missing profession skill ranks
- Fix useGameTooltip function
- Maps: Add data for WorldBosses
- Maps: Entrance map support

## v1.1.9-beta (Sep. 03, 2019)

- Add support for AtlasLootClassic_Maps Module
Expand Down
2 changes: 1 addition & 1 deletion AtlasLootClassic_Collections/Locales/constants.kr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
if not AL then return end

-- These localization strings are translated on Curseforge: https://www.curseforge.com/wow/addons/atlaslootclassic/localization
--@localization(locale="itIT", format="lua_additive_table", table-name="AL", handle-unlocalized="ignore", namespace="Collections")@
--@localization(locale="koKR", format="lua_additive_table", table-name="AL", handle-unlocalized="ignore", namespace="Collections")@
2 changes: 1 addition & 1 deletion AtlasLootClassic_Crafting/Locales/constants.kr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
if not AL then return end

-- These localization strings are translated on Curseforge: https://www.curseforge.com/wow/addons/atlaslootclassic/localization
--@localization(locale="itIT", format="lua_additive_table", table-name="AL", handle-unlocalized="ignore", namespace="Crafting")@
--@localization(locale="koKR", format="lua_additive_table", table-name="AL", handle-unlocalized="ignore", namespace="Crafting")@
2 changes: 1 addition & 1 deletion AtlasLootClassic_DungeonsAndRaids/Locales/constants.kr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
if not AL then return end

-- These localization strings are translated on Curseforge: https://www.curseforge.com/wow/addons/atlaslootclassic/localization
--@localization(locale="itIT", format="lua_additive_table", table-name="AL", handle-unlocalized="ignore", namespace="DungeonsAndRaids")@
--@localization(locale="koKR", format="lua_additive_table", table-name="AL", handle-unlocalized="ignore", namespace="DungeonsAndRaids")@
50 changes: 26 additions & 24 deletions AtlasLootClassic_DungeonsAndRaids/data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2385,9 +2385,10 @@ data["BlackrockDepths"] = {
AtlasMapBossID = 5,
[NORMAL_DIFF] = {
{ 1, 11626 }, -- Blackveil Cape
{ 2, 11624 }, -- Kentic Amice
{ 3, 22240 }, -- Greaves of Withering Despair
{ 4, 11625 }, -- Enthralled Sphere
{ 2, 11623 }, -- Spritecaster Cape
{ 3, 11624 }, -- Kentic Amice
{ 4, 22240 }, -- Greaves of Withering Despair
{ 5, 11625 }, -- Enthralled Sphere
{ 16, 11140 }, -- Prison Cell Key
},
},
Expand Down Expand Up @@ -2488,6 +2489,7 @@ data["BlackrockDepths"] = {
npcId = 9024,
DisplayIDs = {{8762}},
AtlasMapBossID = 7,
specialType = "rare",
[NORMAL_DIFF] = {
{ 1, 11747 }, -- Flamestrider Robes
{ 2, 11749 }, -- Searingscale Leggings
Expand Down Expand Up @@ -2682,15 +2684,14 @@ data["BlackrockDepths"] = {
DisplayIDs = {{8690},{8686},{8692},{8689},{8691},{8687},{8688}},
AtlasMapBossID = 18,
[NORMAL_DIFF] = {
{ 1, "INV_Box_01", nil, AL["Chest of The Seven"], nil },
{ 2, 11925 }, -- Ghostshroud
{ 3, 11926 }, -- Deathdealer Breastplate
{ 4, 11929 }, -- Haunting Specter Leggings
{ 5, 11927 }, -- Legplates of the Eternal Guardian
{ 6, 11920 }, -- Wraith Scythe
{ 7, 11923 }, -- The Hammer of Grace
{ 8, 11922 }, -- Blood-etched Blade
{ 9, 11921 }, -- Impervious Giant
{ 1, 11925 }, -- Ghostshroud
{ 2, 11926 }, -- Deathdealer Breastplate
{ 3, 11929 }, -- Haunting Specter Leggings
{ 4, 11927 }, -- Legplates of the Eternal Guardian
{ 5, 11920 }, -- Wraith Scythe
{ 6, 11923 }, -- The Hammer of Grace
{ 7, 11922 }, -- Blood-etched Blade
{ 8, 11921 }, -- Impervious Giant
},
},
{ -- BRDMagmus
Expand Down Expand Up @@ -2883,11 +2884,12 @@ data["LowerBlackrockSpire"] = {
[NORMAL_DIFF] = {
{ 1, 16676 }, -- Beaststalker's Gloves
{ 3, 13177 }, -- Talisman of Evasion
{ 4, 13179 }, -- Brazecore Armguards
{ 5, 22231 }, -- Kayser's Boots of Precision
{ 6, 13173 }, -- Flightblade Throwing Axe
{ 7, 12582 }, -- Keris of Zul'Serak
{ 9, 12335 }, -- Gemstone of Smolderthorn
{ 4, 13178 }, -- Rosewine Circle
{ 5, 13179 }, -- Brazecore Armguards
{ 6, 22231 }, -- Kayser's Boots of Precision
{ 7, 13173 }, -- Flightblade Throwing Axe
{ 8, 12582 }, -- Keris of Zul'Serak
{ 10, 12335 }, -- Gemstone of Smolderthorn
},
},
{ -- LBRSGrimaxe
Expand Down Expand Up @@ -2934,13 +2936,12 @@ data["LowerBlackrockSpire"] = {
DisplayIDs = {{11583}},
AtlasMapBossID = 15,
[NORMAL_DIFF] = {
{ 1, 13258 }, -- Slaghide Gauntlets
{ 2, 22232 }, -- Marksman's Girdle
{ 3, 13259 }, -- Ribsteel Footguards
{ 4, 13178 }, -- Rosewine Circle
{ 6, 18784 }, -- Top Half of Advanced Armorsmithing: Volume III
--{ 7, 12725 }, -- Plans: Enchanted Thorium Helm
--{ 8, 12620 }, -- Enchanted Thorium Helm
{ 1, 16670 }, -- Boots of Elements
{ 3, 13258 }, -- Slaghide Gauntlets
{ 4, 22232 }, -- Marksman's Girdle
{ 5, 13259 }, -- Ribsteel Footguards
{ 6, 13178 }, -- Rosewine Circle
{ 8, 18784 }, -- Top Half of Advanced Armorsmithing: Volume III
},
},
{ -- LBRSZigris
Expand Down Expand Up @@ -2985,6 +2986,7 @@ data["LowerBlackrockSpire"] = {
npcId = 9718,
DisplayIDs = {{11809}},
AtlasMapBossID = 18,
specialType = "rare",
[NORMAL_DIFF] = {
{ 1, 13203 }, -- Armswake Cloak
{ 2, 13198 }, -- Hurd Smasher
Expand Down
2 changes: 1 addition & 1 deletion AtlasLootClassic_Factions/Locales/constants.kr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
if not AL then return end

-- These localization strings are translated on Curseforge: https://www.curseforge.com/wow/addons/atlaslootclassic/localization
--@localization(locale="itIT", format="lua_additive_table", table-name="AL", handle-unlocalized="ignore", namespace="Factions")@
--@localization(locale="koKR", format="lua_additive_table", table-name="AL", handle-unlocalized="ignore", namespace="Factions")@
2 changes: 1 addition & 1 deletion AtlasLootClassic_Options/Locales/constants.kr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
if not AL then return end

-- These localization strings are translated on Curseforge: https://www.curseforge.com/wow/addons/atlaslootclassic/localization
--@localization(locale="itIT", format="lua_additive_table", table-name="AL", handle-unlocalized="ignore", namespace="Options")@
--@localization(locale="koKR", format="lua_additive_table", table-name="AL", handle-unlocalized="ignore", namespace="Options")@
8 changes: 2 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ 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.10 (Sep. 14, 2019)
## v1.1.11 (Sep. 14, 2019)

- Profession rank updates
- Add moste missing profession skill ranks
- Fix useGameTooltip function
- Maps: Add data for WorldBosses
- Maps: Entrance map support
- Fix koKR translation

0 comments on commit a036bda

Please sign in to comment.