Merge branch 'master' of https://github.com/Shestak/ShestakUI & updat…

…e to 1.4.6
Shestak · Jun 15, 2014 · 775a7ba · 775a7ba
2 parents ab0a5d7 + ed84c87
commit 775a7ba
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 22 deletions.
diff --git a/ShestakUI/Core/Functions.lua b/ShestakUI/Core/Functions.lua
@@ -10,7 +10,7 @@ end
 
 T.ShortValue = function(value)
 	if value >= 1e8 then
-		return ("%.0fm"):format(value / 1e6):gsub("%.?0+([km])$", "%1")
+		return ("%.0fm"):format(value / 1e6)
 	elseif value >= 1e7 then
 		return ("%.1fm"):format(value / 1e6):gsub("%.?0+([km])$", "%1")
 	elseif value >= 1e6 then

diff --git a/ShestakUI/Locales/Chinese.lua b/ShestakUI/Locales/Chinese.lua
@@ -257,7 +257,7 @@ L_POPUP_CURRENCY_CAP = "你拥有的最高级货币为"
 L_WELCOME_LINE_1 = "欢迎使用ShestakUI "
 L_WELCOME_LINE_2_1 = "输入/cfg进行插件设置,或者访问http://shestak.org"
 L_WELCOME_LINE_2_2 = "得到更多信息."
-L_WELCOME_LINE_3 = "注： 此版本的ShestakUI (|cff00FFFFOzEdit 1.4.5|r|cffFFFF00)由Pozzo dell'Eternità奥兹编辑。|r" -- Goooooooooogle translated
+L_WELCOME_LINE_3 = "注： 此版本的ShestakUI (|cff00FFFFOzEdit 1.4.6|r|cffFFFF00)由Pozzo dell'Eternità奥兹编辑。|r" -- Goooooooooogle translated
 
 -- Combat text
 L_COMBATTEXT_KILLING_BLOW = "最后一击"

diff --git a/ShestakUI/Locales/English.lua b/ShestakUI/Locales/English.lua
@@ -253,7 +253,7 @@ L_POPUP_CURRENCY_CAP = "You get maximum value of"
 L_WELCOME_LINE_1 = "Welcome to ShestakUI "
 L_WELCOME_LINE_2_1 = "Type /cfg to config interface, or visit http://shestak.org"
 L_WELCOME_LINE_2_2 = "for more informations."
-L_WELCOME_LINE_3 = "Note: this version of ShestakUI (|cff00FFFFOzEdit 1.4.5|r|cffFFFF00) is edited by Oz of Pozzo dell'Eternità.|r"
+L_WELCOME_LINE_3 = "Note: this version of ShestakUI (|cff00FFFFOzEdit 1.4.6|r|cffFFFF00) is edited by Oz of Pozzo dell'Eternità.|r"
 
 -- Combat text
 L_COMBATTEXT_KILLING_BLOW = "Killing Blow"

diff --git a/ShestakUI/Locales/French.lua b/ShestakUI/Locales/French.lua
@@ -257,7 +257,7 @@ L_POPUP_CURRENCY_CAP = "You get maximum value of" -- Needs review
 L_WELCOME_LINE_1 = "Bienvenue sur ShestakUI "
 L_WELCOME_LINE_2_1 = "Tapez /cfg pour configurer l'interface, ou visitez http://shestak.org"
 L_WELCOME_LINE_2_2 = "pour plus d'informations"
-L_WELCOME_LINE_3 = "Note: cette version de ShestakUI (|cff00FFFFOzEdit 1.4.5|r|cffFFFF00) est édité par Oz de Pozzo dell'Eternità.|r" -- Goooooooooogle translated
+L_WELCOME_LINE_3 = "Note: cette version de ShestakUI (|cff00FFFFOzEdit 1.4.6|r|cffFFFF00) est édité par Oz de Pozzo dell'Eternità.|r" -- Goooooooooogle translated
 
 -- Combat text
 L_COMBATTEXT_KILLING_BLOW = "Coup Fatal"

diff --git a/ShestakUI/Locales/German.lua b/ShestakUI/Locales/German.lua
@@ -257,7 +257,7 @@ L_POPUP_CURRENCY_CAP = "Maximalwert erreicht"
 L_WELCOME_LINE_1 = "Willkommen bei ShestakUI "
 L_WELCOME_LINE_2_1 = "Gebe /cfg ein um das Interface zu konfigurieren, oder besuche http://shestak.org"
 L_WELCOME_LINE_2_2 = "für weitere Informationen."
-L_WELCOME_LINE_3 = "Hinweis: Diese Version von ShestakUI (|cff00FFFFOzEdit 1.4.5|r|cffFFFF00) wird von Oz von Pozzo dell'Eternità bearbeitet.|r" -- Goooooooooogle translated
+L_WELCOME_LINE_3 = "Hinweis: Diese Version von ShestakUI (|cff00FFFFOzEdit 1.4.6|r|cffFFFF00) wird von Oz von Pozzo dell'Eternità bearbeitet.|r" -- Goooooooooogle translated
 
 -- Combat text
 L_COMBATTEXT_KILLING_BLOW = "Todesstoß"

diff --git a/ShestakUI/Locales/Italian.lua b/ShestakUI/Locales/Italian.lua
@@ -257,7 +257,7 @@ L_POPUP_CURRENCY_CAP = "Hai raggiunto il valore massimo di"
 L_WELCOME_LINE_1 = "Benvenuto/a in ShestakUI "
 L_WELCOME_LINE_2_1 = "Digita /cfg per configurare l'interfaccia oppure visita http://shestak.org"
 L_WELCOME_LINE_2_2 = "per maggiori informazioni."
-L_WELCOME_LINE_3 = "Nota: questa versione di ShestakUI (|cff00FFFFOzEdit 1.4.5|r|cffFFFF00) è a cura di Oz di Pozzo dell'Eternità.|r"
+L_WELCOME_LINE_3 = "Nota: questa versione di ShestakUI (|cff00FFFFOzEdit 1.4.6|r|cffFFFF00) è a cura di Oz di Pozzo dell'Eternità.|r"
 
 -- Combat text
 L_COMBATTEXT_KILLING_BLOW = "Colpo di grazia"

diff --git a/ShestakUI/Locales/Korean.lua b/ShestakUI/Locales/Korean.lua
@@ -296,7 +296,7 @@ L_POPUP_CURRENCY_CAP = "You get maximum value of"
 L_WELCOME_LINE_1 = "Welcome to ShestakUI "
 L_WELCOME_LINE_2_1 = "Type /cfg to config interface, or visit http://shestak.org"
 L_WELCOME_LINE_2_2 = "for more informations."
-L_WELCOME_LINE_3 = "참고: ShestakUI (|cff00FFFFOzEdit 1.4.5|r|cffFFFF00)이 버전은 Pozzo dell'Eternità의 오즈 (가) 수정되었습니다.|r" -- Goooooooooogle translated
+L_WELCOME_LINE_3 = "참고: ShestakUI (|cff00FFFFOzEdit 1.4.6|r|cffFFFF00)이 버전은 Pozzo dell'Eternità의 오즈 (가) 수정되었습니다.|r" -- Goooooooooogle translated
 
 -- Combat text
 L_COMBATTEXT_KILLING_BLOW = "Killing Blow"

diff --git a/ShestakUI/Locales/Portuguese.lua b/ShestakUI/Locales/Portuguese.lua
@@ -296,7 +296,7 @@ L_POPUP_CURRENCY_CAP = "You get maximum value of"
 L_WELCOME_LINE_1 = "Welcome to ShestakUI "
 L_WELCOME_LINE_2_1 = "Type /cfg to config interface, or visit http://shestak.org"
 L_WELCOME_LINE_2_2 = "for more informations."
-L_WELCOME_LINE_3 = "Nota: esta versão do ShestakUI (|cff00FFFFOzEdit 1.4.5|r|cffFFFF00) é editado por Oz de Pozzo dell'Eternità.|r" -- Goooooooooogle translated
+L_WELCOME_LINE_3 = "Nota: esta versão do ShestakUI (|cff00FFFFOzEdit 1.4.6|r|cffFFFF00) é editado por Oz de Pozzo dell'Eternità.|r" -- Goooooooooogle translated
 
 -- Combat text
 L_COMBATTEXT_KILLING_BLOW = "Killing Blow"

diff --git a/ShestakUI/Locales/Russian.lua b/ShestakUI/Locales/Russian.lua
@@ -257,7 +257,7 @@ L_POPUP_CURRENCY_CAP = "Вы набрали максимальное колич
 L_WELCOME_LINE_1 = "Добро пожаловать в ShestakUI "
 L_WELCOME_LINE_2_1 = "Введите /cfg для входа в настройки интерфейса, или посетите страницу http://shestak.org"
 L_WELCOME_LINE_2_2 = "для получения дополнительной информации."
-L_WELCOME_LINE_3 = "Примечание: данная версия ShestakUI (|cff00FFFFOzEdit 1.4.5|r|cffFFFF00) изменена Oz из Pozzo dell'Eternità.|r" -- Thanks to Shestak for translation
+L_WELCOME_LINE_3 = "Примечание: данная версия ShestakUI (|cff00FFFFOzEdit 1.4.6|r|cffFFFF00) изменена Oz из Pozzo dell'Eternità.|r" -- Thanks to Shestak for translation
 
 -- Combat text
 L_COMBATTEXT_KILLING_BLOW = "Смерт. Удар"

diff --git a/ShestakUI/Locales/Spanish.lua b/ShestakUI/Locales/Spanish.lua
@@ -257,7 +257,7 @@ L_POPUP_CURRENCY_CAP = "You get maximum value of" -- Needs review
 L_WELCOME_LINE_1 = "Bienvenido a ShestakUI "
 L_WELCOME_LINE_2_1 = "Escribe /cfg para configurar la interfaz, o visita http://shestak.org"
 L_WELCOME_LINE_2_2 = "para más información."
-L_WELCOME_LINE_3 = "Nota: esta versión de ShestakUI (|cff00FFFFOzEdit 1.4.5|r|cffFFFF00) está editado por Oz de Pozzo dell'Eternità.|r" -- Goooooooooogle translated
+L_WELCOME_LINE_3 = "Nota: esta versión de ShestakUI (|cff00FFFFOzEdit 1.4.6|r|cffFFFF00) está editado por Oz de Pozzo dell'Eternità.|r" -- Goooooooooogle translated
 
 -- Combat text
 L_COMBATTEXT_KILLING_BLOW = "Golpe de gracia"

diff --git a/ShestakUI/Locales/Taiwan.lua b/ShestakUI/Locales/Taiwan.lua
@@ -257,7 +257,7 @@ L_POPUP_CURRENCY_CAP = "您擁有的最高級貨幣為"
 L_WELCOME_LINE_1 = "歡迎使用ShestakUI "
 L_WELCOME_LINE_2_1 = "輸入/cfg進行UI設置,或者訪問http://shestak.org"
 L_WELCOME_LINE_2_2 = "獲取更多信息"
-L_WELCOME_LINE_3 = "注： 此版本的ShestakUI (|cff00FFFFOzEdit 1.4.5|r|cffFFFF00)由Pozzo dell'Eternità奧茲編輯。|r" -- Goooooooooogle translated
+L_WELCOME_LINE_3 = "注： 此版本的ShestakUI (|cff00FFFFOzEdit 1.4.6|r|cffFFFF00)由Pozzo dell'Eternità奧茲編輯。|r" -- Goooooooooogle translated
 
 -- Combat text
 L_COMBATTEXT_KILLING_BLOW = "最後一擊"

diff --git a/ShestakUI/Modules/Automation/AchScreens.lua b/ShestakUI/Modules/Automation/AchScreens.lua
@@ -28,7 +28,7 @@ local function TakeScreen(delay, func, ...)
 end
 
 local function OnEvent(...)
-	TakeScreen(1, Screenshot)
+	TakeScreen(1, TakeScreenshot)
 end
 
 local frame = CreateFrame("Frame")

diff --git a/ShestakUI/Modules/Misc/SlotItemLevel.lua b/ShestakUI/Modules/Misc/SlotItemLevel.lua
@@ -17,7 +17,8 @@ local upgrades = {
 	["455"] = 8, ["457"] = 8, ["459"] = 4, ["460"] = 8, ["461"] = 12, ["462"] = 16,
 	["466"] = 4, ["467"] = 8, ["469"] = 4, ["470"] = 8, ["471"] = 12, ["472"] = 16,
 	["477"] = 4, ["478"] = 8, ["480"] = 8, ["492"] = 4, ["493"] = 8, ["495"] = 4,
-	["496"] = 8, ["497"] = 12, ["498"] = 16
+	["496"] = 8, ["497"] = 12, ["498"] = 16, ["504"] = 12, ["505"] = 16, ["506"] = 20,
+	["507"] = 24
 }
 
 local function CreateButtonsText(frame)

diff --git a/ShestakUI/Modules/Tooltip/ItemLevel.lua b/ShestakUI/Modules/Tooltip/ItemLevel.lua
@@ -14,7 +14,8 @@ local upgrades = {
 	["455"] = 8, ["457"] = 8, ["459"] = 4, ["460"] = 8, ["461"] = 12, ["462"] = 16,
 	["466"] = 4, ["467"] = 8, ["469"] = 4, ["470"] = 8, ["471"] = 12, ["472"] = 16,
 	["477"] = 4, ["478"] = 8, ["480"] = 8, ["492"] = 4, ["493"] = 8, ["495"] = 4,
-	["496"] = 8, ["497"] = 12, ["498"] = 16
+	["496"] = 8, ["497"] = 12, ["498"] = 16, ["504"] = 12, ["505"] = 16, ["506"] = 20,
+	["507"] = 24
 }
 -- Output prefix
 local PREFIX = STAT_FORMAT:format(STAT_AVERAGE_ITEM_LEVEL).."|Heqppditmlvl|h |h"..HIGHLIGHT_FONT_COLOR_CODE

diff --git a/ShestakUI/ShestakUI.toc b/ShestakUI/ShestakUI.toc
@@ -1,8 +1,8 @@
 ## Interface: 50400
 ## Title: ShestakUI
-## Notes: A total UI overhaul for World of Warcraft. Edit 1.4.5 by Oz of Pozzo dell'Eternità
+## Notes: A total UI overhaul for World of Warcraft. Edit 1.4.6 by Oz of Pozzo dell'Eternità
 ## Author: Shestak
-## Version: 4.58
+## Version: 4.59
 ## Credits: AcidWeb, Aezay, Affli, Ailae, Allez, ALZA, Ammo, Astromech, Beoko, Bitbyte, Blamdarot, Bozo, Caellian, Califpornia, Camealion, Chiril, CrusaderHeimdall, Cybey, Dawn, Don Kaban, Dridzt, Duffed, Durcyn, Eclipse, Egingell, Elv22, Evilpaul, Evl, Favorit, Fernir, Foof, Freebaser, g0st, gi2k15, Gorlasch, Gsuz, Haleth, Haste, Hoochie, Hungtar, HyPeRnIcS, Hydra, Ildyria, iSpawnAtHome, Jaslm, Karl_w_w, Karudon, Katae, Kemayo, Killakhan, Kraftman, Kunda, Leatrix, m2jest1c, Magdain, Meurtcriss, Monolit, MrRuben5, Myrilandell of Lothar, Nathanyel, Nefarion, Nightcracker, Nils Ruesch, p3lim, Partha, Phanx, pvtschlag, Rahanprout, Renstrom, RustamIrzaev, Safturento, Sara.Festung, SDPhantom, Sildor, Silverwind, SinaC, Slakah, Soeters, Starlon, Suicidal Katt, Syzgyn, Tekkub, Telroth, Thalyra, Thizzelle, Tia Lynn, Tohveli, Tukz, Tuller, Veev, Villiv, Vladinator, Wetxius, Woffle of Dark Iron, Wrug, Xuerian, Yleaf, Zork. ShestakUI_OzEdit additional credits: ivancr72, rwk, Sinaris, tonyis3l33t
 ## Translation: Aelb, Alwa, Baine, Chubidu, Cranan, eXecrate, F5Hellbound, Ianchan, Leg883, Mania, Nanjiqq, Oz, Puree, Sakaras, Seal, Sinaris, Spacedragon, Tat2dawn, Tibles, Vienchen, Wetxius
 ## Thanks: Akimba, Antthemage, Crunching, Dandruff, DesFolk, Elfrey, Ente, Erratic, Falchior, Gromcha, Halogen, Homicidal Retribution, ILF7, Illusion, Ipton, k07n, Kazarl, Leots, m2jest1c, MoLLIa, Nefrit, Noobolov, Obakol, Oz, PterOs, Sart, Scorpions, Sitatunga, Sw2rT1, Wetxius, Yakodzuna, UI Users and Russian Community. ShestakUI_OzEdit additional thanks: anj, Baine, Italian Community, ivancr72, Nagiko, Ombre Guild of Pozzo dell'Eternità, rwk, Sinaris, tonyis3l33t

diff --git a/ShestakUI_Config/ShestakUI_Config.lua b/ShestakUI_Config/ShestakUI_Config.lua
@@ -692,7 +692,7 @@ function CreateUIConfig()
 
 	local TitleBoxVerText = TitleBoxVer:CreateFontString("UIConfigTitleVer", "OVERLAY", "GameFontNormal")
 	TitleBoxVerText:SetPoint("CENTER")
-	TitleBoxVerText:SetText("ShestakUI "..T.version.." (OzEdit 1.4.5)")
+	TitleBoxVerText:SetText("ShestakUI "..T.version.." (OzEdit 1.4.6)")
 
 	-- Main Frame Title
 	local TitleBox = CreateFrame("Frame", "TitleBox", UIConfigMain)

diff --git a/ShestakUI_Config/ShestakUI_Config.toc b/ShestakUI_Config/ShestakUI_Config.toc
@@ -1,8 +1,8 @@
 ## Interface: 50400
 ## Title: ShestakUI Config
-## Notes: In-game configuration for ShestakUI. Edit 1.4.5 by Oz of Pozzo dell'Eternità
+## Notes: In-game configuration for ShestakUI. Edit 1.4.6 by Oz of Pozzo dell'Eternità
 ## Author: Tohveli
-## Version: 4.58
+## Version: 4.59
 ## Credits: Elv22, Fernir, Tukz
 ## RequiredDeps: ShestakUI
 ## SavedVariables: GUIConfigAll, GUIConfigSettings

diff --git a/ShestakUI_Filger/ShestakUI_Filger.lua b/ShestakUI_Filger/ShestakUI_Filger.lua
@@ -338,7 +338,7 @@ function Filger:OnEvent(event, unit)
 						start, duration = GetInventoryItemCooldown("player", data.slotID)
 					end
 				end
-				if name and (duration or 0) > 1.5 then
+				if name and (T.class ~= "DEATHKNIGHT" and (duration or 0) > 1.5) or (duration or 0) > 10 then
 					found = true
 				end
 			elseif data.filter == "ICD" and (not data.spec or data.spec == ptt) then

diff --git a/ShestakUI_Filger/ShestakUI_Filger.toc b/ShestakUI_Filger/ShestakUI_Filger.toc
@@ -1,8 +1,8 @@
 ## Interface: 50400
 ## Title: ShestakUI Filger
-## Notes: Class timers for ShestakUI. Edit 1.4.5 by Oz of Pozzo dell'Eternità
+## Notes: Class timers for ShestakUI. Edit 1.4.6 by Oz of Pozzo dell'Eternità
 ## Author: Nils Ruesch
-## Version: 4.58
+## Version: 4.59
 ## Credits: Affli, Ildyria, SinaC
 ## Thanks: Erratic, Wetxius
 ## RequiredDeps: ShestakUI