diff --git a/Jamba-AdvancedLoot/Jamba-AdvancedLoot.toc b/Jamba-AdvancedLoot/Jamba-AdvancedLoot.toc index 772423a..9db86ae 100644 --- a/Jamba-AdvancedLoot/Jamba-AdvancedLoot.toc +++ b/Jamba-AdvancedLoot/Jamba-AdvancedLoot.toc @@ -2,11 +2,11 @@ ## Title: Jamba-AdvancedLoot ## Notes: Jamba-AdvancedLoot ## Author: Max Schilling -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 + ## Dependencies: Jamba ## SavedVariables: JambaAdvancedLootProfileDB ## LoadOnDemand: 1 + Locales\Locales.xml JambaAdvancedLoot.lua diff --git a/Jamba-DisplayTeam/Jamba-DisplayTeam.toc b/Jamba-DisplayTeam/Jamba-DisplayTeam.toc index 7d50633..d4b63de 100644 --- a/Jamba-DisplayTeam/Jamba-DisplayTeam.toc +++ b/Jamba-DisplayTeam/Jamba-DisplayTeam.toc @@ -2,11 +2,10 @@ ## Title: Jamba-DisplayTeam ## Notes: Jamba-DisplayTeam ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaDisplayTeamProfileDB ## LoadOnDemand: 1 + Locales\Locales.xml JambaDisplayTeam.lua diff --git a/Jamba-FTL/Jamba-FTL.toc b/Jamba-FTL/Jamba-FTL.toc index 9947d3e..801ee22 100644 --- a/Jamba-FTL/Jamba-FTL.toc +++ b/Jamba-FTL/Jamba-FTL.toc @@ -2,11 +2,10 @@ ## Title: JambaFTL ## Notes: JambaFTL ## Author: olipcs (although most of the code is originaly from Jafula) (any changes added to support 4.0.5 from ebony!) -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaFTLProfileDB ## LoadOnDemand: 1 + Locales\Locales.xml JambaFTL.lua \ No newline at end of file diff --git a/Jamba-Follow/Jamba-Follow.toc b/Jamba-Follow/Jamba-Follow.toc index d3a6f35..1a8d0db 100644 --- a/Jamba-Follow/Jamba-Follow.toc +++ b/Jamba-Follow/Jamba-Follow.toc @@ -2,12 +2,11 @@ ## Title: JambaFollow ## Notes: JambaFollow ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaFollowProfileDB ## LoadOnDemand: 1 + Locales\Locales.xml JambaFollow.lua diff --git a/Jamba-ItemUse/Jamba-ItemUse.toc b/Jamba-ItemUse/Jamba-ItemUse.toc index 1257889..8494f57 100644 --- a/Jamba-ItemUse/Jamba-ItemUse.toc +++ b/Jamba-ItemUse/Jamba-ItemUse.toc @@ -2,12 +2,11 @@ ## Title: JambaItemUse ## Notes: JambaItemUse ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaItemUseProfileDB ## LoadOnDemand: 1 + Locales\Locales.xml JambaItemUse.lua diff --git a/Jamba-Macro/Jamba-Macro.toc b/Jamba-Macro/Jamba-Macro.toc index ce982cd..3455a4c 100644 --- a/Jamba-Macro/Jamba-Macro.toc +++ b/Jamba-Macro/Jamba-Macro.toc @@ -2,9 +2,7 @@ ## Title: Jamba-Macro ## Notes: Jamba-Macro ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaMacroProfileDB ## LoadOnDemand: 1 diff --git a/Jamba-Macro/JambaMacro.lua b/Jamba-Macro/JambaMacro.lua index 035a8cd..b08fc94 100644 --- a/Jamba-Macro/JambaMacro.lua +++ b/Jamba-Macro/JambaMacro.lua @@ -1382,7 +1382,9 @@ function AJM:SubstituteVariablesAndTagsForValues( originalMacroText, variables ) for index, tag in JambaApi.AllTagsListIterator() do local characterName = JambaApi.GetCharacterWithTag( tag ) if characterName ~= "" then - macroText = macroText:gsub( "#"..tag.."#", characterName ) + -- 4.0 tag fix ebony realm name to add if from same server. + --macroText = macroText:gsub( "#"..tag.."#", characterName ) + macroText = macroText:gsub( "#"..tag.."#", ( Ambiguate( characterName, "none" ) ) ) end end -- Substitute variables. diff --git a/Jamba-Proc/Jamba-Proc.toc b/Jamba-Proc/Jamba-Proc.toc index 517e530..286e5de 100644 --- a/Jamba-Proc/Jamba-Proc.toc +++ b/Jamba-Proc/Jamba-Proc.toc @@ -2,9 +2,7 @@ ## Title: JambaProc ## Notes: JambaProc ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaProcProfileDBv2 ## LoadOnDemand: 1 diff --git a/Jamba-Purchase/Jamba-Purchase.toc b/Jamba-Purchase/Jamba-Purchase.toc index 92111db..6456007 100644 --- a/Jamba-Purchase/Jamba-Purchase.toc +++ b/Jamba-Purchase/Jamba-Purchase.toc @@ -2,9 +2,7 @@ ## Title: Jamba-Purchase ## Notes: Jamba-Purchase ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaPurchaseProfileDB ## LoadOnDemand: 1 diff --git a/Jamba-Quest/Jamba-Quest.toc b/Jamba-Quest/Jamba-Quest.toc index 55527a0..9bcfedc 100644 --- a/Jamba-Quest/Jamba-Quest.toc +++ b/Jamba-Quest/Jamba-Quest.toc @@ -2,9 +2,7 @@ ## Title: JambaQuest ## Notes: JambaQuest ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaQuestProfileDB ## LoadOnDemand: 1 diff --git a/Jamba-QuestWatcher/Jamba-QuestWatcher.toc b/Jamba-QuestWatcher/Jamba-QuestWatcher.toc index 403d267..14436ea 100644 --- a/Jamba-QuestWatcher/Jamba-QuestWatcher.toc +++ b/Jamba-QuestWatcher/Jamba-QuestWatcher.toc @@ -2,9 +2,7 @@ ## Title: JambaQuestWatcher ## Notes: JambaQuestWatcher ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaQuestWatcherProfileDB ## LoadOnDemand: 1 diff --git a/Jamba-Sell/Jamba-Sell.toc b/Jamba-Sell/Jamba-Sell.toc index 98de984..e76e9c5 100644 --- a/Jamba-Sell/Jamba-Sell.toc +++ b/Jamba-Sell/Jamba-Sell.toc @@ -2,9 +2,7 @@ ## Title: JambaSell ## Notes: JambaSell ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaSellProfileDB ## LoadOnDemand: 1 diff --git a/Jamba-Talk/Jamba-Talk.toc b/Jamba-Talk/Jamba-Talk.toc index c0e700b..2b65345 100644 --- a/Jamba-Talk/Jamba-Talk.toc +++ b/Jamba-Talk/Jamba-Talk.toc @@ -2,9 +2,7 @@ ## Title: JambaTalk ## Notes: JambaTalk ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaTalkProfileDB ## LoadOnDemand: 1 diff --git a/Jamba-Target/Jamba-Target.toc b/Jamba-Target/Jamba-Target.toc index 8ad2c7b..b483447 100644 --- a/Jamba-Target/Jamba-Target.toc +++ b/Jamba-Target/Jamba-Target.toc @@ -2,9 +2,7 @@ ## Title: JambaTarget ## Notes: JambaTarget ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaTargetProfileDB ## LoadOnDemand: 1 diff --git a/Jamba-Taxi/Jamba-Taxi.toc b/Jamba-Taxi/Jamba-Taxi.toc index 57081c9..48b30e4 100644 --- a/Jamba-Taxi/Jamba-Taxi.toc +++ b/Jamba-Taxi/Jamba-Taxi.toc @@ -2,9 +2,8 @@ ## Title: Jamba-Taxi ## Notes: Jamba-Taxi ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 + ## Dependencies: Jamba ## SavedVariables: JambaTaxiProfileDB ## LoadOnDemand: 1 diff --git a/Jamba-Toon/Jamba-Toon.toc b/Jamba-Toon/Jamba-Toon.toc index 4756965..9b40b29 100644 --- a/Jamba-Toon/Jamba-Toon.toc +++ b/Jamba-Toon/Jamba-Toon.toc @@ -2,9 +2,7 @@ ## Title: JambaToon ## Notes: JambaToon ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaToonProfileDB ## LoadOnDemand: 1 diff --git a/Jamba-Trade/Jamba-Trade.toc b/Jamba-Trade/Jamba-Trade.toc index 1d683a8..7d17337 100644 --- a/Jamba-Trade/Jamba-Trade.toc +++ b/Jamba-Trade/Jamba-Trade.toc @@ -2,9 +2,7 @@ ## Title: JambaTrade ## Notes: JambaTrade ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 -## X-Category: Interface Enhancements -## X-Child-Of: Jamba +## Version: 4.2.2 ## Dependencies: Jamba ## SavedVariables: JambaTradeProfileDB ## LoadOnDemand: 1 diff --git a/Jamba/CHANGELOG.txt b/Jamba/CHANGELOG.txt index 243549b..889c175 100644 --- a/Jamba/CHANGELOG.txt +++ b/Jamba/CHANGELOG.txt @@ -1,4 +1,18 @@ -Jamba Version: 4.2.1 +Jamba Version: 4.2.2 +WoW Game Version: 6.2.4 +Release Date: 21/1/2016 +Modules: AdvancedLoot, Core, Display-Team, Follow, FTL, ItemUse, Macro, Proc, Purchase, Quest, Sell, Talk, Target, Taxi, Toon, Trade + +- Jamba-team + Fixed Battle.net changes for Patch 6.2.4 + +* Jamba-Macro + - Tag Sould nolonger set the realm name if playing from the same realm. thanks to Sonof from dual-boxing for the bug report. + + + +----------------------- +Jamba Version: 4.2.2 WoW Game Version: 6.2.3 Release Date: 21/1/2016 Modules: AdvancedLoot, Core, Display-Team, Follow, FTL, ItemUse, Macro, Proc, Purchase, Quest, Sell, Talk, Target, Taxi, Toon, Trade diff --git a/Jamba/Jamba.toc b/Jamba/Jamba.toc index f972f3b..b29ac68 100644 --- a/Jamba/Jamba.toc +++ b/Jamba/Jamba.toc @@ -2,7 +2,7 @@ ## Title: Jamba ## Notes: Jamba ## Author: Ebony, Former Author: Jafula -## Version: 4.2.1 +## Version: 4.2.2 ## SavedVariables: JambaCoreProfileDB, JambaCommunicationsProfileDB, JambaTeamProfileDB, JambaTagProfileDB, JambaMessageProfileDB JambaEmbeds.xml JambaUtilities.lua diff --git a/Jamba/JambaTeam.lua b/Jamba/JambaTeam.lua index 6839f20..9321527 100644 --- a/Jamba/JambaTeam.lua +++ b/Jamba/JambaTeam.lua @@ -1210,17 +1210,18 @@ function AJM:PARTY_LEADER_CHANGED( event, ... ) isAFriend = true end end - -- For BattleNet/RealD Friends for bnIndex = 1, BNGetNumFriends() do - local _, _, _, _, name, toonid = BNGetFriendInfo( bnIndex ) - for toonIndex = 1, BNGetNumFriendToons( bnIndex ) do - local _, friendName = BNGetFriendToonInfo( bnIndex, toonIndex ); - friendName = friendName:match("(.+)%-.+") or friendName - if character == friendName then - isAFriend = true + --local _, _, _, _, name, toonid = BNGetFriendInfo( bnIndex ) + for toonIndex = 1, BNGetNumFriendGameAccounts( bnIndex ) do + local _, character, client, realmName = BNGetFriendGameAccountInfo( bnIndex, toonIndex ) + if client == "WoW" then + friendName = friendName:match("(.+)%-.+") or friendName + if character == friendName or character.."-"..realmName then + isAFriend = true + end end end - end + end if isAFriend == false then haveStranger = true end @@ -1304,17 +1305,21 @@ function AJM:PARTY_INVITE_REQUEST( event, inviter, ... ) if AJM.db.inviteAcceptBNFriends and BNFeaturesEnabledAndConnected() == true then -- Iterate each friend; searching for the inviter in the friends list. for bnIndex = 1, BNGetNumFriends() do - local _, _, _, _, name, toonid = BNGetFriendInfo( bnIndex ) - for toonIndex = 1, BNGetNumFriendToons( bnIndex ) do - local _, toonName = BNGetFriendToonInfo( bnIndex, toonIndex ); - inviter = inviter:match("(.+)%-.+") or inviter - if toonName == inviter then - acceptInvite = true - break + --local _, _, _, _, name, toonid = BNGetFriendGameAccountInfo( bnIndex ) + for toonIndex = 1, BNGetNumFriendGameAccounts( bnIndex ) do + local _, toonName, client, realmName = BNGetFriendGameAccountInfo( bnIndex, toonIndex ) + --AJM:Print("Test", inviter, toonName, realmName, client ) + if client == "WoW" then + --inviter = inviter:match("(.+)%-.+") or inviter + --AJM:Print("True", toonName.."-"..realmName ) + if toonName == inviter or toonName.."-"..realmName == inviter then + acceptInvite = true + break + end end end end - end + end -- Accept and invite from guild members? if AJM.db.inviteAcceptGuild == true then if UnitIsInMyGuild( inviter ) then diff --git a/Jamba/Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets.toc b/Jamba/Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets.toc index 87824a8..6b35492 100644 --- a/Jamba/Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets.toc +++ b/Jamba/Libs/AceGUI-3.0-SharedMediaWidgets/AceGUI-3.0-SharedMediaWidgets.toc @@ -1,5 +1,6 @@ ## Interface: 50300 + ## Title: Lib: AceGUI-3.0-SharedMediaWidgets ## Notes: Enables AceGUI-3.0 widgets for the 5 basic SharedMedia-3.0 types ## Author: Yssaril diff --git a/Jamba/Libs/LibBabble-Class-3.0/LibBabble-Class-3.0.toc b/Jamba/Libs/LibBabble-Class-3.0/LibBabble-Class-3.0.toc index 00026f5..e2e71ed 100644 --- a/Jamba/Libs/LibBabble-Class-3.0/LibBabble-Class-3.0.toc +++ b/Jamba/Libs/LibBabble-Class-3.0/LibBabble-Class-3.0.toc @@ -7,6 +7,7 @@ ## Notes-esES: Una biblioteca para ayudar con las localizaciones. ## Author: ckknight + LibStub\LibStub.lua lib.xml diff --git a/Jamba/Libs/LibBabble-Inventory-3.0/LibBabble-Inventory-3.0.toc b/Jamba/Libs/LibBabble-Inventory-3.0/LibBabble-Inventory-3.0.toc index 2f4ecbd..25173c1 100644 --- a/Jamba/Libs/LibBabble-Inventory-3.0/LibBabble-Inventory-3.0.toc +++ b/Jamba/Libs/LibBabble-Inventory-3.0/LibBabble-Inventory-3.0.toc @@ -5,5 +5,6 @@ ## Notes-esES: Una libreria para ayudar con la traduccion de tipos y subtipos de objetos. ## Author: ckknight + LibStub\LibStub.lua lib.xml diff --git a/Jamba/Libs/LibBabble-Inventory-3.0/LibStub/LibStub.toc b/Jamba/Libs/LibBabble-Inventory-3.0/LibStub/LibStub.toc index 0985aab..3d1f018 100644 --- a/Jamba/Libs/LibBabble-Inventory-3.0/LibStub/LibStub.toc +++ b/Jamba/Libs/LibBabble-Inventory-3.0/LibStub/LibStub.toc @@ -2,5 +2,4 @@ ## Title: Lib: LibStub ## Notes: Universal Library Stub ## Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel - LibStub.lua diff --git a/Jamba/Libs/LibButtonGlow-1.0/LibButtonGlow-1.0.toc b/Jamba/Libs/LibButtonGlow-1.0/LibButtonGlow-1.0.toc index 013a034..d79d8c8 100644 --- a/Jamba/Libs/LibButtonGlow-1.0/LibButtonGlow-1.0.toc +++ b/Jamba/Libs/LibButtonGlow-1.0/LibButtonGlow-1.0.toc @@ -8,10 +8,6 @@ ## X-Website: http://www.wowace.com/addons/libbuttonglow-1-0/ ## Version: 1.2.1 ## OptionalDeps: Masque -## X-Curse-Packaged-Version: 1.2.1 -## X-Curse-Project-Name: LibButtonGlow-1.0 -## X-Curse-Project-ID: libbuttonglow-1-0 -## X-Curse-Repository-ID: wow/libbuttonglow-1-0/mainline LibStub\LibStub.lua diff --git a/Jamba/Libs/LibButtonGlow-1.0/LibStub/LibStub.toc b/Jamba/Libs/LibButtonGlow-1.0/LibStub/LibStub.toc index 17cf732..5cb49fb 100644 --- a/Jamba/Libs/LibButtonGlow-1.0/LibStub/LibStub.toc +++ b/Jamba/Libs/LibButtonGlow-1.0/LibStub/LibStub.toc @@ -8,6 +8,5 @@ ## X-Curse-Packaged-Version: 1.0 ## X-Curse-Project-Name: LibStub ## X-Curse-Project-ID: libstub -## X-Curse-Repository-ID: wow/libstub/mainline LibStub.lua diff --git a/Jamba/Libs/LibGratuity-3.0/LibGratuity-3.0.toc b/Jamba/Libs/LibGratuity-3.0/LibGratuity-3.0.toc index 2087db7..41d6460 100644 --- a/Jamba/Libs/LibGratuity-3.0/LibGratuity-3.0.toc +++ b/Jamba/Libs/LibGratuity-3.0/LibGratuity-3.0.toc @@ -5,6 +5,5 @@ ## Author: Tekkub Stoutwrithe ## Version: r$Revision: 41183 $ ## LastUpdate: $Date: 2007-06-21 15:59:31 -1000 (Thu, 21 Jun 2007) $ - LibStub\LibStub.lua lib.xml