From bd5343e8f91b2db6d122d1af91c915ebe0941301 Mon Sep 17 00:00:00 2001 From: Alar of Daggerspine Date: Fri, 26 Jun 2015 14:40:07 +0200 Subject: [PATCH] Signed-off-by: Alar of Daggerspine --- CHANGELOG.txt | 4 +++- GarrisonCommander.toc | 1 + Init.lua | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 54f2f39..0d4920a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,8 @@ *GarrisonCommander helps you when choosing the right follower for the right mission* -* *2.6.0* +* *2.6.2* +Fixed all raised issues both from Curse comments and from CurseForge tickets +* *2.6.0* Feature: priorities and allowed items are now the in the same list. Drag items around to change priorities Feature: Should now try more aggressively to maximise outcome of gold,oil and resources missions Feature: In follower page, a list of trait is shown in the bottom. It works like the one for abilities diff --git a/GarrisonCommander.toc b/GarrisonCommander.toc index 438aa9e..81a01a5 100644 --- a/GarrisonCommander.toc +++ b/GarrisonCommander.toc @@ -10,6 +10,7 @@ ## eMail: alar@aspide.it ## URL: http://wow.aspide.it ## OptionalDeps: LibInit +## Dependencies: Blizzard_GarrisonUI ## DefaultState: Enabled ## LoadOnDemand: 1 ## LoadWith: Blizzard_GarrisonUI diff --git a/Init.lua b/Init.lua index 1a7a094..f4d53cb 100644 --- a/Init.lua +++ b/Init.lua @@ -30,6 +30,14 @@ ns.C=ns.addon:GetColorTable() ns.L=ns.addon:GetLocale() ns.G=C_Garrison ns.GMF=_G.GarrisonMissionFrame +if not ns.GMF then + print("GarrisonCommander is being loaded before Blizzard_GarrisonUI is available") + print(GetTime()) + LoadAddOn("Blizzard_GarrisonUI") + print(GetTime()) + ns.GMF=_G.GarrisonMissionFrame +end +if not ns.GMF then error("GarrisonCommander is being loaded before Blizzard_GarrisonUI is available") end ns.GMFMissions=_G.GarrisonMissionFrameMissions ns.GSF=_G.GarrisonShipFrame _G.GARRISON_FOLLOWER_MAX_ITEM_LEVEL = _G.GARRISON_FOLLOWER_MAX_ITEM_LEVEL or 675 -- 1.7.9.5