clenup

His Dad [03-16-15 - 04:20]
clenup
Filename
lua/GRID.lua
lua/ResearchTimer.lua
diff --git a/lua/GRID.lua b/lua/GRID.lua
index d1e97ec..97c1e9b 100644
--- a/lua/GRID.lua
+++ b/lua/GRID.lua
@@ -221,10 +221,9 @@ function RT.Char_sort()    -- Produce a sorted list for display
   RT.CharsInOrder = {}
   for k, _ in pairs(RT.SV.data.Craft) do
 			table.insert(RT.CharsInOrder,k)
-	end
-  if RT.SortFunction ~= nil then
-    table.sort(RT.CharsInOrder, function (a,b) return RT.SV.data.Craft[a].shortest < RT.SV.data.Craft[b].shortest end)
   end
+
+  table.sort(RT.CharsInOrder, function (a,b) return RT.SV.data.Craft[a].shortest < RT.SV.data.Craft[b].shortest end)
 end

 -- move characters in grid
diff --git a/lua/ResearchTimer.lua b/lua/ResearchTimer.lua
index 5eb9800..1c713ce 100644
--- a/lua/ResearchTimer.lua
+++ b/lua/ResearchTimer.lua
@@ -53,9 +53,10 @@ function RT.Info_Research(craft_type,craft_id)
 			RT.SV.data.Craft[RT.playername][craft_id].doing[Simu_craft]["EndTimeStamp"] = GetTimeStamp() + timeRemaining
 			RT.SV.data.Craft[RT.playername][craft_id].doing[Simu_craft]["Item_name"] = string.sub(item_name, 1, 18)
 			RT.SV.data.Craft[RT.playername][craft_id].doing[Simu_craft]["Item_icon"] = item_icon
-			RT.SV.data.Craft[RT.playername][craft_id].doing[Simu_craft]["Trait_name"] = trait_name
+			RT.SV.data.Craft[RT.playername][craft_id].doing[Simu_craft]["Trait_stone"] = trait_name
 			RT.SV.data.Craft[RT.playername][craft_id].doing[Simu_craft]["Trait_icon"] = trait_icon
 			RT.SV.data.Craft[RT.playername][craft_id].doing[Simu_craft]["Trait_description"] = trait_description
+			RT.SV.data.Craft[RT.playername][craft_id].doing[Simu_craft]["Trait_name"]= GetString("SI_ITEMTRAITTYPE",traitType)
 			end
 		end
 	end
@@ -179,7 +180,7 @@ function RT.Converthms(timesec)

   return humanDuration
 end
-
+-- local tFormatted = FormatTimeSeconds(tRemaining, TIME_FORMAT_STYLE_DESCRIPTIVE_SHORT, TIME_FORMAT_PRECISION_SECONDS, TIME_FORMAT_DIRECTION_DESCENDING)

 function RT.CommandText_setup()
 		RT.toggleGRID()