From 2a56a6a524ef8bd5300c1e154d025c5450c9a5ed Mon Sep 17 00:00:00 2001 From: ackis Date: Mon, 16 Feb 2009 18:01:21 +0000 Subject: [PATCH] Fix a merge issue. Hi Pneumatus. --- ARLFrame.lua | 12 ++++++------ RecipeDB/ARL-Vendor.lua | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ARLFrame.lua b/ARLFrame.lua index 114f9bd..77b1f21 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -6,10 +6,10 @@ ARLFrame.lua Frame functions for all of AckisRecipeList -File date: 2009-02-06T20:02:19Z -File revision: 1480 -Project revision: 1481 -Project version: r1481 +File date: @file-date-iso@ +File revision: @file-revision@ +Project revision: @project-revision@ +Project version: @project-version@ **************************************************************************************** @@ -1012,12 +1012,12 @@ local function RecipeList_Update() elseif (playerData.excluded_recipes_unknown ~= 0) then StaticPopup_Show("ARL_ALLEXCLUDED") else + addon:Print(L["NO_DISPLAY"]) addon:Print("DEBUG: recipes_total: " .. playerData.recipes_total) addon:Print("DEBUG: recipes_known: " .. playerData.recipes_known) addon:Print("DEBUG: recipes_total_filtered: " .. playerData.recipes_total_filtered) addon:Print("DEBUG: recipes_known_filtered: " .. playerData.recipes_known_filtered) - addon:Print("DEBUG: excluded_recipes_unknown: " .. playerData.excluded_recipes_unknown) - addon:Print(L["NO_DISPLAY"]) + addon:Print("DEBUG: excluded_recipes_unknown: " .. playerData.excluded_recipes_unknown) end end diff --git a/RecipeDB/ARL-Vendor.lua b/RecipeDB/ARL-Vendor.lua index ef054ea..80c5dd1 100644 --- a/RecipeDB/ARL-Vendor.lua +++ b/RecipeDB/ARL-Vendor.lua @@ -13,10 +13,10 @@ Auto-generated using ARLDataminer.rb ************************************************************************ -File date: 2009-02-03T18:21:32Z -File revision: 1460 -Project revision: 1493 -Project version: r1493 +File date: @file-date-iso@ +File revision: @file-revision@ +Project revision: @project-revision@ +Project version: @project-version@ ************************************************************************ -- 1.7.9.5