# HG changeset patch
# User Nenue
# Date 1496015726 14400
# Node ID 9f664a0ef8a828b5ff2b7d490c1842bedda1bc2d
# Parent  a3800989f5154edc58aba22059039f2343b73516# Parent  4d1520186ea45f3d3ad9060873d34acb07f96930
Merge

diff -r a3800989f515 -r 9f664a0ef8a8 ClassPlan.lua
--- a/ClassPlan.lua	Sun May 28 19:53:11 2017 -0400
+++ b/ClassPlan.lua	Sun May 28 19:55:26 2017 -0400
@@ -55,6 +55,7 @@
   Queued = {},
   Timers = {},
   ReportChunks = {},
+  maxItems = 12
 }
 ClassPlanHandlerBase = {
   numBlocks = 0,
diff -r a3800989f515 -r 9f664a0ef8a8 ClassPlanShipments.lua
--- a/ClassPlanShipments.lua	Sun May 28 19:53:11 2017 -0400
+++ b/ClassPlanShipments.lua	Sun May 28 19:55:26 2017 -0400
@@ -107,12 +107,13 @@
       AddShipmentInfo(AK_NOTES, name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString)
     end
 
-    local talentTrees = CG_GetTalentTrees(garrisonType, select(3, UnitClass("player")));
+    local talentTrees = C_Garrison.GetTalentTreeIDsByClassID(garrisonType, select(3, UnitClass("player")));
     -- this is a talent that has completed, but has not been seen in the talent UI yet.
     local completeTalentID = CG_GetCompleteTalent(garrisonType);
-    --print('Talents:')
+    print('Talents:')
     if (talentTrees) then
-      for treeIndex, tree in ipairs(talentTrees) do
+      for treeIndex, treeID in ipairs(talentTrees) do
+        local _, _, tree = C_Garrison.GetTalentTreeInfoForID(garrisonType, treeID);
         for talentIndex, talent in ipairs(tree) do
           local showTalent = false;
           if (talent.isBeingResearched) or (talent.id == completeTalentID) then