← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~widelands-dev/widelands/bug-1292799 into lp:widelands

 

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1292799 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1292799 in widelands: "Rename folders of wares/workers to fit new names"
  https://bugs.launchpad.net/widelands/+bug/1292799

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1292799/+merge/211190

Renamed folders/conf file items of wares/workers to fit new names
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1292799/+merge/211190
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1292799 into lp:widelands.
=== modified file 'campaigns/atl01.wmf/allowed_worker_types'
--- campaigns/atl01.wmf/allowed_worker_types	2010-05-10 16:51:27 +0000
+++ campaigns/atl01.wmf/allowed_worker_types	2014-03-16 06:39:32 +0000
@@ -12,7 +12,7 @@
 builder="true"
 burner="true"
 farmer="true"
-ferner="true"
+gardener="true"
 fisher="true"
 gamekeeper="true"
 geologist="true"

=== modified file 'campaigns/atl01.wmf/scripting/init.lua'
--- campaigns/atl01.wmf/scripting/init.lua	2012-05-25 19:23:11 +0000
+++ campaigns/atl01.wmf/scripting/init.lua	2014-03-16 06:39:32 +0000
@@ -169,7 +169,7 @@
    local o = add_obj(obj_make_heavy_industry_and_mining)
    while not check_for_buildings(p1, {
       coalmine = 1, ironmine = 1, goldmine = 1, crystalmine = 1,
-      smelting_works = 1, weaponsmithy = 1, armoursmithy = 1,
+      smelting_works = 1, weaponsmithy = 1, armorsmithy = 1,
       toolsmithy = 1,
    }) do sleep(3478) end
    o.done = true

=== modified file 'campaigns/emp01.wmf/scripting/starting_conditions.lua'
--- campaigns/emp01.wmf/scripting/starting_conditions.lua	2010-09-22 17:50:53 +0000
+++ campaigns/emp01.wmf/scripting/starting_conditions.lua	2014-03-16 06:39:32 +0000
@@ -8,8 +8,8 @@
 hq:set_wares{
    helm = 4,
    wood_lance = 5,
-   axe = 6,
-   bakingtray = 2,
+   ax = 6,
+   bread_paddle = 2,
    basket = 1,
    bread = 8,
    cloth = 5,
@@ -35,7 +35,7 @@
    scythe = 5,
    shovel = 6,
    stone = 40,
-   trunk = 30,
+   log = 30,
    water = 12,
    wheat = 4,
    wine = 8,
@@ -43,7 +43,7 @@
    wool = 2,
 }
 hq:set_workers{
-   armoursmith = 1,
+   armorsmith = 1,
    brewer = 1,
    builder = 10,
    burner = 1,

=== modified file 'campaigns/emp02.wmf/scripting/mission_thread.lua'
--- campaigns/emp02.wmf/scripting/mission_thread.lua	2011-05-10 13:32:28 +0000
+++ campaigns/emp02.wmf/scripting/mission_thread.lua	2014-03-16 06:39:32 +0000
@@ -126,7 +126,7 @@
       "deep_oremine",
       "stonemasons_house",
       "toolsmithy",
-      "armoursmithy",
+      "armorsmithy",
       "weaponsmithy",
       "smelting_works",
       "burners_house",
@@ -142,14 +142,14 @@
          "deep_oremine",
          "stonemasons_house",
          "toolsmithy",
-         "armoursmithy",
+         "armorsmithy",
          "weaponsmithy",
          "smelting_works",
          "burners_house",
       }
       if #rv.stonemasons_house > 0 and
          #rv.toolsmithy > 0 and
-         #rv.armoursmithy > 0 and
+         #rv.armorsmithy > 0 and
          #rv.smelting_works > 0 and
          (#rv.oremine + #rv.deep_oremine > 0) and
          (#rv.coalmine + #rv.deep_coalmine + #rv.burners_house > 0) and

=== modified file 'campaigns/emp02.wmf/scripting/starting_conditions.lua'
--- campaigns/emp02.wmf/scripting/starting_conditions.lua	2011-08-06 16:45:37 +0000
+++ campaigns/emp02.wmf/scripting/starting_conditions.lua	2014-03-16 06:39:32 +0000
@@ -13,8 +13,8 @@
       wares = {
          helm = 4,
          wood_lance = 5,
-         axe = 6,
-         bakingtray = 2,
+         ax = 6,
+         bread_paddle = 2,
          basket = 1,
          bread = 8,
          cloth = 5,
@@ -40,7 +40,7 @@
          scythe = 5,
          shovel = 6,
          stone = 40,
-         trunk = 30,
+         log = 30,
          water = 12,
          wheat = 4,
          wine = 8,
@@ -48,7 +48,7 @@
          wool = 2,
       }, 
       workers = {
-         armoursmith = 1,
+         armorsmith = 1,
          brewer = 1,
          builder = 10,
          burner = 1,
@@ -75,7 +75,7 @@
    "bakery",
    "barrier",
    "farm",
-   "fernery",
+   "reed_yard",
    "fishers_hut",
    "hardener",
    "hunters_hut",
@@ -91,8 +91,8 @@
 prefilled_buildings(p2,
    {"headquarters", 60, 65, 
    wares = {
-      axe = 6,
-      bakingtray = 2,
+      ax = 6,
+      bread_paddle = 2,
       blackwood = 32,
       cloth = 5,
       coal = 12,
@@ -116,7 +116,7 @@
       shovel = 4,
       snack = 3,
       thatchreed = 24,
-      trunk = 80,
+      log = 80,
    },
    workers = {
       blacksmith = 2,
@@ -124,7 +124,7 @@
       builder = 10,
       burner = 1,
       carrier = 40,
-      ferner = 1,
+      gardener = 1,
       geologist = 4,
       ["lime-burner"] = 1,
       lumberjack = 3,

=== modified file 'campaigns/t01.wmf/scripting/init.lua'
--- campaigns/t01.wmf/scripting/init.lua	2013-10-28 20:33:13 +0000
+++ campaigns/t01.wmf/scripting/init.lua	2014-03-16 06:39:32 +0000
@@ -18,7 +18,7 @@
 hq = p:place_building("headquarters_interim", wl.Game().map:get_field(12,10),
    false, true)
 hq:set_wares{
-   trunk = 80
+   log = 80
 }
 hq:set_workers{
    builder=10,

=== modified file 'campaigns/t02.wmf/scripting/mission_thread.lua'
--- campaigns/t02.wmf/scripting/mission_thread.lua	2011-08-06 16:45:37 +0000
+++ campaigns/t02.wmf/scripting/mission_thread.lua	2014-03-16 06:39:32 +0000
@@ -213,10 +213,10 @@
    end
    o.done = true
 
-   send_msg(order_msg_18_fernery)
-   plr:allow_buildings{"fernery"}
+   send_msg(order_msg_18_reed_yard)
+   plr:allow_buildings{"reed_yard"}
    o = add_obj(obj_better_material_3)
-   while #plr:get_buildings("fernery") < 1 do sleep(5421) end
+   while #plr:get_buildings("reed_yard") < 1 do sleep(5421) end
 
    send_msg(order_msg_19_all_material)
    o.done = true
@@ -376,7 +376,7 @@
       {"lumberjacks_hut", 54, 24},
       {"rangers_hut", 57, 24},
       {"rangers_hut", 55, 25},
-      {"hardener", 54, 26, wares = {trunk = 8}},
+      {"hardener", 54, 26, wares = {log = 8}},
       {"warehouse", 53, 28},
       {"inn", 55, 28, wares = {pittabread = 4, meat = 4}},
       {"tavern", 57, 28, wares = {pittabread=4, meat = 4}},

=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua'
--- campaigns/t02.wmf/scripting/mission_thread_texts.lua	2014-03-09 12:45:47 +0000
+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua	2014-03-16 06:39:32 +0000
@@ -124,7 +124,7 @@
 }
 
 obj_better_material_3 = {
-   name="mission fernery",
+   name="mission reed_yard",
    title=_"Build a reed yard",
    number = 1,
    body= objective_text(_"Build a reed yard", _(
@@ -195,7 +195,7 @@
 _([[So you want to prepare us for a longer stay in these forests, Thron? ]] .. 
 [[Well, I see the wisdom in doing so, yet my heart is yearning for a glorious return to Al’thunran. ]] .. 
 [[Too long have we waited while our brethren have fought on the battlefield, ]] .. 
-[[and our axes and swords have turned rusty over time.]])
+[[and our axs and swords have turned rusty over time.]])
    )
 }
 
@@ -346,7 +346,7 @@
    ) .. new_objectives(obj_better_material_2)
 }
 
-order_msg_18_fernery = {
+order_msg_18_reed_yard = {
    title=_"The Advisor", 
    body= khantrukh(_"Khantrukh steps in...", 
 _([[Chieftain, this is a disgrace! ]] .. 

=== modified file 'campaigns/t02.wmf/scripting/starting_conditions.lua'
--- campaigns/t02.wmf/scripting/starting_conditions.lua	2011-08-06 16:45:37 +0000
+++ campaigns/t02.wmf/scripting/starting_conditions.lua	2014-03-16 06:39:32 +0000
@@ -16,8 +16,8 @@
 hq_pos = wl.Game().map:get_field(12,10)
 hq = plr:place_building("headquarters_interim", hq_pos, false, true)
 hq:set_wares{
-   axe=6,
-   bakingtray=2,
+   ax=6,
+   bread_paddle=2,
    blackwood=32,
    coal=12,
    fire_tongs=2,
@@ -38,7 +38,7 @@
    shovel=4,
    snack=3,
    thatchreed=24,
-   trunk=80,
+   log=80,
 }
 hq:set_workers{
    blacksmith=2,
@@ -46,7 +46,7 @@
    builder=10,
    burner=1,
    carrier=40,
-   ferner=1,
+   gardener=1,
    fisher=1,
    geologist=4,
    ["lime-burner"]=1,

=== modified file 'campaigns/t03.wmf/scripting/mission_thread.lua'
--- campaigns/t03.wmf/scripting/mission_thread.lua	2012-03-08 21:44:22 +0000
+++ campaigns/t03.wmf/scripting/mission_thread.lua	2014-03-16 06:39:32 +0000
@@ -149,11 +149,11 @@
 
    send_msg(order_msg_6_build_enhanced_economy_and_training)
    p1:allow_buildings{
-      "axefactory",
+      "axfactory",
       "warmill",
       "helmsmithy",
       "battlearena",
-      "trainingscamp",
+      "trainingcamp",
       "inn",
       "big_inn",
       "deep_coalmine",
@@ -173,15 +173,15 @@
 end
 
 function check_trainingssite_obj(o)
-   while not check_for_buildings(p1, {trainingscamp = 1, battlearena = 1}) do
+   while not check_for_buildings(p1, {trainingcamp = 1, battlearena = 1}) do
       sleep(6523)
    end
    o.done = true
 end
 function check_weapon_productions_obj(o)
    while true do
-      local rv = p1:get_buildings{"metalworks", "axefactory", "warmill"}
-      if #rv.metalworks > 0 and (#rv.axefactory + #rv.warmill > 0) then
+      local rv = p1:get_buildings{"metalworks", "axfactory", "warmill"}
+      if #rv.metalworks > 0 and (#rv.axfactory + #rv.warmill > 0) then
          break
       end
       sleep(6523)

=== modified file 'campaigns/t03.wmf/scripting/starting_conditions.lua'
--- campaigns/t03.wmf/scripting/starting_conditions.lua	2012-02-15 21:25:34 +0000
+++ campaigns/t03.wmf/scripting/starting_conditions.lua	2014-03-16 06:39:32 +0000
@@ -8,17 +8,17 @@
    "rangers_hut",
    "hardener",
    "lime_kiln",
-   "fernery",
+   "reed_yard",
    "sentry",
 }
 
 hq = p1:place_building("headquarters", wl.Game().map:get_field(52, 33), false, true)
 hq:set_wares{
-   axe=1,
-   bakingtray=2,
+   ax=1,
+   bread_paddle=2,
    blackwood=32,
    coal=12,
-   felling_axe=5,
+   felling_ax=5,
    fire_tongs=2,
    fish=6,
    grout=12,
@@ -37,7 +37,7 @@
    shovel=4,
    snack=3,
    thatchreed=24,
-   trunk=80,
+   log=80,
 }
 hq:set_workers{
    carrier=40,
@@ -45,7 +45,7 @@
    brewer=1,
    builder=10,
    burner=1,
-   ferner=1,
+   gardener=1,
    fisher=2,
    geologist=4,
    ["lime-burner"]=1,
@@ -64,7 +64,7 @@
 p2:allow_buildings{"lumberjacks_hut"}
 
 wh = p2:place_building("warehouse", wl.Game().map:get_field(100,25), false, true)
-wh:set_wares{trunk=200}
+wh:set_wares{log=200}
 wh:set_workers{ carrier=40, builder=1, lumberjack=4 }
 
 prefilled_buildings(p2,
@@ -111,7 +111,7 @@
 -- =======================================================================
 p4:forbid_buildings("all")
 wh = p4:place_building("warehouse", wl.Game().map:get_field(132,110), false, true)
-wh:set_wares{trunk=10}
+wh:set_wares{log=10}
 wh:set_workers{carrier=40, builder=1, blacksmith=1, ["master-blacksmith"]=1}
 
 prefilled_buildings(p4,

=== modified file 'campaigns/tutorial01.wmf/scripting/init.lua'
--- campaigns/tutorial01.wmf/scripting/init.lua	2013-07-14 16:36:55 +0000
+++ campaigns/tutorial01.wmf/scripting/init.lua	2014-03-16 06:39:32 +0000
@@ -236,7 +236,7 @@
             builder = 1
          },
          wares = {
-            trunk = 40,
+            log = 40,
             blackwood = 40,
             cloth = 10,
             gold = 10,
@@ -245,7 +245,7 @@
             thatchreed = 40,
          }
       },
-      {"trainingscamp", 31, 56, soldiers = {} },
+      {"trainingcamp", 31, 56, soldiers = {} },
       {"sentry", 28, 57, soldiers = {[{3,5,0,2}] = 2 }},
       {"sentry", 37, 61, soldiers = {[{3,5,0,2}] = 2 }},
    }

=== modified file 'doc/sphinx/source/introduction.rst'
--- doc/sphinx/source/introduction.rst	2014-01-18 14:02:15 +0000
+++ doc/sphinx/source/introduction.rst	2014-03-16 06:39:32 +0000
@@ -29,9 +29,9 @@
 infrastructure. 
 
 A small example. Let's assume we want to add an initialization to the
-barbarians that gives the player 80 trunks, but not at once but one by one
+barbarians that gives the player 80 logs, but not at once but one by one
 over a certain time. The corresponding lua script could be named
-``barbarians/scripting/sc99_init_trunks.lua``. The naming decides over the
+``barbarians/scripting/sc99_init_logs.lua``. The naming decides over the
 order in which the starting conditions are listed. Let's write the script:
 
 .. code-block:: lua
@@ -52,9 +52,9 @@
          -- Place the hq
          local hq = player:place_building("headquarters", player.starting_field)
 
-         -- Now add one trunk to the hq every 250 ms
+         -- Now add one log to the hq every 250 ms
          for i=1,80 do 
-            hq:set_wares("trunk", hq:get_wares("trunk") + 1)
+            hq:set_wares("log", hq:get_wares("log") + 1)
             sleep(250)
          end
    end
@@ -70,8 +70,8 @@
 initializations: We have to create a Lua script in
 ``/scripting/win_conditions`` which returns an array with ``name``,
 ``description`` and ``func``. Let's also make up a quick example: The first
-player to have 200 trunks in his HQ wins the game. All others loose. Save the
-following file as ``/scripting/win_conditions/havest_trunks.lua``.
+player to have 200 logs in his HQ wins the game. All others loose. Save the
+following file as ``/scripting/win_conditions/havest_logs.lua``.
 
 .. code-block:: lua
 
@@ -81,8 +81,8 @@
    set_textdomain("win_conditions")
 
    return {
-      name = _ "Harvest trunks",
-      description = _ "The first player with 200 trunks wins!",
+      name = _ "Harvest logs",
+      description = _ "The first player with 200 logs wins!",
       func = function() 
          -- Find all valid players.
          local plrs = wl.Game().players
@@ -94,7 +94,7 @@
             sleep(5000) -- we do this every 5 seconds
             for idx,p in ipairs(plrs) do -- iterate the players array
                local hq = p.starting_field.immovable
-               if hq:get_wares("trunk") >= 200 then
+               if hq:get_wares("log") >= 200 then
                   -- We found the winner
                   winner = p
                   losers = plrs

=== modified file 'maps/Desert Tournament.wmf/allowed_worker_types'
--- maps/Desert Tournament.wmf/allowed_worker_types	2010-09-25 12:49:34 +0000
+++ maps/Desert Tournament.wmf/allowed_worker_types	2014-03-16 06:39:32 +0000
@@ -10,7 +10,7 @@
 builder="true"
 burner="true"
 farmer="true"
-ferner="true"
+gardener="true"
 fisher="true"
 gamekeeper="true"
 geologist="true"
@@ -37,7 +37,7 @@
 builder="true"
 burner="true"
 farmer="true"
-ferner="true"
+gardener="true"
 fisher="true"
 gamekeeper="true"
 geologist="true"
@@ -64,7 +64,7 @@
 builder="true"
 burner="true"
 farmer="true"
-ferner="true"
+gardener="true"
 fisher="true"
 gamekeeper="true"
 geologist="true"
@@ -91,7 +91,7 @@
 builder="true"
 burner="true"
 farmer="true"
-ferner="true"
+gardener="true"
 fisher="true"
 gamekeeper="true"
 geologist="true"

=== modified file 'maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua'
--- maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua	2014-03-07 09:21:35 +0000
+++ maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua	2014-03-16 06:39:32 +0000
@@ -55,19 +55,19 @@
 _finish_rewards = {
    { -- Island 1
       { -- 1st to finish
-         trunk = 25, planks = 15, stone = 10,
+         log = 25, planks = 15, stone = 10,
          spidercloth = 5, corn = 20,
       },
       { -- 2st to finish
-         trunk = 45, planks = 30, stone = 20,
+         log = 45, planks = 30, stone = 20,
          spidercloth = 7, corn = 25,
       },
       { -- 3rd to finish
-         trunk = 65, planks = 45, stone = 30,
+         log = 65, planks = 45, stone = 30,
          spidercloth = 9, corn = 30,
       },
       { -- 4th to finish
-         trunk = 85, planks = 50, stone = 40,
+         log = 85, planks = 50, stone = 40,
          spidercloth = 11, corn = 35,
       }
    },
@@ -112,7 +112,7 @@
 -- This function gets the translated text according to each language's plural rules
 -- for the resources in _finish_rewards
 function getplural(count, resource)
-   if  resource == "trunk" then
+   if  resource == "log" then
       return ngettext("%s Log","%s Logs",count):bformat(count)
    elseif  resource == "planks" then
       return ngettext("%s Plank","%s Planks",count):bformat(count)
@@ -170,7 +170,7 @@
             quartz = 9,
             stone = 50,
             spideryarn = 9,
-            trunk = 20,
+            log = 20,
             coal = 12,
             gold = 4,
             goldyarn = 6,
@@ -187,7 +187,7 @@
             smoked_fish = 6,
             smoked_meat = 6,
             water = 12,
-            bakingtray = 2,
+            bread_paddle = 2,
             bucket = 2,
             fire_tongs = 2,
             fishing_net = 4,
@@ -203,7 +203,7 @@
             light_trident = 5,
          },
          workers = {
-            armoursmith = 1,
+            armorsmith = 1,
             blackroot_farmer = 1,
             builder = 10,
             burner = 1,

=== modified file 'maps/MP Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua'
--- maps/MP Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua	2014-02-25 23:23:41 +0000
+++ maps/MP Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua	2014-03-16 06:39:32 +0000
@@ -63,12 +63,12 @@
 
       prefilled_buildings(player, { "headquarters", sf.x, sf.y,
          wares = {
-            axe = 5,
-            bakingtray = 2,
+            ax = 5,
+            bread_paddle = 2,
             blackwood = 32,
             cloth = 5,
             coal = 12,
-            felling_axe = 4,
+            felling_ax = 4,
             fire_tongs = 2,
             fish = 6,
             fishing_rod = 2,
@@ -89,7 +89,7 @@
             shovel = 4,
             snack = 3,
             thatchreed = 24,
-            trunk = 80,
+            log = 80,
          },
          workers = {
             blacksmith = 2,
@@ -97,7 +97,7 @@
             builder = 10,
             burner = 1,
             carrier = 40,
-            ferner = 1,
+            gardener = 1,
             geologist = 4,
             ["lime-burner"] = 1,
             lumberjack = 3,

=== modified file 'maps/Plateau.wmf/scripting/initial_conditions.lua'
--- maps/Plateau.wmf/scripting/initial_conditions.lua	2011-05-24 11:49:38 +0000
+++ maps/Plateau.wmf/scripting/initial_conditions.lua	2014-03-16 06:39:32 +0000
@@ -5,8 +5,8 @@
 
 prefilled_buildings(p1, { "headquarters_interim", 65, 6, 
    wares = {
-      axe = 6,
-      bakingtray = 2,
+      ax = 6,
+      bread_paddle = 2,
       blackwood = 32,
       coal = 12,
       fire_tongs = 2,
@@ -27,14 +27,14 @@
       shovel = 4,
       snack = 3,
       thatchreed = 24,
-      trunk = 80,
+      log = 80,
    },
    workers = {
       carrier = 40,
       blacksmith = 2,
       brewer = 1,
       builder = 10,
-      ferner = 1,
+      gardener = 1,
       fisher = 2,
       geologist = 4,
       ["lime-burner"] = 1,
@@ -54,7 +54,7 @@
 p2:allow_buildings{ "lumberjacks_hut" }
 
 prefilled_buildings(p2,
-   { "warehouse", 45, 40, wares = {trunk = 20,}, workers = {
+   { "warehouse", 45, 40, wares = {log = 20,}, workers = {
       carrier = 40,
       builder = 2,
       lumberjack = 10,
@@ -139,7 +139,7 @@
    "rangers_hut",
    "hardener",
    "lime_kiln",
-   "fernery",
+   "reed_yard",
    "fishers_hut",
    "well",
    "tavern",
@@ -153,7 +153,7 @@
 
 prefilled_buildings(p3, 
    { "warehouse", 6, 44, wares = {
-         trunk = 200,
+         log = 200,
          kitchen_tools = 4,
          pick = 14,
          raw_stone = 40,
@@ -169,7 +169,7 @@
          burner = 1,
          brewer = 1,
          farmer = 1,
-         ferner = 1,
+         gardener = 1,
          fisher = 2,
          geologist = 4,
          ["lime-burner"] = 1,

=== modified file 'maps/Together we're strong.wmf/allowed_worker_types'
--- maps/Together we're strong.wmf/allowed_worker_types	2011-11-19 00:30:30 +0000
+++ maps/Together we're strong.wmf/allowed_worker_types	2014-03-16 06:39:32 +0000
@@ -6,7 +6,7 @@
 [player_1]
 carrier="true"
 soldier="true"
-armoursmith="true"
+armorsmith="true"
 baker="true"
 blackroot_farmer="true"
 builder="true"
@@ -36,7 +36,7 @@
 [player_2]
 carrier="true"
 soldier="true"
-armoursmith="true"
+armorsmith="true"
 baker="true"
 blackroot_farmer="true"
 builder="true"

=== modified file 'maps/Trident of Fire.wmf/scripting/initial_conditions.lua'
--- maps/Trident of Fire.wmf/scripting/initial_conditions.lua	2014-02-22 14:33:44 +0000
+++ maps/Trident of Fire.wmf/scripting/initial_conditions.lua	2014-03-16 06:39:32 +0000
@@ -6,14 +6,14 @@
 			prefilled_buildings(player, 
 			{"headquarters_interim", f_hq.x, f_hq.y, 
 				wares = {
-					 trunk = 3,
+					 log = 3,
 				},
 				workers = {
 					 blacksmith = 1,
 					 smelter = 1,
 					 builder = 2,
 					 carrier = 10,
-					 ferner = 1,
+					 gardener = 1,
 					 geologist = 1,
 					 ["lime-burner"] = 1,
 					 lumberjack = 3,
@@ -36,7 +36,7 @@
 	if tribename == "empire" then
 		prefilled_buildings(player, { "headquarters_shipwreck", f_hq.x, f_hq.y,
 		wares = {
-			trunk = 2,
+			log = 2,
 			wood = 3,
 		},
 		workers = {
@@ -69,7 +69,7 @@
 	if tribename == "atlanteans" then
 	    prefilled_buildings(player, { "headquarters", f_hq.x, f_hq.y,
 		    wares = {
-				trunk = 2,
+				log = 2,
 				planks = 2,
 				spidercloth = 1
 			},
@@ -110,9 +110,8 @@
 		prefilled_buildings(player, 
 			{ "port", f_hq.x, f_hq.y, 
 			   wares = {
-				  axe = 6,
-				  bakingtray = 2,
-				  blackwood = 60,
+				  ax = 6,
+				  bread_paddle = 2,
 				  coal = 12,
 				  fire_tongs = 2,
 				  fish = 6,
@@ -132,14 +131,14 @@
 				  shovel = 4,
 				  snack = 3,
 				  thatchreed = 24,
-				  trunk = 150,
+				  log = 150,
 			   },
 			   workers = {
 				  carrier = 40,
 				  blacksmith = 2,
 				  brewer = 1,
 				  builder = 10,
-				  ferner = 1,
+				  gardener = 1,
 				  fisher = 2,
 				  geologist = 4,
 				  ["lime-burner"] = 1,
@@ -155,7 +154,7 @@
 			{ "shipyard", f_shipyard.x, f_shipyard.y, wares = {
 				  blackwood = 10,
 				  cloth = 4,
-				  trunk = 2,
+				  log = 2,
 			   },
 		 }
 		)
@@ -169,8 +168,8 @@
 			   wares = {
 				 helm = 4,
 				 wood_lance = 5,
-				 axe = 6,
-				 bakingtray = 2,
+				 ax = 6,
+				 bread_paddle = 2,
 				 basket = 2,
 				 bread = 8,
 				 cloth = 5,
@@ -196,7 +195,7 @@
 				 scythe = 5,
 				 shovel = 6,
 				 stone = 50,
-				 trunk = 40,
+				 log = 40,
 				 water = 12,
 				 wheat = 4,
 				 wine = 8,
@@ -204,7 +203,7 @@
 				 wool = 2,
 			   },
 			   workers = {
-				 armoursmith = 1,
+				 armorsmith = 1,
 				 brewer = 1,
 				 builder = 10,
 				 burner = 1,
@@ -224,7 +223,7 @@
 			{ "shipyard", f_shipyard.x, f_shipyard.y, 
 			   wares = {
 				 cloth = 4,
-				 trunk = 2,
+				 log = 2,
 				 wood = 10,
 			   }
 		   },
@@ -241,7 +240,7 @@
 			 quartz = 9,
 			 stone = 50,
 			 spideryarn = 9,
-			 trunk = 100,
+			 log = 100,
 			 coal = 12,
 			 gold = 4,
 			 goldyarn = 6,
@@ -258,7 +257,7 @@
 			 smoked_fish = 6,
 			 smoked_meat = 6,
 			 water = 12,
-			 bakingtray = 2,
+			 bread_paddle = 2,
 			 bucket = 2,
 			 fire_tongs = 2,
 			 fishing_net = 4,
@@ -274,7 +273,7 @@
 			 light_trident = 5,
 		   },
 		   workers = {
-			 armoursmith = 1,
+			 armorsmith = 1,
 			 blackroot_farmer = 1,
 			 builder = 10,
 			 burner = 1,
@@ -295,7 +294,7 @@
 		   { "shipyard", f_shipyard.x, f_shipyard.y, wares = {
 			  planks = 10,
 			  spidercloth = 4,
-			  trunk = 2,
+			  log = 2,
 		   }}
 		)
 	end	

=== modified file 'scripting/win_conditions/02_collectors.lua'
--- scripting/win_conditions/02_collectors.lua	2014-03-08 08:35:39 +0000
+++ scripting/win_conditions/02_collectors.lua	2014-03-16 06:39:32 +0000
@@ -34,19 +34,19 @@
 local point_table = {
 	barbarians = {
 		gold = 3,
-		axe = 2,
-		sharpaxe = 3,
-		broadaxe = 4,
-		bronzeaxe = 4,
-		battleaxe = 6,
-		warriorsaxe = 10,
+		ax = 2,
+		sharpax = 3,
+		broadax = 4,
+		bronzeax = 4,
+		battleax = 6,
+		warriorsax = 10,
 		helm = 2,
 		mask = 3,
-		warhelmet = 6,
+		warhelm = 6,
 	},
 	barbarians_order = {
-		"gold", "axe", "sharpaxe", "broadaxe", "bronzeaxe", "battleaxe",
-		"warriorsaxe", "helm", "mask", "warhelmet",
+		"gold", "ax", "sharpax", "broadax", "bronzeax", "battleax",
+		"warriorsax", "helm", "mask", "warhelm",
 	},
 
 	empire = {
@@ -57,13 +57,13 @@
 		heavy_lance = 7,
 		war_lance = 8,
 		helm = 2,
-		armour = 3,
-		chain_armour = 4,
-		plate_armour = 8,
+		armor = 3,
+		chain_armor = 4,
+		plate_armor = 8,
 	},
 	empire_order = {
 		"gold", "wood_lance", "lance", "advanced_lance", "heavy_lance",
-		"war_lance", "helm", "armour", "chain_armour", "plate_armour"
+		"war_lance", "helm", "armor", "chain_armor", "plate_armor"
 	},
 
 	atlanteans = {

=== modified file 'src/ai/ai_hints.cc'
--- src/ai/ai_hints.cc	2014-02-22 18:04:02 +0000
+++ src/ai/ai_hints.cc	2014-03-16 06:39:32 +0000
@@ -35,7 +35,7 @@
 	mines              (nullptr),
 	basic              (section ? section->get_bool("is_basic")         : false),
 	build_material     (section ? section->get_bool("build_material")   : true),
-	trunkproducer      (section ? section->get_bool("trunkproducer")    : false),
+	logproducer      (section ? section->get_bool("logproducer")    : false),
 	stoneproducer      (section ? section->get_bool("stoneproducer")    : false),
 	needs_water        (section ? section->get_bool("needs_water")      : false),
 	recruitment        (section ? section->get_bool("recruitment")      : false),

=== modified file 'src/ai/ai_hints.h'
--- src/ai/ai_hints.h	2013-07-26 19:16:51 +0000
+++ src/ai/ai_hints.h	2014-03-16 06:39:32 +0000
@@ -40,7 +40,7 @@
 
 	bool         prod_build_material    () const {return build_material;}
 
-	bool         is_trunkproducer       () const {return trunkproducer;}
+	bool         is_logproducer       () const {return logproducer;}
 
 	bool         is_stoneproducer       () const {return stoneproducer;}
 
@@ -57,7 +57,7 @@
 	char  * mines;
 	bool    basic;
 	bool    build_material; // whether the building produces build material
-	bool    trunkproducer;
+	bool    logproducer;
 	bool    stoneproducer;
 	bool    needs_water;
 	bool    recruitment; // whether building recruits special workers

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2014-02-22 18:04:02 +0000
+++ src/ai/defaultai.cc	2014-03-16 06:39:32 +0000
@@ -261,7 +261,7 @@
 
 		bo.is_buildable           = bld.is_buildable();
 
-		bo.need_trees             = bh.is_trunkproducer();
+		bo.need_trees             = bh.is_logproducer();
 		bo.need_stones            = bh.is_stoneproducer();
 		bo.need_water             = bh.get_needs_water();
 		bo.recruitment            = bh.for_recruitment();
@@ -717,7 +717,7 @@
  * constructs the most needed building
  *
  * The need for a productionsite or a mine is calculated by the need for
- * their produced wares. The need for trunkproducers (like lumberjack's huts),
+ * their produced wares. The need for logproducers (like lumberjack's huts),
  * stoneproducers (like quarries) and resource refreshing buildings (like
  * forester's houses, gamekeeper's huts or fishbreeder houses) are calculated
  * separately as these buildings should have another priority (on one hand they
@@ -903,12 +903,12 @@
 							prio *= 4; // even more for the absolute basics
 					}
 				} else if (bo.production_hint >= 0) {
-					// production hint (f.e. associate forester with trunks)
+					// production hint (f.e. associate forester with logs)
 
 					// Calculate the need for this building
 					int16_t inout = wares.at(bo.production_hint).consumers;
 					if
-						(tribe->safe_ware_index("trunk").value()
+						(tribe->safe_ware_index("log").value()
 						 ==
 						 bo.production_hint)
 						inout += total_constructionsites / 4;

=== modified file 'src/logic/legacy.cc'
--- src/logic/legacy.cc	2014-03-04 13:24:58 +0000
+++ src/logic/legacy.cc	2014-03-16 06:39:32 +0000
@@ -31,13 +31,13 @@
 //  These tables are needed for compatibility with requests written in version
 //  <= 3.
 static char const * const barbarian_ware_types[] = {
-	"axe",
-	"bakingtray",
-	"battleaxe",
+	"ax",
+	"bread_paddle",
+	"battleax",
 	"beer",
 	"blackwood",
-	"broadaxe",
-	"bronzeaxe",
+	"broadax",
+	"bronzeax",
 	"cloth",
 	"coal",
 	"fire_tongs",
@@ -45,7 +45,7 @@
 	"fishing_rod",
 	"flax",
 	"gold",
-	"goldstone",
+	"goldore",
 	"grout",
 	"hammer",
 	"helm",
@@ -61,14 +61,14 @@
 	"ration",
 	"raw_stone",
 	"scythe",
-	"sharpaxe",
+	"sharpax",
 	"shovel",
 	"snack",
 	"strongbeer",
 	"thatchreed",
-	"trunk",
-	"warhelmet",
-	"warriorsaxe",
+	"log",
+	"warhelm",
+	"warriorsax",
 	"water",
 	"wheat"
 };
@@ -81,7 +81,7 @@
 	"carrier",
 	"chief-miner",
 	"farmer",
-	"ferner",
+	"gardener",
 	"fisher",
 	"gamekeeper",
 	"geologist",
@@ -103,13 +103,13 @@
 };
 static char const * const empire_ware_types[] = {
 	"advanced_lance",
-	"armour",
-	"axe",
-	"bakingtray",
+	"armor",
+	"ax",
+	"bread_paddle",
 	"basket",
 	"beer",
 	"bread",
-	"chain_armour",
+	"chain_armor",
 	"cloth",
 	"coal",
 	"fire_tongs",
@@ -117,7 +117,7 @@
 	"fishing_rod",
 	"flour",
 	"gold",
-	"goldstone",
+	"goldore",
 	"grape",
 	"hammer",
 	"heavy_lance",
@@ -132,13 +132,13 @@
 	"meal",
 	"meat",
 	"pick",
-	"plate_armour",
+	"plate_armor",
 	"ration",
 	"saw",
 	"scythe",
 	"shovel",
 	"stone",
-	"trunk",
+	"log",
 	"war_lance",
 	"water",
 	"wheat",
@@ -148,7 +148,7 @@
 	"wool",
 };
 static char const * const empire_worker_types[] = {
-	"armoursmith",
+	"armorsmith",
 	"baker",
 	"brewer",
 	"builder",
@@ -177,7 +177,7 @@
 };
 static char const * const atlantean_ware_types[] = {
 	"advanced_shield",
-	"bakingtray",
+	"bread_paddle",
 	"blackroot",
 	"blackrootflour",
 	"bread",
@@ -218,11 +218,11 @@
 	"steel_trident",
 	"stone",
 	"tabard",
-	"trunk",
+	"log",
 	"water"
 };
 static char const * const atlantean_worker_types[] = {
-	"armoursmith",
+	"armorsmith",
 	"baker",
 	"blackroot_farmer",
 	"builder",

=== modified file 'src/logic/worker.cc'
--- src/logic/worker.cc	2014-03-13 21:27:08 +0000
+++ src/logic/worker.cc	2014-03-16 06:39:32 +0000
@@ -588,7 +588,7 @@
 	(Game & game, Building & building, std::string res_type) const
 {
 	// NOTE this is just an ugly hack for now, to avoid getting messages
-	// NOTE for farms, ferneries, vineyards, etc.
+	// NOTE for farms, reed yards, vineyards, etc.
 	if ((res_type != "fish") && (res_type != "stone"))
 		return;
 	// NOTE  AND fish_breeders

=== modified file 'test/maps/expedition.wmf/scripting/init.lua'
--- test/maps/expedition.wmf/scripting/init.lua	2014-03-03 21:00:11 +0000
+++ test/maps/expedition.wmf/scripting/init.lua	2014-03-16 06:39:32 +0000
@@ -2,7 +2,7 @@
 use("aux", "coroutine")
 use("aux", "ui")
 
--- This is a test case for bug 1234058: there is constant demand for trunks,
+-- This is a test case for bug 1234058: there is constant demand for logs,
 -- so the expedition initially never got any.
 -- We also exercise the expedition feature and send the ship around, build a
 -- port and construct a building in the colony.
@@ -22,7 +22,7 @@
       iron = 2,
       raw_stone = 5,
       thatchreed = 4,
-      trunk = 3,
+      log = 3,
    },
    workers = {
       builder = 1,
@@ -87,7 +87,7 @@
    assert_equal(2, wares.iron)
    assert_equal(5, wares.raw_stone)
    assert_equal(4, wares.thatchreed)
-   -- We do not check for trunks here as they might be carried out of the
+   -- We do not check for logs here as they might be carried out of the
    -- warehouse already when we check (because they might get requested by the
    -- hardener).
    assert_equal(1, port:get_workers("builder"))
@@ -266,9 +266,9 @@
    sleep(100)
    game.desired_speed = 10 * 1000
 
-   -- Some optimization. No need to feed the hardener and to wait for trunks.
+   -- Some optimization. No need to feed the hardener and to wait for logs.
    p1:get_buildings("hardener")[1]:remove()
-   hq:set_wares("trunk", 100)
+   hq:set_wares("log", 100)
    port:set_wares("blackwood", 100)
 
 

=== modified file 'test/maps/lua_testsuite.wmf/scripting/flag.lua'
--- test/maps/lua_testsuite.wmf/scripting/flag.lua	2014-01-12 19:06:22 +0000
+++ test/maps/lua_testsuite.wmf/scripting/flag.lua	2014-03-16 06:39:32 +0000
@@ -33,40 +33,40 @@
    assert_equal(0, cnt)
 end
 function flag_tests:test_no_wares_on_creation_single_arg()
-   assert_equal(0, self.f:get_wares("trunk"))
+   assert_equal(0, self.f:get_wares("log"))
 end
 function flag_tests:test_no_wares_on_creation_array_arg()
-   local rv = self.f:get_wares{"trunk", "coal"}
-   assert_equal(0, rv.trunk)
+   local rv = self.f:get_wares{"log", "coal"}
+   assert_equal(0, rv.log)
    assert_equal(0, rv.coal)
    assert_equal(nil, rv.raw_stone)
 end
 function flag_tests:test_set_wares_two_args()
-   self.f:set_wares("trunk", 3)
-   assert_equal(3, self.f:get_wares("trunk"))
+   self.f:set_wares("log", 3)
+   assert_equal(3, self.f:get_wares("log"))
 end
 function flag_tests:test_set_wares_one_arg()
    self.f:set_wares{
-      trunk = 3,
+      log = 3,
       coal = 2,
    }
-   assert_equal(3, self.f:get_wares("trunk"))
+   assert_equal(3, self.f:get_wares("log"))
    assert_equal(2, self.f:get_wares("coal"))
 end
 function flag_tests:test_change_wares_on_flag()
-   self.f:set_wares{trunk = 3, coal = 2}
+   self.f:set_wares{log = 3, coal = 2}
    self.f:set_wares{fish = 3}
    assert_equal(3, self.f:get_wares("fish"))
-   assert_equal(0, self.f:get_wares("trunk"))
+   assert_equal(0, self.f:get_wares("log"))
    assert_equal(0, self.f:get_wares("coal"))
    assert_equal(3, _cnt_wares(self.f))
 end
 function flag_tests:test_change_wares_on_flag2()
-   self.f:set_wares{trunk = 3, coal = 5}
-   self.f:set_wares{trunk = 3, coal = 4, fish = 1}
+   self.f:set_wares{log = 3, coal = 5}
+   self.f:set_wares{log = 3, coal = 4, fish = 1}
    assert_equal(8, _cnt_wares(self.f))
    assert_equal(1, self.f:get_wares("fish"))
-   assert_equal(3, self.f:get_wares("trunk"))
+   assert_equal(3, self.f:get_wares("log"))
    assert_equal(4, self.f:get_wares("coal"))
 end
 function flag_tests:test_set_wares_illegal_ware()
@@ -75,13 +75,13 @@
    end
    assert_error("Illegal ware", ill)
    function ill1()
-      self.f:set_wares{"trunk", "kjhsh"}
+      self.f:set_wares{"log", "kjhsh"}
    end
    assert_error("Illegal ware", ill1)
 end
 function flag_tests:test_set_wares_many_wares()
    assert_error("Should be too much", function()
-      self.f:set_wares("trunk", 9)
+      self.f:set_wares("log", 9)
    end)
 end
 
@@ -91,7 +91,7 @@
 flag_tests_get_ware = lunit.TestCase("flag tests: get_ware")
 function flag_tests_get_ware:setup()
    self.f = player1:place_flag(map:get_field(13,10), 1)
-   self.f:set_wares{trunk = 2, raw_stone = 2, coal = 1}
+   self.f:set_wares{log = 2, raw_stone = 2, coal = 1}
 end
 function flag_tests_get_ware:teardown()
    pcall(self.f.remove, self.f)
@@ -99,7 +99,7 @@
 
 function flag_tests_get_ware:test_get_ware_all()
    local rv = self.f:get_wares("all")
-   assert_equal(2, rv.trunk)
+   assert_equal(2, rv.log)
    assert_equal(2, rv.raw_stone)
    assert_equal(1, rv.coal)
    assert_equal(nil, rv.fish)
@@ -108,23 +108,23 @@
    assert_equal(5, c)
 end
 function flag_tests_get_ware:test_get_ware_one_returns_number()
-   local rv = self.f:get_wares("trunk")
+   local rv = self.f:get_wares("log")
    assert_number(rv)
 end
 function flag_tests_get_ware:test_get_ware_one()
-   assert_equal(2, self.f:get_wares("trunk"))
+   assert_equal(2, self.f:get_wares("log"))
    assert_equal(2, self.f:get_wares("raw_stone"))
    assert_equal(1, self.f:get_wares("coal"))
 end
 function flag_tests_get_ware:test_get_ware_one()
-   assert_equal(2, self.f:get_wares("trunk"))
+   assert_equal(2, self.f:get_wares("log"))
    assert_equal(2, self.f:get_wares("raw_stone"))
    assert_equal(1, self.f:get_wares("coal"))
 end
 
 function flag_tests_get_ware:test_get_ware_many()
-   local rv = self.f:get_wares{"trunk", "raw_stone"}
-   assert_equal(2, rv.trunk)
+   local rv = self.f:get_wares{"log", "raw_stone"}
+   assert_equal(2, rv.log)
    assert_equal(2, rv.raw_stone)
    assert_equal(nil, rv.coal)
    local c = 0

=== modified file 'test/maps/lua_testsuite.wmf/scripting/productionsite.lua'
--- test/maps/lua_testsuite.wmf/scripting/productionsite.lua	2014-01-12 19:06:22 +0000
+++ test/maps/lua_testsuite.wmf/scripting/productionsite.lua	2014-03-16 06:39:32 +0000
@@ -169,10 +169,10 @@
 end
 function productionsite_tests:test_set_wares_illegal_name()
    assert_error("illegal ware", function()
-      self.inn:set_wares{meat = 2, trunk=1}
+      self.inn:set_wares{meat = 2, log=1}
    end)
    assert_error("illegal ware", function()
-      self.inn:set_wares("trunk",1)
+      self.inn:set_wares("log",1)
    end)
 end
 function productionsite_tests:test_set_wares_nonexistant_name()
@@ -209,7 +209,7 @@
    assert_equal(0, rv.beer)
    assert_equal(3, rv.fish)
    assert_equal(2, rv.strongbeer)
-   assert_equal(nil, rv.trunk)
+   assert_equal(nil, rv.log)
 end
 function productionsite_tests:test_get_wares_string_arg()
    self.inn:set_wares{fish=3, strongbeer=2}
@@ -218,13 +218,13 @@
    assert_equal(0, self.inn:get_wares("beer"))
    assert_equal(3, self.inn:get_wares("fish"))
    assert_equal(2, self.inn:get_wares("strongbeer"))
-   assert_equal(0, self.inn:get_wares("trunk"))
+   assert_equal(0, self.inn:get_wares("log"))
 end
 function productionsite_tests:test_get_wares_non_storable_wares()
    self.inn:set_wares{fish=3, strongbeer=2}
-   local rv = self.inn:get_wares{"meat", "trunk", "fish"}
+   local rv = self.inn:get_wares{"meat", "log", "fish"}
    assert_equal(0, rv.meat)
-   assert_equal(0, rv.trunk)
+   assert_equal(0, rv.log)
    assert_equal(3, rv.fish)
    assert_equal(nil, rv.strongbeer)
 end

=== modified file 'test/maps/lua_testsuite.wmf/scripting/trainingsite.lua'
--- test/maps/lua_testsuite.wmf/scripting/trainingsite.lua	2014-01-12 19:06:22 +0000
+++ test/maps/lua_testsuite.wmf/scripting/trainingsite.lua	2014-03-16 06:39:32 +0000
@@ -15,7 +15,7 @@
 function trainingsite_tests:setup()
    self.f1 = map:get_field(10,10)
 
-   self.camp = player1:place_building("trainingscamp", self.f1)
+   self.camp = player1:place_building("trainingcamp", self.f1)
 end
 function trainingsite_tests:teardown()
    pcall(function()
@@ -24,7 +24,7 @@
 end
 
 function trainingsite_tests:test_name()
-   assert_equal("trainingscamp", self.camp.name)
+   assert_equal("trainingcamp", self.camp.name)
 end
 function trainingsite_tests:test_type()
    assert_equal("trainingsite", self.camp.type)
@@ -87,14 +87,14 @@
    assert_equal(10, self.camp.valid_wares.pittabread)
    assert_equal(6, self.camp.valid_wares.fish)
    assert_equal(6, self.camp.valid_wares.meat)
-   assert_equal(2, self.camp.valid_wares.sharpaxe)
-   assert_equal(2, self.camp.valid_wares.broadaxe)
-   assert_equal(2, self.camp.valid_wares.bronzeaxe)
-   assert_equal(2, self.camp.valid_wares.battleaxe)
-   assert_equal(2, self.camp.valid_wares.warriorsaxe)
+   assert_equal(2, self.camp.valid_wares.sharpax)
+   assert_equal(2, self.camp.valid_wares.broadax)
+   assert_equal(2, self.camp.valid_wares.bronzeax)
+   assert_equal(2, self.camp.valid_wares.battleax)
+   assert_equal(2, self.camp.valid_wares.warriorsax)
    assert_equal(2, self.camp.valid_wares.helm)
    assert_equal(2, self.camp.valid_wares.mask)
-   assert_equal(2, self.camp.valid_wares.warhelmet)
+   assert_equal(2, self.camp.valid_wares.warhelm)
    assert_equal(nil, self.camp.valid_wares.water)
 end
 function trainingsite_tests:test_valid_wares_correct_length()
@@ -113,10 +113,10 @@
 end
 function trainingsite_tests:test_set_wares_illegal_name()
    assert_error("illegal ware", function()
-      self.camp:set_wares{meat = 2, trunk=1}
+      self.camp:set_wares{meat = 2, log=1}
    end)
    assert_error("illegal ware", function()
-      self.camp:set_wares("trunk",1)
+      self.camp:set_wares("log",1)
    end)
 end
 function trainingsite_tests:test_set_wares_nonexistant_name()
@@ -151,7 +151,7 @@
    assert_equal(0, rv.helm)
    assert_equal(2, rv.meat)
    assert_equal(3, rv.fish)
-   assert_equal(nil, rv.trunk)
+   assert_equal(nil, rv.log)
 end
 function trainingsite_tests:test_get_wares_string_arg()
    self.camp:set_wares{fish=3, meat=2}
@@ -159,12 +159,12 @@
    assert_equal(3, self.camp:get_wares("fish"))
    assert_equal(0, self.camp:get_wares("beer"))
    assert_equal(0, self.camp:get_wares("strongbeer"))
-   assert_equal(0, self.camp:get_wares("trunk"))
+   assert_equal(0, self.camp:get_wares("log"))
 end
 function trainingsite_tests:test_get_wares_non_storable_wares()
    self.camp:set_wares{fish=3, meat=2}
-   local rv = self.camp:get_wares{"meat", "trunk", "fish"}
-   assert_equal(0, rv.trunk)
+   local rv = self.camp:get_wares{"meat", "log", "fish"}
+   assert_equal(0, rv.log)
    assert_equal(2, rv.meat)
    assert_equal(3, rv.fish)
    assert_equal(nil, rv.strongbeer)

=== modified file 'test/maps/lua_testsuite.wmf/scripting/warehouse.lua'
--- test/maps/lua_testsuite.wmf/scripting/warehouse.lua	2014-01-12 19:06:22 +0000
+++ test/maps/lua_testsuite.wmf/scripting/warehouse.lua	2014-03-16 06:39:32 +0000
@@ -40,43 +40,43 @@
    end)
 end
 function warehouse_tests:test_set_get_wares_string_arg()
-   assert_equal(0, self.w:get_wares("trunk"))
-   self.w:set_wares("trunk", 190)
-   assert_equal(190, self.w:get_wares("trunk"))
+   assert_equal(0, self.w:get_wares("log"))
+   self.w:set_wares("log", 190)
+   assert_equal(190, self.w:get_wares("log"))
    assert_equal(0, self.w:get_wares("raw_stone"))
 end
 function warehouse_tests:test_set_get_wares_all()
-   self.w:set_wares{trunk=190, raw_stone=170}
+   self.w:set_wares{log=190, raw_stone=170}
    local rv = self.w:get_wares("all")
-   assert_equal(190, rv.trunk)
+   assert_equal(190, rv.log)
    assert_equal(170, rv.raw_stone)
    assert_equal(0, rv.coal)
 end
 function warehouse_tests:test_set_get_wares_table_arg()
-   k = self.w:get_wares{"trunk", "raw_stone"}
-   assert_equal(0, k.trunk)
+   k = self.w:get_wares{"log", "raw_stone"}
+   assert_equal(0, k.log)
    assert_equal(0, k.raw_stone)
    assert_equal(nil, k.coal)
-   self.w:set_wares{trunk=190, raw_stone=170}
-   k = self.w:get_wares{"trunk", "raw_stone"}
-   assert_equal(190, k.trunk)
+   self.w:set_wares{log=190, raw_stone=170}
+   k = self.w:get_wares{"log", "raw_stone"}
+   assert_equal(190, k.log)
    assert_equal(170, k.raw_stone)
    assert_equal(nil, k.coal)
 end
 function warehouse_tests:test_set_get_wares_set_is_not_increase()
-   k = self.w:get_wares{"trunk", "raw_stone"}
-   k.trunk = 20
+   k = self.w:get_wares{"log", "raw_stone"}
+   k.log = 20
    k.raw_stone = 40
    self.w:set_wares(k)
-   k = self.w:get_wares{"trunk", "raw_stone"}
-   assert_equal(20, k.trunk)
+   k = self.w:get_wares{"log", "raw_stone"}
+   assert_equal(20, k.log)
    assert_equal(40, k.raw_stone)
 
-   k.trunk = 10
+   k.log = 10
    k.raw_stone = 20
    self.w:set_wares(k)
-   k = self.w:get_wares{"trunk", "raw_stone"}
-   assert_equal(10, k.trunk)
+   k = self.w:get_wares{"log", "raw_stone"}
+   assert_equal(10, k.log)
    assert_equal(20, k.raw_stone)
 end
 function warehouse_tests:test_get_wares_non_existant_name()

=== renamed directory 'tribes/atlanteans/armoursmith' => 'tribes/atlanteans/armorsmith'
=== renamed directory 'tribes/atlanteans/armoursmithy' => 'tribes/atlanteans/armorsmithy'
=== renamed file 'tribes/atlanteans/armoursmithy/armoursmith_i_00.png' => 'tribes/atlanteans/armorsmithy/armorsmith_i_00.png'
=== renamed file 'tribes/atlanteans/armoursmithy/armoursmith_i_00_pc.png' => 'tribes/atlanteans/armorsmithy/armorsmith_i_00_pc.png'
=== modified file 'tribes/atlanteans/armorsmithy/conf'
--- tribes/atlanteans/armoursmithy/conf	2014-03-10 10:45:21 +0000
+++ tribes/atlanteans/armorsmithy/conf	2014-03-16 06:39:32 +0000
@@ -6,7 +6,7 @@
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 stone=2
 planks=2
 quartz=1
@@ -17,7 +17,7 @@
 quartz=1
 
 [working positions]
-armoursmith=1
+armorsmith=1
 
 [inputs]
 iron=8
@@ -49,11 +49,11 @@
 return=skipped
 
 [idle]
-pics=armoursmith_i_??.png
+pics=armorsmith_i_??.png
 hotspot=53 60
 playercolor=true
 
 [working]
-pics=armoursmith_i_??.png
+pics=armorsmith_i_??.png
 hotspot=53 60
 playercolor=true

=== modified file 'tribes/atlanteans/baker/conf'
--- tribes/atlanteans/baker/conf	2012-02-15 21:25:34 +0000
+++ tribes/atlanteans/baker/conf	2014-03-16 06:39:32 +0000
@@ -1,7 +1,7 @@
 help=_Bakes bread for workers.
 
 [buildcost]
-bakingtray=1
+bread_paddle=1
 carrier=1
 
 [idle]

=== modified file 'tribes/atlanteans/bakery/conf'
--- tribes/atlanteans/bakery/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/bakery/conf	2014-03-16 06:39:32 +0000
@@ -5,7 +5,7 @@
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 planks=2
 stone=3
 

=== removed directory 'tribes/atlanteans/bakingtray'
=== removed file 'tribes/atlanteans/bakingtray/conf'
--- tribes/atlanteans/bakingtray/conf	2014-02-24 21:12:30 +0000
+++ tribes/atlanteans/bakingtray/conf	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-help=_The bread paddle is the tool of the baker, each baker needs one. It is produced by the toolsmith.
-
-[idle]
-pics=idle.png
-hotspot=6 6

=== removed file 'tribes/atlanteans/bakingtray/idle.png'
Binary files tribes/atlanteans/bakingtray/idle.png	2012-02-15 21:25:34 +0000 and tribes/atlanteans/bakingtray/idle.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/atlanteans/bakingtray/menu.png'
Binary files tribes/atlanteans/bakingtray/menu.png	2012-02-15 21:25:34 +0000 and tribes/atlanteans/bakingtray/menu.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'tribes/atlanteans/blackroot_farm/conf'
--- tribes/atlanteans/blackroot_farm/conf	2014-03-10 10:45:21 +0000
+++ tribes/atlanteans/blackroot_farm/conf	2014-03-16 06:39:32 +0000
@@ -4,12 +4,12 @@
 [buildcost]
 planks=3
 stone=2
-trunk=4
+log=4
 
 [return_on_dismantle]
 planks=1
 stone=2
-trunk=1
+log=1
 
 [aihints]
 space_consumer=true

=== added directory 'tribes/atlanteans/bread_paddle'
=== added file 'tribes/atlanteans/bread_paddle/conf'
--- tribes/atlanteans/bread_paddle/conf	1970-01-01 00:00:00 +0000
+++ tribes/atlanteans/bread_paddle/conf	2014-03-16 06:39:32 +0000
@@ -0,0 +1,5 @@
+help=_The bread paddle is the tool of the baker, each baker needs one. It is produced by the toolsmith.
+
+[idle]
+pics=idle.png
+hotspot=6 6

=== added file 'tribes/atlanteans/bread_paddle/idle.png'
Binary files tribes/atlanteans/bread_paddle/idle.png	1970-01-01 00:00:00 +0000 and tribes/atlanteans/bread_paddle/idle.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/atlanteans/bread_paddle/menu.png'
Binary files tribes/atlanteans/bread_paddle/menu.png	1970-01-01 00:00:00 +0000 and tribes/atlanteans/bread_paddle/menu.png	2014-03-16 06:39:32 +0000 differ
=== modified file 'tribes/atlanteans/burners_house/conf'
--- tribes/atlanteans/burners_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/burners_house/conf	2014-03-16 06:39:32 +0000
@@ -5,26 +5,26 @@
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 stone=3
 planks=1
 
 [return_on_dismantle]
-trunk=2
+log=2
 stone=2
 
 [working positions]
 burner=1
 
 [inputs]
-trunk=8
+log=8
 
 [programs]
 work=_Work
 
 [work]
-return=skipped unless economy needs coal or not economy needs trunk
-consume=trunk:6
+return=skipped unless economy needs coal or not economy needs log
+consume=log:6
 sleep=30000
 animate=working 90000 # charcoal fires are burning some days in real life
 produce=coal

=== modified file 'tribes/atlanteans/castle/conf'
--- tribes/atlanteans/castle/conf	2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/castle/conf	2014-03-16 06:39:32 +0000
@@ -12,7 +12,7 @@
 [buildcost]
 planks=4
 stone=7
-trunk=5
+log=5
 spidercloth=2
 diamond=1
 quartz=1
@@ -20,7 +20,7 @@
 [return_on_dismantle]
 planks=2
 stone=5
-trunk=2
+log=2
 
 [idle]
 pics=castle_i_??.png

=== modified file 'tribes/atlanteans/coalmine/conf'
--- tribes/atlanteans/coalmine/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/coalmine/conf	2014-03-16 06:39:32 +0000
@@ -2,12 +2,12 @@
 output=coal
 
 [buildcost]
-trunk=7
+log=7
 planks=4
 spidercloth=1
 
 [return_on_dismantle]
-trunk=3
+log=3
 planks=2
 
 [working positions]

=== modified file 'tribes/atlanteans/conf'
--- tribes/atlanteans/conf	2014-03-10 09:15:02 +0000
+++ tribes/atlanteans/conf	2014-03-16 06:39:32 +0000
@@ -10,9 +10,9 @@
 icon=pics/icon.png
 # Wares and workers positions in wares window. Columns are separated by ;,
 # Entries in the columns separated by ,
-wares_order=stone, trunk, planks, spideryarn, spidercloth; fish, smoked_fish, meat, smoked_meat, water, corn, cornflour, blackroot, blackrootflour, bread; quartz, diamond, coal, ironore, iron, goldore, gold; pick, saw, shovel, hammer, milking_tongs, fishing_net, bucket, hunting_bow, hook_pole, scythe, bakingtray, fire_tongs; light_trident, long_trident, steel_trident, double_trident, heavy_double_trident,steel_shield, advanced_shield, tabard, goldyarn, golden_tabard
+wares_order=stone, log, planks, spideryarn, spidercloth; fish, smoked_fish, meat, smoked_meat, water, corn, cornflour, blackroot, blackrootflour, bread; quartz, diamond, coal, ironore, iron, goldore, gold; pick, saw, shovel, hammer, milking_tongs, fishing_net, bucket, hunting_bow, hook_pole, scythe, bread_paddle, fire_tongs; light_trident, long_trident, steel_trident, double_trident, heavy_double_trident,steel_shield, advanced_shield, tabard, goldyarn, golden_tabard
 
-workers_order=carrier, horse, horsebreeder; stonecutter, woodcutter, sawyer, forester, builder, spiderbreeder, weaver, shipwright; fisher, fish_breeder, hunter, smoker, farmer, blackroot_farmer, miller, baker; geologist, miner, burner, smelter; toolsmith; soldier, trainer, weaponsmith, armoursmith, scout
+workers_order=carrier, horse, horsebreeder; stonecutter, woodcutter, sawyer, forester, builder, spiderbreeder, weaver, shipwright; fisher, fish_breeder, hunter, smoker, farmer, blackroot_farmer, miller, baker; geologist, miner, burner, smelter; toolsmith; soldier, trainer, weaponsmith, armorsmith, scout
 
 # Some blue fires would be fine, but just an idea
 [frontier]
@@ -56,7 +56,7 @@
 
 [ware types]
 advanced_shield=_Advanced Shield
-bakingtray=_Bread Paddle
+bread_paddle=_Bread Paddle
 blackrootflour=_Blackroot Flour
 blackroot=_Blackroot
 bread=_Bread
@@ -97,7 +97,7 @@
 steel_trident=_Steel Trident
 stone=_Stone
 tabard=_Tabard
-trunk=_Log
+log=_Log
 water=_Water
 
 [carrier types]
@@ -108,7 +108,7 @@
 soldier=_Soldier
 
 [worker types]
-armoursmith=_Armorsmith
+armorsmith=_Armorsmith
 baker=_Baker
 blackroot_farmer=_Blackroot Farmer
 builder=_Builder
@@ -182,7 +182,7 @@
 smelting_works=_Smelting Works
 toolsmithy=_Toolsmithy
 weaponsmithy=_Weapon Smithy
-armoursmithy=_Armor Smithy
+armorsmithy=_Armor Smithy
 horsefarm=_Horse Farm
 spiderfarm=_Spider Farm
 weaving-mill=_Weaving-Mill

=== modified file 'tribes/atlanteans/constructionsite/conf'
--- tribes/atlanteans/constructionsite/conf	2011-09-12 17:29:32 +0000
+++ tribes/atlanteans/constructionsite/conf	2014-03-16 06:39:32 +0000
@@ -1,5 +1,5 @@
 # The constructionsite is a mess. Not nice and clean, but rather some
-# trunks laying around on piles, maybe some tools.
+# logs laying around on piles, maybe some tools.
 
 size=small   # dummy; overridden by building size
 buildable=no # counterintuitive, but correct: player can't build constructionsite

=== modified file 'tribes/atlanteans/crystalmine/conf'
--- tribes/atlanteans/crystalmine/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/crystalmine/conf	2014-03-16 06:39:32 +0000
@@ -4,12 +4,12 @@
 output=stone
 
 [buildcost]
-trunk=7
+log=7
 planks=4
 spidercloth=1
 
 [return_on_dismantle]
-trunk=3
+log=3
 planks=2
 
 [working positions]

=== modified file 'tribes/atlanteans/dungeon/conf'
--- tribes/atlanteans/dungeon/conf	2014-03-10 10:45:21 +0000
+++ tribes/atlanteans/dungeon/conf	2014-03-16 06:39:32 +0000
@@ -9,7 +9,7 @@
 quartz=2
 spidercloth=2
 gold=2
-trunk=4
+log=4
 
 [return_on_dismantle]
 planks=1
@@ -17,7 +17,7 @@
 diamond=1
 quartz=1
 gold=1
-trunk=1
+log=1
 
 [working positions]
 trainer=1

=== modified file 'tribes/atlanteans/farm/conf'
--- tribes/atlanteans/farm/conf	2014-03-10 10:45:21 +0000
+++ tribes/atlanteans/farm/conf	2014-03-16 06:39:32 +0000
@@ -2,13 +2,13 @@
 output=corn
 
 [buildcost]
-trunk=3
+log=3
 stone=2
 planks=2
 spidercloth=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=1
 planks=1
 

=== modified file 'tribes/atlanteans/fish_breeders_house/conf'
--- tribes/atlanteans/fish_breeders_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/fish_breeders_house/conf	2014-03-16 06:39:32 +0000
@@ -1,7 +1,7 @@
 size=small
 
 [buildcost]
-trunk=1
+log=1
 planks=1
 stone=1
 

=== modified file 'tribes/atlanteans/fishers_house/conf'
--- tribes/atlanteans/fishers_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/fishers_house/conf	2014-03-16 06:39:32 +0000
@@ -2,7 +2,7 @@
 output=fish
 
 [buildcost]
-trunk=1
+log=1
 planks=2
 
 [return_on_dismantle]

=== modified file 'tribes/atlanteans/foresters_house/conf'
--- tribes/atlanteans/foresters_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/foresters_house/conf	2014-03-16 06:39:32 +0000
@@ -1,20 +1,20 @@
 size=small
 
 [buildcost]
-trunk=1
+log=1
 planks=1
 stone=1
 
 [return_on_dismantle]
 stone=1
-trunk=1
+log=1
 
 [working positions]
 forester=1
 
 [aihints]
 space_consumer=true
-renews_map_resource=trunk
+renews_map_resource=log
 
 [programs]
 work=_Work

=== modified file 'tribes/atlanteans/goldmine/conf'
--- tribes/atlanteans/goldmine/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/goldmine/conf	2014-03-16 06:39:32 +0000
@@ -2,12 +2,12 @@
 output=goldore
 
 [buildcost]
-trunk=7
+log=7
 planks=4
 spidercloth=1
 
 [return_on_dismantle]
-trunk=3
+log=3
 planks=2
 
 [working positions]

=== modified file 'tribes/atlanteans/goldweaver/conf'
--- tribes/atlanteans/goldweaver/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/goldweaver/conf	2014-03-16 06:39:32 +0000
@@ -5,12 +5,12 @@
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 stone=1
 planks=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=1
 
 [working positions]

=== modified file 'tribes/atlanteans/guardhall/conf'
--- tribes/atlanteans/guardhall/conf	2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/guardhall/conf	2014-03-16 06:39:32 +0000
@@ -10,13 +10,13 @@
 defeated_you_string=_Your soldiers defeated the enemy at the Guardhall
 
 [buildcost]
-trunk=2
+log=2
 planks=3
 stone=4
 diamond=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 planks=1
 stone=3
 

=== modified file 'tribes/atlanteans/guardhouse/conf'
--- tribes/atlanteans/guardhouse/conf	2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/guardhouse/conf	2014-03-16 06:39:32 +0000
@@ -10,7 +10,7 @@
 defeated_you_string=_Your soldiers defeated the enemy at the Guardhouse
 
 [buildcost]
-trunk=1
+log=1
 planks=1
 stone=1
 

=== modified file 'tribes/atlanteans/high_tower/conf'
--- tribes/atlanteans/high_tower/conf	2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/high_tower/conf	2014-03-16 06:39:32 +0000
@@ -13,7 +13,7 @@
 defeated_you_string=_Your soldiers defeated the enemy at the High Tower
 
 [enhancement_cost]
-trunk=1
+log=1
 planks=1
 stone=2
 

=== modified file 'tribes/atlanteans/horsefarm/conf'
--- tribes/atlanteans/horsefarm/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/horsefarm/conf	2014-03-16 06:39:32 +0000
@@ -6,12 +6,12 @@
 recruitment=true
 
 [buildcost]
-trunk=2
+log=2
 stone=2
 planks=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=2
 
 [working positions]

=== modified file 'tribes/atlanteans/hunters_house/conf'
--- tribes/atlanteans/hunters_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/hunters_house/conf	2014-03-16 06:39:32 +0000
@@ -2,7 +2,7 @@
 output=meat
 
 [buildcost]
-trunk=1
+log=1
 planks=1
 stone=1
 

=== modified file 'tribes/atlanteans/ironmine/conf'
--- tribes/atlanteans/ironmine/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/ironmine/conf	2014-03-16 06:39:32 +0000
@@ -2,12 +2,12 @@
 output=ironore
 
 [buildcost]
-trunk=7
+log=7
 planks=4
 spidercloth=1
 
 [return_on_dismantle]
-trunk=2
+log=2
 planks=2
 
 [working positions]

=== modified file 'tribes/atlanteans/labyrinth/conf'
--- tribes/atlanteans/labyrinth/conf	2014-03-10 10:45:21 +0000
+++ tribes/atlanteans/labyrinth/conf	2014-03-16 06:39:32 +0000
@@ -3,7 +3,7 @@
 trainer_patience=20
 
 [buildcost]
-trunk=3
+log=3
 stone=4
 planks=5
 spidercloth=5
@@ -11,7 +11,7 @@
 quartz=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=3
 planks=2
 spidercloth=2

=== added directory 'tribes/atlanteans/log'
=== added file 'tribes/atlanteans/log/conf'
--- tribes/atlanteans/log/conf	1970-01-01 00:00:00 +0000
+++ tribes/atlanteans/log/conf	2014-03-16 06:39:32 +0000
@@ -0,0 +1,10 @@
+help=_Logs are the base for planks, which are used in nearly every building of the Atlanteans. Besides the sawmill, the charcoal burner, the toolsmithy and the smokery also need logs for their work.
+
+ 
+preciousness=14
+default_target_quantity=40
+
+[idle]
+pics=idle.png
+hotspot=5 13
+

=== added file 'tribes/atlanteans/log/idle.png'
Binary files tribes/atlanteans/log/idle.png	1970-01-01 00:00:00 +0000 and tribes/atlanteans/log/idle.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/atlanteans/log/menu.png'
Binary files tribes/atlanteans/log/menu.png	1970-01-01 00:00:00 +0000 and tribes/atlanteans/log/menu.png	2014-03-16 06:39:32 +0000 differ
=== modified file 'tribes/atlanteans/mill/conf'
--- tribes/atlanteans/mill/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/mill/conf	2014-03-16 06:39:32 +0000
@@ -3,12 +3,12 @@
 output=blackrootflour
 
 [buildcost]
-trunk=3
+log=3
 stone=3
 planks=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=2
 planks=1
 

=== modified file 'tribes/atlanteans/port/conf'
--- tribes/atlanteans/port/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/port/conf	2014-03-16 06:39:32 +0000
@@ -3,7 +3,7 @@
 heal_per_second=170
 
 [buildcost]
-trunk=3
+log=3
 planks=3
 stone=4
 diamond=1
@@ -12,7 +12,7 @@
 gold=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 planks=1
 stone=2
 spidercloth=1

=== modified file 'tribes/atlanteans/quarry/conf'
--- tribes/atlanteans/quarry/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/quarry/conf	2014-03-16 06:39:32 +0000
@@ -2,11 +2,11 @@
 output=stone
 
 [buildcost]
-trunk=2
+log=2
 planks=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 
 [working positions]
 stonecutter=1

=== modified file 'tribes/atlanteans/sawmill/conf'
--- tribes/atlanteans/sawmill/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/sawmill/conf	2014-03-16 06:39:32 +0000
@@ -5,25 +5,25 @@
 is_basic=true
 
 [buildcost]
-trunk=2
+log=2
 stone=3
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=2
 
 [working positions]
 sawyer=1
 
 [inputs]
-trunk=8
+log=8
 
 [programs]
 work=_Work
 
 [work]
 return=skipped unless economy needs planks
-consume=trunk:2
+consume=log:2
 sleep=16500 # much faster than barbarians hardener
 playFX=../../../sound/sawmill/sawmill 192
 animate=working 20000 # much more faster than barbarians hardener

=== modified file 'tribes/atlanteans/scouts_house/conf'
--- tribes/atlanteans/scouts_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/scouts_house/conf	2014-03-16 06:39:32 +0000
@@ -1,11 +1,11 @@
 size=small
 
 [buildcost]
-trunk=2
+log=2
 stone=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 
 [working positions]
 scout=1

=== modified file 'tribes/atlanteans/scripting/sc00_headquarters_medium.lua'
--- tribes/atlanteans/scripting/sc00_headquarters_medium.lua	2012-02-15 21:25:34 +0000
+++ tribes/atlanteans/scripting/sc00_headquarters_medium.lua	2014-03-16 06:39:32 +0000
@@ -24,7 +24,7 @@
          quartz = 9,
          stone = 50,
          spideryarn = 9,
-         trunk = 20,
+         log = 20,
          coal = 12,
          gold = 4,
          goldyarn = 6,
@@ -41,7 +41,7 @@
          smoked_fish = 6,
          smoked_meat = 6,
          water = 12,
-         bakingtray = 2,
+         bread_paddle = 2,
          bucket = 2,
          fire_tongs = 2,
          fishing_net = 4,
@@ -57,7 +57,7 @@
          light_trident = 5,
       },
       workers = {
-         armoursmith = 1,
+         armorsmith = 1,
          blackroot_farmer = 1,
          builder = 10,
          burner = 1,

=== modified file 'tribes/atlanteans/scripting/sc01_castle_village.lua'
--- tribes/atlanteans/scripting/sc01_castle_village.lua	2014-03-08 05:30:43 +0000
+++ tribes/atlanteans/scripting/sc01_castle_village.lua	2014-03-16 06:39:32 +0000
@@ -28,7 +28,7 @@
             quartz = 9,
             stone = 50,
             spideryarn = 9,
-            trunk = 13,
+            log = 13,
             goldyarn = 6,
             planks = 45,
             spidercloth = 5,
@@ -39,7 +39,7 @@
             fish = 3,
             meat = 3,
             water = 12,
-            bakingtray = 2,
+            bread_paddle = 2,
             bucket = 2,
             fire_tongs = 2,
             fishing_net = 4,
@@ -84,18 +84,18 @@
          wares = {bread = 4, smoked_fish = 3, smoked_meat = 3}
       })
 
-      place_building_in_region(plr, "armoursmithy", sf:region(11), {
+      place_building_in_region(plr, "armorsmithy", sf:region(11), {
          wares = { coal=4, gold =4 }
       })
       place_building_in_region(plr, "toolsmithy", sf:region(11), {
-         wares = { trunk = 6 }
+         wares = { log = 6 }
       })
       place_building_in_region(plr, "weaponsmithy", sf:region(11), {
          wares = { coal = 8, iron = 8 }
       })
 
       place_building_in_region(plr, "sawmill", sf:region(11), {
-         wares = { trunk = 1 }
+         wares = { log = 1 }
       })
    end) then
       plr:send_message(_"Not enough space", _(

=== modified file 'tribes/atlanteans/shipconstruction/conf'
--- tribes/atlanteans/shipconstruction/conf	2010-11-17 17:50:30 +0000
+++ tribes/atlanteans/shipconstruction/conf	2014-03-16 06:39:32 +0000
@@ -4,7 +4,7 @@
 
 [buildcost]
 planks=10
-trunk=2
+log=2
 spidercloth=4
 
 [program]

=== modified file 'tribes/atlanteans/shipyard/conf'
--- tribes/atlanteans/shipyard/conf	2013-07-23 17:50:05 +0000
+++ tribes/atlanteans/shipyard/conf	2014-03-16 06:39:32 +0000
@@ -5,13 +5,13 @@
 needs_water=true
 
 [buildcost]
-trunk=3
+log=3
 planks=2
 stone=3
 spidercloth=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 planks=1
 stone=2
 spidercloth=1
@@ -21,7 +21,7 @@
 
 [inputs]
 planks=10
-trunk=2
+log=2
 spidercloth=4
 
 [programs]

=== modified file 'tribes/atlanteans/small_tower/conf'
--- tribes/atlanteans/small_tower/conf	2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/small_tower/conf	2014-03-16 06:39:32 +0000
@@ -11,7 +11,7 @@
 defeated_you_string=_Your soldiers defeated the enemy at the Small Tower
 
 [buildcost]
-trunk=1
+log=1
 planks=2
 stone=2
 

=== modified file 'tribes/atlanteans/smelting_works/conf'
--- tribes/atlanteans/smelting_works/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/smelting_works/conf	2014-03-16 06:39:32 +0000
@@ -3,7 +3,7 @@
 output=gold
 
 [buildcost]
-trunk=1
+log=1
 stone=4
 planks=1
 spidercloth=1

=== modified file 'tribes/atlanteans/smokery/conf'
--- tribes/atlanteans/smokery/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/smokery/conf	2014-03-16 06:39:32 +0000
@@ -1,11 +1,11 @@
-#help: Will smoke food unless the economy has less trunks than the target quantity and at least the target quantity of the smoked food.
+#help: Will smoke food unless the economy has less logs than the target quantity and at least the target quantity of the smoked food.
 
 size=medium
 output=smoked_meat
 output=smoked_fish
 
 [buildcost]
-trunk=1
+log=1
 stone=4
 planks=1
 spidercloth=1
@@ -22,7 +22,7 @@
 [inputs]
 fish=4
 meat=4
-trunk=8
+log=8
 
 [programs]
 smoke_meat=_Smoke meat
@@ -30,15 +30,15 @@
 work=_Work
 
 [smoke_meat]
-return=skipped unless economy needs smoked_meat or not economy needs trunk
-consume=meat:2 trunk
+return=skipped unless economy needs smoked_meat or not economy needs log
+consume=meat:2 log
 sleep=30000
 animate=working 30000
 produce=smoked_meat:2
 
 [smoke_fish]
-return=skipped unless economy needs smoked_fish or not economy needs trunk
-consume=fish:2 trunk
+return=skipped unless economy needs smoked_fish or not economy needs log
+consume=fish:2 log
 sleep=30000
 animate=working 30000
 produce=smoked_fish:2

=== modified file 'tribes/atlanteans/spiderfarm/conf'
--- tribes/atlanteans/spiderfarm/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/spiderfarm/conf	2014-03-16 06:39:32 +0000
@@ -2,7 +2,7 @@
 output=spideryarn
 
 [buildcost]
-trunk=2
+log=2
 stone=2
 planks=2
 

=== modified file 'tribes/atlanteans/toolsmithy/conf'
--- tribes/atlanteans/toolsmithy/conf	2014-02-24 21:12:30 +0000
+++ tribes/atlanteans/toolsmithy/conf	2014-03-16 06:39:32 +0000
@@ -1,5 +1,5 @@
 size=medium
-output=bakingtray
+output=bread_paddle
 output=bucket
 output=fire_tongs
 output=fishing_net
@@ -13,7 +13,7 @@
 output=shovel
 
 [buildcost]
-trunk=1
+log=1
 stone=2
 planks=2
 spidercloth=1
@@ -31,11 +31,11 @@
 
 [inputs]
 iron=6
-trunk=6
+log=6
 spidercloth=4
 
 [programs]
-produce_bakingtray=_Produce bread paddle
+produce_bread_paddle=_Produce bread paddle
 produce_bucket=_Produce bucket
 produce_fire_tongs=_Produce fire tongs
 produce_fishing_net=_Produce fishing net
@@ -49,23 +49,23 @@
 produce_shovel=_Produce shovel
 work=_Work
 
-[produce_bakingtray]
-return=skipped unless economy needs bakingtray
-consume=iron trunk
+[produce_bread_paddle]
+return=skipped unless economy needs bread_paddle
+consume=iron log
 sleep=32000
 animate=working 35000
-produce=bakingtray
+produce=bread_paddle
 
 [produce_bucket]
 return=skipped unless economy needs bucket
-consume=iron trunk
+consume=iron log
 sleep=32000
 animate=working 35000
 produce=bucket
 
 [produce_fire_tongs]
 return=skipped unless economy needs fire_tongs
-consume=iron trunk
+consume=iron log
 sleep=32000
 animate=working 35000
 produce=fire_tongs
@@ -79,62 +79,62 @@
 
 [produce_hammer]
 return=skipped unless economy needs hammer
-consume=iron trunk
+consume=iron log
 sleep=32000
 animate=working 35000
 produce=hammer
 
 [produce_hook_pole]
 return=skipped unless economy needs hook_pole
-consume=iron trunk
+consume=iron log
 sleep=32000
 animate=working 35000
 produce=hook_pole
 
 [produce_hunting_bow]
 return=skipped unless economy needs hunting_bow
-consume=trunk spidercloth
+consume=log spidercloth
 sleep=32000
 animate=working 35000
 produce=hunting_bow
 
 [produce_milking_tongs]
 return=skipped unless economy needs milking_tongs
-consume=iron trunk
+consume=iron log
 sleep=32000
 animate=working 35000
 produce=milking_tongs
 
 [produce_pick]
 return=skipped unless economy needs pick
-consume=iron trunk
+consume=iron log
 sleep=32000
 animate=working 35000
 produce=pick
 
 [produce_saw]
 return=skipped unless economy needs saw
-consume=iron trunk
+consume=iron log
 sleep=32000
 animate=working 35000
 produce=saw
 
 [produce_scythe]
 return=skipped unless economy needs scythe
-consume=iron trunk
+consume=iron log
 sleep=32000
 animate=working 35000
 produce=scythe
 
 [produce_shovel]
 return=skipped unless economy needs shovel
-consume=iron trunk
+consume=iron log
 sleep=32000
 animate=working 35000
 produce=shovel
 
 [work]
-call=produce_bakingtray
+call=produce_bread_paddle
 call=produce_bucket
 call=produce_fire_tongs
 call=produce_fishing_net

=== modified file 'tribes/atlanteans/tower/conf'
--- tribes/atlanteans/tower/conf	2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/tower/conf	2014-03-16 06:39:32 +0000
@@ -12,13 +12,13 @@
 defeated_you_string=_Your soldiers defeated the enemy at the Tower
 
 [buildcost]
-trunk=2
+log=2
 planks=3
 stone=4
 spidercloth=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 planks=1
 stone=3
 

=== removed directory 'tribes/atlanteans/trunk'
=== removed file 'tribes/atlanteans/trunk/conf'
--- tribes/atlanteans/trunk/conf	2014-03-05 18:47:03 +0000
+++ tribes/atlanteans/trunk/conf	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-help=_Logs are the base for planks, which are used in nearly every building of the Atlanteans. Besides the sawmill, the charcoal burner, the toolsmithy and the smokery also need logs for their work.
-
- 
-preciousness=14
-default_target_quantity=40
-
-[idle]
-pics=idle.png
-hotspot=5 13
-

=== removed file 'tribes/atlanteans/trunk/idle.png'
Binary files tribes/atlanteans/trunk/idle.png	2010-08-01 14:35:38 +0000 and tribes/atlanteans/trunk/idle.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/atlanteans/trunk/menu.png'
Binary files tribes/atlanteans/trunk/menu.png	2009-11-11 20:19:30 +0000 and tribes/atlanteans/trunk/menu.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'tribes/atlanteans/warehouse/conf'
--- tribes/atlanteans/warehouse/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/warehouse/conf	2014-03-16 06:39:32 +0000
@@ -2,14 +2,14 @@
 heal_per_second=170
 
 [buildcost]
-trunk=2
+log=2
 planks=2
 stone=2
 quartz=1
 spidercloth=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 planks=1
 stone=1
 quartz=1

=== modified file 'tribes/atlanteans/weaponsmithy/conf'
--- tribes/atlanteans/weaponsmithy/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/weaponsmithy/conf	2014-03-16 06:39:32 +0000
@@ -9,14 +9,14 @@
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 stone=2
 planks=2
 spidercloth=1
 quartz=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=1
 planks=1
 

=== modified file 'tribes/atlanteans/weaving-mill/conf'
--- tribes/atlanteans/weaving-mill/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/weaving-mill/conf	2014-03-16 06:39:32 +0000
@@ -4,12 +4,12 @@
 output=golden_tabard
 
 [buildcost]
-trunk=3
+log=3
 stone=4
 planks=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=3
 planks=1
 

=== modified file 'tribes/atlanteans/well/conf'
--- tribes/atlanteans/well/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/well/conf	2014-03-16 06:39:32 +0000
@@ -2,12 +2,12 @@
 output=water
 
 [buildcost]
-trunk=2
+log=2
 stone=1
 planks=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=1
 
 [working positions]

=== modified file 'tribes/atlanteans/woodcutter/conf'
--- tribes/atlanteans/woodcutter/conf	2014-02-22 16:49:17 +0000
+++ tribes/atlanteans/woodcutter/conf	2014-03-16 06:39:32 +0000
@@ -12,7 +12,7 @@
 3=animation sawing 10000
 4=object fall
 5=animation idle 2000
-6=createware trunk
+6=createware log
 7=return
 
 [sawing]

=== modified file 'tribes/atlanteans/woodcutters_house/conf'
--- tribes/atlanteans/woodcutters_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/woodcutters_house/conf	2014-03-16 06:39:32 +0000
@@ -1,12 +1,12 @@
 size=small
-output=trunk
+output=log
 
 [buildcost]
-trunk=2
+log=2
 planks=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 planks=1
 
 [working positions]
@@ -14,7 +14,7 @@
 
 [aihints]
 is_basic=true
-trunkproducer=true
+logproducer=true
 
 [programs]
 work=_Work

=== renamed directory 'tribes/barbarians/axe' => 'tribes/barbarians/ax'
=== renamed directory 'tribes/barbarians/axefactory' => 'tribes/barbarians/axfactory'
=== renamed file 'tribes/barbarians/axefactory/axefactory_b_00.png' => 'tribes/barbarians/axfactory/axfactory_b_00.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_b_00_pc.png' => 'tribes/barbarians/axfactory/axfactory_b_00_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_b_01.png' => 'tribes/barbarians/axfactory/axfactory_b_01.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_b_01_pc.png' => 'tribes/barbarians/axfactory/axfactory_b_01_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_b_02.png' => 'tribes/barbarians/axfactory/axfactory_b_02.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_b_02_pc.png' => 'tribes/barbarians/axfactory/axfactory_b_02_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_b_03.png' => 'tribes/barbarians/axfactory/axfactory_b_03.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_b_03_pc.png' => 'tribes/barbarians/axfactory/axfactory_b_03_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_i_00.png' => 'tribes/barbarians/axfactory/axfactory_i_00.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_i_00_pc.png' => 'tribes/barbarians/axfactory/axfactory_i_00_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_u_00.png' => 'tribes/barbarians/axfactory/axfactory_u_00.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_u_00_pc.png' => 'tribes/barbarians/axfactory/axfactory_u_00_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_00.png' => 'tribes/barbarians/axfactory/axfactory_w_00.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_00_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_00_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_01.png' => 'tribes/barbarians/axfactory/axfactory_w_01.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_01_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_01_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_02.png' => 'tribes/barbarians/axfactory/axfactory_w_02.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_02_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_02_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_03.png' => 'tribes/barbarians/axfactory/axfactory_w_03.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_03_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_03_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_04.png' => 'tribes/barbarians/axfactory/axfactory_w_04.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_04_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_04_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_05.png' => 'tribes/barbarians/axfactory/axfactory_w_05.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_05_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_05_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_06.png' => 'tribes/barbarians/axfactory/axfactory_w_06.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_06_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_06_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_07.png' => 'tribes/barbarians/axfactory/axfactory_w_07.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_07_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_07_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_08.png' => 'tribes/barbarians/axfactory/axfactory_w_08.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_08_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_08_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_09.png' => 'tribes/barbarians/axfactory/axfactory_w_09.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_09_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_09_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_10.png' => 'tribes/barbarians/axfactory/axfactory_w_10.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_10_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_10_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_11.png' => 'tribes/barbarians/axfactory/axfactory_w_11.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_11_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_11_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_12.png' => 'tribes/barbarians/axfactory/axfactory_w_12.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_12_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_12_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_13.png' => 'tribes/barbarians/axfactory/axfactory_w_13.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_13_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_13_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_14.png' => 'tribes/barbarians/axfactory/axfactory_w_14.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_14_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_14_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_15.png' => 'tribes/barbarians/axfactory/axfactory_w_15.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_15_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_15_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_16.png' => 'tribes/barbarians/axfactory/axfactory_w_16.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_16_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_16_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_17.png' => 'tribes/barbarians/axfactory/axfactory_w_17.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_17_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_17_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_18.png' => 'tribes/barbarians/axfactory/axfactory_w_18.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_18_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_18_pc.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_19.png' => 'tribes/barbarians/axfactory/axfactory_w_19.png'
=== renamed file 'tribes/barbarians/axefactory/axefactory_w_19_pc.png' => 'tribes/barbarians/axfactory/axfactory_w_19_pc.png'
=== modified file 'tribes/barbarians/axfactory/conf'
--- tribes/barbarians/axefactory/conf	2014-03-03 20:59:04 +0000
+++ tribes/barbarians/axfactory/conf	2014-03-16 06:39:32 +0000
@@ -1,8 +1,8 @@
 size=medium
 buildable=no
-output=axe
-output=sharpaxe
-output=broadaxe
+output=ax
+output=sharpax
+output=broadax
 enhanced_building=yes
 enhancement=warmill
 
@@ -10,7 +10,7 @@
 build_material=false
 
 [enhancement_cost]
-trunk=1
+log=1
 blackwood=1
 raw_stone=2
 grout=1
@@ -29,61 +29,61 @@
 coal=8
 
 [programs]
-produce_axe=_Produce ax
-produce_sharpaxe=_Produce sharp ax
-produce_broadaxe=_Produce broad ax
+produce_ax=_Produce ax
+produce_sharpax=_Produce sharp ax
+produce_broadax=_Produce broad ax
 work=_Work
 
-[produce_axe]
-return=skipped unless economy needs axe
+[produce_ax]
+return=skipped unless economy needs ax
 consume=coal iron
 sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
-produce=axe
+produce=ax
 
-[produce_sharpaxe]
-return=skipped unless economy needs sharpaxe
+[produce_sharpax]
+return=skipped unless economy needs sharpax
 consume=coal iron:2
 sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
-produce=sharpaxe
+produce=sharpax
 
-[produce_broadaxe]
-return=skipped unless economy needs broadaxe
+[produce_broadax]
+return=skipped unless economy needs broadax
 consume=coal:2 iron:2
 sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
-produce=broadaxe
+produce=broadax
 
 [work]
-call=produce_axe
-call=produce_sharpaxe
-call=produce_broadaxe
+call=produce_ax
+call=produce_sharpax
+call=produce_broadax
 return=skipped
 
 [build]
-pics=axefactory_b_??.png  # ???
+pics=axfactory_b_??.png  # ???
 hotspot=57 76
 playercolor=true
 
 [unoccupied]
-pics=axefactory_u_??.png  # ???
+pics=axfactory_u_??.png  # ???
 hotspot=57 76
 playercolor=true
 
 [idle]
-pics=axefactory_i_??.png  # ???
+pics=axfactory_i_??.png  # ???
 hotspot=57 76
 playercolor=true
 
 [working]
-pics=axefactory_w_??.png  # ???
+pics=axfactory_w_??.png  # ???
 hotspot=57 76
 playercolor=true
 fps=10

=== modified file 'tribes/barbarians/axfactory/help.lua'
--- tribes/barbarians/axefactory/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/axfactory/help.lua	2014-03-16 06:39:32 +0000
@@ -8,25 +8,25 @@
 		--rt(h1(_"The Barbarian Axfactory")) ..
 	--Lore Section
 		rt(h2(_"Lore")) ..
-		rt("image=tribes/barbarians/axefactory/axefactory_i_00.png", p(
+		rt("image=tribes/barbarians/axfactory/axfactory_i_00.png", p(
 			_[[‘A new Warrior’s Ax brings forth the best in its wielder – or the worst in its maker.’]])) ..
 		rt("text-align=right",p("font-size=10 font-style=italic", _[[An old Barbarian proverb<br> meaning that you need to take some risks sometimes.]])) ..
 	--General Section
 		rt(h2(_"General")) ..
 		text_line(_"Purpose:", _"The Barbarian Axfactory is the intermediate production site in a series of three buildings. It is an upgrade from the Metal Workshop but doesn’t require additional qualification for the worker.") ..
-		rt("image=tribes/barbarians/axe/menu.png;tribes/barbarians/sharpaxe/menu.png;tribes/barbarians/broadaxe/menu.png image-align=right",p(_"It can make Axes, Sharp Axes and Broad Axes.")) ..
+		rt("image=tribes/barbarians/ax/menu.png;tribes/barbarians/sharpax/menu.png;tribes/barbarians/broadax/menu.png image-align=right",p(_"It can make axes, Sharp axes and Broad axes.")) ..
 		text_line(_"Working radius:", "n/a") ..
 		text_line(_"Conquer range:", "n/a") ..
 		text_line(_"Vision range:", "4") ..
 	--Dependencies
 		rt(h2(_"Dependencies")) ..
 		rt(h3(_"Incoming:")) ..
-		dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/iron/menu.png","tribes/barbarians/axefactory/menu.png"},p(_"%s from the Smelting Works":format(_"Iron"))) ..
-		dependencies({"tribes/barbarians/coalmine/menu.png;tribes/barbarians/burners_house/menu.png","tribes/barbarians/coal/menu.png","tribes/barbarians/axefactory/menu.png"}) ..
+		dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/iron/menu.png","tribes/barbarians/axfactory/menu.png"},p(_"%s from the Smelting Works":format(_"Iron"))) ..
+		dependencies({"tribes/barbarians/coalmine/menu.png;tribes/barbarians/burners_house/menu.png","tribes/barbarians/coal/menu.png","tribes/barbarians/axfactory/menu.png"}) ..
 		rt(p(_"%s from the Coal mine or the Charcoal Burner’s House":format(_"Coal"))) ..
 		rt(h3(_"Outgoing:")) ..
-		dependencies({"tribes/barbarians/axefactory/menu.png","tribes/barbarians/axe/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/soldier/menu.png"},p(_"Soldier")) ..
-		dependencies({"tribes/barbarians/axefactory/menu.png","tribes/barbarians/sharpaxe/menu.png;tribes/barbarians/broadaxe/menu.png","tribes/barbarians/trainingscamp/menu.png"},p(_"Training Camp")) ..
+		dependencies({"tribes/barbarians/axfactory/menu.png","tribes/barbarians/ax/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/soldier/menu.png"},p(_"Soldier")) ..
+		dependencies({"tribes/barbarians/axfactory/menu.png","tribes/barbarians/sharpax/menu.png;tribes/barbarians/broadax/menu.png","tribes/barbarians/trainingcamp/menu.png"},p(_"Training Camp")) ..
 	--Building Section
 		rt(h2(_"Building")) ..
 		text_line(_"Space required:",_"Medium plot","pics/medium.png") ..
@@ -36,19 +36,19 @@
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 1), 1) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 1), 1) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 1), 1) ..
 		rt(h3(_"Cost cumulative:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 2), 2) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 2), 2) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 2), 2) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 4), 4) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 1), 1) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 1), 1) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 1), 1) ..
 		text_line(_"Upgradeable to:",_"War Mill","tribes/barbarians/warmill/menu.png") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/baker/conf'
--- tribes/barbarians/baker/conf	2012-02-15 21:25:34 +0000
+++ tribes/barbarians/baker/conf	2014-03-16 06:39:32 +0000
@@ -1,7 +1,7 @@
 help=_Bakes bread for workers.
 
 [buildcost]
-bakingtray=1
+bread_paddle=1
 carrier=1
 
 [idle]

=== modified file 'tribes/barbarians/bakery/conf'
--- tribes/barbarians/bakery/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/bakery/conf	2014-03-16 06:39:32 +0000
@@ -5,13 +5,13 @@
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 blackwood=2
 raw_stone=2
 thatchreed=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 blackwood=1
 raw_stone=2
 

=== modified file 'tribes/barbarians/bakery/help.lua'
--- tribes/barbarians/bakery/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/bakery/help.lua	2014-03-16 06:39:32 +0000
@@ -28,7 +28,7 @@
 		dependencies({"tribes/barbarians/pittabread/menu.png","tribes/barbarians/inn/menu.png"},p(_"Inn")) ..
 		dependencies({"tribes/barbarians/pittabread/menu.png","tribes/barbarians/big_inn/menu.png"},p(_"Big Inn")) ..
 		dependencies({"tribes/barbarians/pittabread/menu.png","tribes/barbarians/battlearena/menu.png"},p(_"Battle Arena")) ..
-		dependencies({"tribes/barbarians/pittabread/menu.png","tribes/barbarians/trainingscamp/menu.png"},p(_"Training Camp")) ..
+		dependencies({"tribes/barbarians/pittabread/menu.png","tribes/barbarians/trainingcamp/menu.png"},p(_"Training Camp")) ..
 	--Building Section
 		rt(h2(_"Building")) ..
 		text_line(_"Space required:",_"Medium plot","pics/medium.png") ..
@@ -37,18 +37,18 @@
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 2), 2) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 2), 2) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 1), 1) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 1), 1) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..
 		rt(h3(_"Crew required:")) ..
 		image_line("tribes/barbarians/baker/menu.png", 1, p(_"Baker")) ..
-		text_line(_"Worker uses:", _"Bread Paddle","tribes/barbarians/bakingtray/menu.png") ..
+		text_line(_"Worker uses:", _"Bread Paddle","tribes/barbarians/bread_paddle/menu.png") ..
 		text_line(_"Experience levels:","n/a") ..
 	--Production Section
 		rt(h2(_"Production")) ..

=== removed directory 'tribes/barbarians/bakingtray'
=== removed file 'tribes/barbarians/bakingtray/conf'
--- tribes/barbarians/bakingtray/conf	2014-03-03 20:59:04 +0000
+++ tribes/barbarians/bakingtray/conf	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-help=_The bread paddle is the tool of the baker and each baker needs one. It is produced in the metal works like all other tools (but it ceases to be produced by the building if the metal works is enhanced to an axfactory and war mill).
-
-[idle]
-pics=idle.png
-hotspot=6 6

=== removed file 'tribes/barbarians/bakingtray/idle.png'
Binary files tribes/barbarians/bakingtray/idle.png	2012-02-15 21:25:34 +0000 and tribes/barbarians/bakingtray/idle.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/bakingtray/menu.png'
Binary files tribes/barbarians/bakingtray/menu.png	2012-02-20 15:54:26 +0000 and tribes/barbarians/bakingtray/menu.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'tribes/barbarians/battlearena/conf'
--- tribes/barbarians/battlearena/conf	2014-03-12 19:11:45 +0000
+++ tribes/barbarians/battlearena/conf	2014-03-16 06:39:32 +0000
@@ -3,14 +3,14 @@
 trainer_patience=3
 
 [buildcost]
-trunk=6
+log=6
 raw_stone=4
 grout=6
 gold=4
 thatchreed=3
 
 [return_on_dismantle]
-trunk=3
+log=3
 raw_stone=3
 grout=3
 gold=2

=== modified file 'tribes/barbarians/battlearena/help.lua'
--- tribes/barbarians/battlearena/help.lua	2014-03-09 17:33:02 +0000
+++ tribes/barbarians/battlearena/help.lua	2014-03-16 06:39:32 +0000
@@ -36,13 +36,13 @@
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 3), 3) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 6), 6) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 4), 4) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 6), 6) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 6), 6) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "gold", ngettext("%i Gold", "%i Gold", 2), 2) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 2), 2) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 3), 3) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 3), 3) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 3), 3) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== renamed directory 'tribes/barbarians/battleaxe' => 'tribes/barbarians/battleax'
=== modified file 'tribes/barbarians/big_inn/conf'
--- tribes/barbarians/big_inn/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/big_inn/conf	2014-03-16 06:39:32 +0000
@@ -6,7 +6,7 @@
 output=meal
 
 [enhancement_cost]
-trunk=1
+log=1
 grout=3
 thatchreed=2
 

=== added directory 'tribes/barbarians/bread_paddle'
=== added file 'tribes/barbarians/bread_paddle/conf'
--- tribes/barbarians/bread_paddle/conf	1970-01-01 00:00:00 +0000
+++ tribes/barbarians/bread_paddle/conf	2014-03-16 06:39:32 +0000
@@ -0,0 +1,5 @@
+help=_The bread paddle is the tool of the baker and each baker needs one. It is produced in the metal works like all other tools (but it ceases to be produced by the building if the metal works is enhanced to an axfactory and war mill).
+
+[idle]
+pics=idle.png
+hotspot=6 6

=== added file 'tribes/barbarians/bread_paddle/idle.png'
Binary files tribes/barbarians/bread_paddle/idle.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/bread_paddle/idle.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/bread_paddle/menu.png'
Binary files tribes/barbarians/bread_paddle/menu.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/bread_paddle/menu.png	2014-03-16 06:39:32 +0000 differ
=== modified file 'tribes/barbarians/brewery/conf'
--- tribes/barbarians/brewery/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/brewery/conf	2014-03-16 06:39:32 +0000
@@ -4,12 +4,12 @@
 output=strongbeer
 
 [enhancement_cost]
-trunk=3
+log=3
 raw_stone=1
 thatchreed=1
 
 [return_on_dismantle_on_enhanced]
-trunk=1
+log=1
 raw_stone=1
 
 [working positions]

=== renamed directory 'tribes/barbarians/broadaxe' => 'tribes/barbarians/broadax'
=== renamed directory 'tribes/barbarians/bronzeaxe' => 'tribes/barbarians/bronzeax'
=== modified file 'tribes/barbarians/burners_house/conf'
--- tribes/barbarians/burners_house/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/burners_house/conf	2014-03-16 06:39:32 +0000
@@ -5,26 +5,26 @@
 build_material=false
 
 [buildcost]
-trunk=3
+log=3
 grout=2
 thatchreed=2
 
 [return_on_dismantle]
-trunk=2
+log=2
 grout=1
 
 [working positions]
 burner=1
 
 [inputs]
-trunk=8
+log=8
 
 [programs]
 work=_Work
 
 [work]
-return=skipped unless economy needs coal or not economy needs trunk
-consume=trunk:6
+return=skipped unless economy needs coal or not economy needs log
+consume=log:6
 sleep=30000
 animate=working 90000 # charcoal fires are burning some days in real life
 produce=coal

=== modified file 'tribes/barbarians/cattlefarm/conf'
--- tribes/barbarians/cattlefarm/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/cattlefarm/conf	2014-03-16 06:39:32 +0000
@@ -6,7 +6,7 @@
 recruitment=true
 
 [buildcost]
-trunk=2
+log=2
 raw_stone=2
 blackwood=1
 

=== modified file 'tribes/barbarians/cattlefarm/help.lua'
--- tribes/barbarians/cattlefarm/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/cattlefarm/help.lua	2014-03-16 06:39:32 +0000
@@ -31,7 +31,7 @@
 		rt(h3(_"Build cost:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..

=== modified file 'tribes/barbarians/citadel/conf'
--- tribes/barbarians/citadel/conf	2013-10-29 10:55:20 +0000
+++ tribes/barbarians/citadel/conf	2014-03-16 06:39:32 +0000
@@ -14,13 +14,13 @@
 
 [enhancement_cost]
 blackwood=9
-trunk=5
+log=5
 raw_stone=4
 grout=2
 
 [return_on_dismantle_on_enhanced]
 blackwood=4
-trunk=2
+log=2
 raw_stone=3
 grout=1
 

=== modified file 'tribes/barbarians/coalmine/conf'
--- tribes/barbarians/coalmine/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/coalmine/conf	2014-03-16 06:39:32 +0000
@@ -3,11 +3,11 @@
 enhancement=deep_coalmine
 
 [buildcost]
-trunk=4
+log=4
 raw_stone=2
 
 [return_on_dismantle]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]

=== modified file 'tribes/barbarians/coalmine/help.lua'
--- tribes/barbarians/coalmine/help.lua	2014-03-08 05:30:43 +0000
+++ tribes/barbarians/coalmine/help.lua	2014-03-16 06:39:32 +0000
@@ -29,7 +29,7 @@
 		dependencies({"tribes/barbarians/big_inn/menu.png","tribes/barbarians/ration/menu.png","tribes/barbarians/coalmine/menu.png"}, p(_"%s from a Big Inn":format(_"Ration"))) ..
 		rt(h3(_"Outgoing:")) ..
 		dependencies({"tribes/barbarians/resi_coal2/resi_00.png","tribes/barbarians/coalmine/menu.png","tribes/barbarians/coal/menu.png"}, p(_"Coal")) ..
-		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/axefactory/menu.png"}, p(_"Axfactory")) ..
+		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/axfactory/menu.png"}, p(_"Axfactory")) ..
 		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/warmill/menu.png"}, p(_"War Mill")) ..
 		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/helmsmithy/menu.png"}, p(_"Helm Smithy")) ..
 		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/smelting_works/menu.png"}, p(_"Smelting Works")) ..
@@ -40,10 +40,10 @@
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:",_"Deep Coal Mine","tribes/barbarians/deep_coalmine/menu.png") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/conf'
--- tribes/barbarians/conf	2014-03-12 19:11:45 +0000
+++ tribes/barbarians/conf	2014-03-16 06:39:32 +0000
@@ -10,9 +10,9 @@
 icon=pics/icon.png
 # Wares and workers positions in wares window. Columns are separated by ;,
 # Entries in the columns separated by ,
-wares_order= raw_stone,trunk, blackwood, grout, thatchreed, cloth; fish, meat, water, wheat, pittabread, beer, strongbeer, ration, snack, meal; coal, ironore, iron, goldstone, gold; pick, felling_axe, shovel, hammer, fishing_rod, hunting_spear, scythe, bakingtray, kitchen_tools, fire_tongs; axe, sharpaxe, broadaxe, bronzeaxe, battleaxe, warriorsaxe, helm , mask , warhelmet
+wares_order= raw_stone,log, blackwood, grout, thatchreed, cloth; fish, meat, water, wheat, pittabread, beer, strongbeer, ration, snack, meal; coal, ironore, iron, goldore, gold; pick, felling_ax, shovel, hammer, fishing_rod, hunting_spear, scythe, bread_paddle, kitchen_tools, fire_tongs; ax, sharpax, broadax, bronzeax, battleax, warriorsax, helm , mask , warhelm
 
-workers_order=carrier, ox, cattlebreeder; stonemason, lumberjack, ranger, builder, lime-burner, ferner, weaver, shipwright; fisher , hunter , gamekeeper, farmer, baker, brewer, master-brewer, innkeeper; geologist,miner, chief-miner, master-miner, burner, smelter; blacksmith, master-blacksmith; soldier, trainer, helmsmith, scout
+workers_order=carrier, ox, cattlebreeder; stonemason, lumberjack, ranger, builder, lime-burner, gardener, weaver, shipwright; fisher , hunter , gamekeeper, farmer, baker, brewer, master-brewer, innkeeper; geologist,miner, chief-miner, master-miner, burner, smelter; blacksmith, master-blacksmith; soldier, trainer, helmsmith, scout
 
 
 [frontier]
@@ -58,21 +58,21 @@
 wildboar=_Wild Boar
 
 [ware types]
-axe=_Ax
-bakingtray=_Bread Paddle
-battleaxe=_Battle Ax
+ax=_Ax
+bread_paddle=_Bread Paddle
+battleax=_Battle Ax
 beer=_Beer
 blackwood=_Blackwood
-broadaxe=_Broad Ax
-bronzeaxe=_Bronze Ax
+broadax=_Broad Ax
+bronzeax=_Bronze Ax
 cloth=_Cloth
 coal=_Coal
-felling_axe=_Felling Ax
+felling_ax=_Felling Ax
 fire_tongs=_Fire Tongs
 fish=_Fish
 fishing_rod=_Fishing Rod
 gold=_Gold
-goldstone=_Gold Ore
+goldore=_Gold Ore
 grout=_Grout
 hammer=_Hammer
 helm=_Helmet
@@ -88,14 +88,14 @@
 ration=_Ration
 raw_stone=_Raw Stone
 scythe=_Scythe
-sharpaxe=_Sharp Ax
+sharpax=_Sharp Ax
 shovel=_Shovel
 snack=_Snack
 strongbeer=_Strong Beer
 thatchreed=_Thatch Reed
-trunk=_Log
-warhelmet=_Warhelm
-warriorsaxe=_Warrior’s Ax
+log=_Log
+warhelm=_Warhelm
+warriorsax=_Warrior’s Ax
 water=_Water
 wheat=_Wheat
 
@@ -117,7 +117,7 @@
 master-miner=_Master Miner
 chief-miner=_Chief Miner
 farmer=_Farmer
-ferner=_Gardener
+gardener=_Gardener
 fisher=_Fisher
 gamekeeper=_Gamekeeper
 geologist=_Geologist
@@ -177,7 +177,7 @@
 scouts_hut=_Scout’s Hut
 hardener=_Wood Hardener
 lime_kiln=_Lime Kiln
-fernery=_Reed Yard
+reed_yard=_Reed Yard
 bakery=_Bakery
 brewery=_Brewery
 micro-brewery=_Micro Brewery
@@ -188,7 +188,7 @@
 smelting_works=_Smelting Works
 shipyard=_Shipyard
 warmill=_War Mill
-axefactory=_Axfactory
+axfactory=_Axfactory
 metalworks=_Metal Workshop
 cattlefarm=_Cattle Farm
 weaving-mill=_Weaving-Mill
@@ -214,7 +214,7 @@
 
 [trainingsite types]
 battlearena=_Battle Arena
-trainingscamp=_Training Camp
+trainingcamp=_Training Camp
 
 [initializations]
 headquarters_medium=_Headquarters Medium

=== modified file 'tribes/barbarians/constructionsite/conf'
--- tribes/barbarians/constructionsite/conf	2010-08-01 14:35:38 +0000
+++ tribes/barbarians/constructionsite/conf	2014-03-16 06:39:32 +0000
@@ -1,5 +1,5 @@
 # The constructionsite is a mess. Not nice and clean, but rather some
-# trunks laying around on piles, maybe some tools.
+# logs laying around on piles, maybe some tools.
 
 size=small   # dummy; overridden by building size
 buildable=no # counterintuitive, but correct: player can't build constructionsite

=== modified file 'tribes/barbarians/deep_coalmine/conf'
--- tribes/barbarians/deep_coalmine/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/deep_coalmine/conf	2014-03-16 06:39:32 +0000
@@ -5,11 +5,11 @@
 enhancement=deeper_coalmine
 
 [enhancement_cost]
-trunk=4
+log=4
 raw_stone=2
 
 [return_on_dismantle_on_enhanced]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]

=== modified file 'tribes/barbarians/deep_coalmine/help.lua'
--- tribes/barbarians/deep_coalmine/help.lua	2014-03-08 05:30:43 +0000
+++ tribes/barbarians/deep_coalmine/help.lua	2014-03-16 06:39:32 +0000
@@ -28,7 +28,7 @@
 		dependencies({"tribes/barbarians/big_inn/menu.png","tribes/barbarians/snack/menu.png","tribes/barbarians/deep_coalmine/menu.png"}, p(_"%s from a Big Inn":format(_"Snack"))) ..
 		rt(h3(_"Outgoing:")) ..
 		dependencies({"tribes/barbarians/resi_coal2/resi_00.png","tribes/barbarians/deep_coalmine/menu.png","tribes/barbarians/coal/menu.png"}, p(_"Coal")) ..
-		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/axefactory/menu.png"}, p(_"Axfactory")) ..
+		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/axfactory/menu.png"}, p(_"Axfactory")) ..
 		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/warmill/menu.png"}, p(_"War Mill")) ..
 		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/helmsmithy/menu.png"}, p(_"Helm Smithy")) ..
 		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/smelting_works/menu.png"}, p(_"Smelting Works")) ..
@@ -39,13 +39,13 @@
 		text_line(_"Upgraded from:",_"Coal mine","tribes/barbarians/coalmine/menu.png") ..
 		rt(h3(_"Upgrade cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Cost cumulative:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 4), 4) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 8), 8) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 8), 8) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		text_line(_"Upgradeable to:",_"Deeper Coal Mine","tribes/barbarians/deeper_coalmine/menu.png") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/deep_goldmine/conf'
--- tribes/barbarians/deep_goldmine/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/deep_goldmine/conf	2014-03-16 06:39:32 +0000
@@ -1,15 +1,15 @@
 size=mine
 buildable=no
 enhanced_building=yes
-output=goldstone
+output=goldore
 enhancement=deeper_goldmine
 
 [enhancement_cost]
-trunk=4
+log=4
 raw_stone=2
 
 [return_on_dismantle_on_enhanced]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]
@@ -31,10 +31,10 @@
 consume=snack
 animate=working 18000
 mine=gold 2 66 5
-produce=goldstone:2
+produce=goldore:2
 animate=working 18000
 mine=gold 2 66 5
-produce=goldstone:2
+produce=goldore:2
 
 [idle]
 pics=deep_goldmine_i_??.png

=== modified file 'tribes/barbarians/deep_goldmine/help.lua'
--- tribes/barbarians/deep_goldmine/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/deep_goldmine/help.lua	2014-03-16 06:39:32 +0000
@@ -15,7 +15,7 @@
 		rt(h2(_"General")) ..
 		rt(p(_"A %1$s exploits only %2$s of the resource. From there on out, it will only have a 5%% chance of finding %3$s.":bformat(_"Deep Gold Mine","2/3",_"Gold Ore"))) ..
 		rt(h3(_"Purpose:")) ..
-		image_line("tribes/barbarians/goldstone/menu.png", 1, p(_"Dig %s out of the ground in mountain terrain.":format(_"Gold Ore"))) ..
+		image_line("tribes/barbarians/goldore/menu.png", 1, p(_"Dig %s out of the ground in mountain terrain.":format(_"Gold Ore"))) ..
 		text_line(_"Working radius:", "2") ..
 		text_line(_"Conquer range:", "n/a") ..
 		text_line(_"Vision range:", "4") ..
@@ -25,8 +25,8 @@
 		dependencies({"tribes/barbarians/inn/menu.png","tribes/barbarians/snack/menu.png","tribes/barbarians/deep_goldmine/menu.png"}, p(_"%s from an Inn":format(_"Snack"))) ..
 		dependencies({"tribes/barbarians/big_inn/menu.png","tribes/barbarians/snack/menu.png","tribes/barbarians/deep_goldmine/menu.png"}, p(_"%s from a Big Inn":format(_"Snack"))) ..
 		rt(h3(_"Outgoing:")) ..
-		dependencies({"tribes/barbarians/resi_gold2/resi_00.png","tribes/barbarians/deep_goldmine/menu.png","tribes/barbarians/goldstone/menu.png"}, p(_"Gold Ore")) ..
-		dependencies({"tribes/barbarians/goldstone/menu.png","tribes/barbarians/smelting_works/menu.png"}, p(_"Smelting Works")) ..
+		dependencies({"tribes/barbarians/resi_gold2/resi_00.png","tribes/barbarians/deep_goldmine/menu.png","tribes/barbarians/goldore/menu.png"}, p(_"Gold Ore")) ..
+		dependencies({"tribes/barbarians/goldore/menu.png","tribes/barbarians/smelting_works/menu.png"}, p(_"Smelting Works")) ..
 		rt(p(_"%s always goes to the %s. It has no other use.":format(_"Gold Ore",_"Smelting Works"))) ..
 	--Building Section
 		rt(h2(_"Building")) ..
@@ -34,13 +34,13 @@
 		text_line(_"Upgraded from:",_"Gold Mine","tribes/barbarians/goldmine/menu.png") ..
 		rt(h3(_"Upgrade cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Cost cumulative:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 4), 4) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 8), 8) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 8), 8) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		text_line(_"Upgradeable to:",_"Deeper Gold Mine","tribes/barbarians/deeper_goldmine/menu.png") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/deep_oremine/conf'
--- tribes/barbarians/deep_oremine/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/deep_oremine/conf	2014-03-16 06:39:32 +0000
@@ -5,11 +5,11 @@
 enhancement=deeper_oremine
 
 [enhancement_cost]
-trunk=4
+log=4
 raw_stone=2
 
 [return_on_dismantle_on_enhanced]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]

=== modified file 'tribes/barbarians/deep_oremine/help.lua'
--- tribes/barbarians/deep_oremine/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/deep_oremine/help.lua	2014-03-16 06:39:32 +0000
@@ -34,13 +34,13 @@
 		text_line(_"Upgraded from:",_"Iron Ore Mine","tribes/barbarians/oremine/menu.png") ..
 		rt(h3(_"Upgrade cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Cost cumulative:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 4), 4) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 8), 8) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 8), 8) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		text_line(_"Upgradeable to:",_"Deeper Iron Ore Mine","tribes/barbarians/deeper_oremine/menu.png") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/deeper_coalmine/conf'
--- tribes/barbarians/deeper_coalmine/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/deeper_coalmine/conf	2014-03-16 06:39:32 +0000
@@ -4,11 +4,11 @@
 output=coal
 
 [enhancement_cost]
-trunk=4
+log=4
 raw_stone=2
 
 [return_on_dismantle_on_enhanced]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]

=== modified file 'tribes/barbarians/deeper_coalmine/help.lua'
--- tribes/barbarians/deeper_coalmine/help.lua	2014-03-08 05:30:43 +0000
+++ tribes/barbarians/deeper_coalmine/help.lua	2014-03-16 06:39:32 +0000
@@ -27,7 +27,7 @@
 		dependencies({"tribes/barbarians/big_inn/menu.png","tribes/barbarians/meal/menu.png","tribes/barbarians/deeper_coalmine/menu.png"}, p(_"%s from a Big Inn":format(_"Meal"))) ..
 		rt(h3(_"Outgoing:")) ..
 		dependencies({"tribes/barbarians/resi_coal2/resi_00.png","tribes/barbarians/deeper_coalmine/menu.png","tribes/barbarians/coal/menu.png"}, p(_"Coal")) ..
-		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/axefactory/menu.png"}, p(_"Axfactory")) ..
+		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/axfactory/menu.png"}, p(_"Axfactory")) ..
 		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/warmill/menu.png"}, p(_"War Mill")) ..
 		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/helmsmithy/menu.png"}, p(_"Helm Smithy")) ..
 		dependencies({"tribes/barbarians/coal/menu.png","tribes/barbarians/smelting_works/menu.png"}, p(_"Smelting Works")) ..
@@ -38,13 +38,13 @@
 		text_line(_"Upgraded from:",_"Deep Coal Mine","tribes/barbarians/deep_coalmine/menu.png") ..
 		rt(h3(_"Upgrade cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Cost cumulative:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 6), 6) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 12), 12) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 12), 12) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 3), 3) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 6), 6) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 6), 6) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/deeper_goldmine/conf'
--- tribes/barbarians/deeper_goldmine/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/deeper_goldmine/conf	2014-03-16 06:39:32 +0000
@@ -1,14 +1,14 @@
 size=mine
 buildable=no
 enhanced_building=yes
-output=goldstone
+output=goldore
 
 [enhancement_cost]
-trunk=4
+log=4
 raw_stone=2
 
 [return_on_dismantle_on_enhanced]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]
@@ -30,10 +30,10 @@
 consume=meal
 animate=working 16000
 mine=gold 2 100 10
-produce=goldstone:2
+produce=goldore:2
 animate=working 18000
 mine=gold 2 100 10
-produce=goldstone:2
+produce=goldore:2
 
 [idle]
 pics=deeper_goldmine_i_??.png

=== modified file 'tribes/barbarians/deeper_goldmine/help.lua'
--- tribes/barbarians/deeper_goldmine/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/deeper_goldmine/help.lua	2014-03-16 06:39:32 +0000
@@ -15,7 +15,7 @@
 		rt(h2(_"General")) ..
 		rt(p(_"A %1$s exploits all of the resource down to the deepest level. But even after having done so, it will still have a %2$s chance of finding some more %3$s.":bformat(_"Deeper Gold Mine","10%",_"Gold Ore"))) ..
 		rt(h3(_"Purpose:")) ..
-		image_line("tribes/barbarians/goldstone/menu.png", 1, p(_"Dig %s out of the ground in mountain terrain.":format(_"Gold Ore"))) ..
+		image_line("tribes/barbarians/goldore/menu.png", 1, p(_"Dig %s out of the ground in mountain terrain.":format(_"Gold Ore"))) ..
 		text_line(_"Working radius:", "2") ..
 		text_line(_"Conquer range:", "n/a") ..
 		text_line(_"Vision range:", "4") ..
@@ -24,8 +24,8 @@
 		rt(h3(_"Incoming:")) ..
 		dependencies({"tribes/barbarians/big_inn/menu.png","tribes/barbarians/meal/menu.png","tribes/barbarians/deeper_goldmine/menu.png"}, p(_"%s from a Big Inn":format(_"Meal"))) ..
 		rt(h3(_"Outgoing:")) ..
-		dependencies({"tribes/barbarians/resi_gold2/resi_00.png","tribes/barbarians/deeper_goldmine/menu.png","tribes/barbarians/goldstone/menu.png"}, p(_"Gold Ore")) ..
-		dependencies({"tribes/barbarians/goldstone/menu.png","tribes/barbarians/smelting_works/menu.png"}, p(_"Smelting Works")) ..
+		dependencies({"tribes/barbarians/resi_gold2/resi_00.png","tribes/barbarians/deeper_goldmine/menu.png","tribes/barbarians/goldore/menu.png"}, p(_"Gold Ore")) ..
+		dependencies({"tribes/barbarians/goldore/menu.png","tribes/barbarians/smelting_works/menu.png"}, p(_"Smelting Works")) ..
 		rt(p(_"%s always goes to the %s. It has no other use.":format(_"Gold Ore",_"Smelting Works"))) ..
 	--Building Section
 		rt(h2(_"Building")) ..
@@ -33,13 +33,13 @@
 		text_line(_"Upgraded from:",_"Deep Gold Mine","tribes/barbarians/deep_goldmine/menu.png") ..
 		rt(h3(_"Upgrade cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Cost cumulative:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 6), 6) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 12), 12) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 12), 12) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 3), 3) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 6), 6) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 6), 6) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/deeper_oremine/conf'
--- tribes/barbarians/deeper_oremine/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/deeper_oremine/conf	2014-03-16 06:39:32 +0000
@@ -4,11 +4,11 @@
 output=ironore
 
 [enhancement_cost]
-trunk=4
+log=4
 raw_stone=2
 
 [return_on_dismantle_on_enhanced]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]

=== modified file 'tribes/barbarians/deeper_oremine/help.lua'
--- tribes/barbarians/deeper_oremine/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/deeper_oremine/help.lua	2014-03-16 06:39:32 +0000
@@ -33,13 +33,13 @@
 		text_line(_"Upgraded from:",_"Deep Iron Ore Mine","tribes/barbarians/deep_oremine/menu.png") ..
 		rt(h3(_"Upgrade cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Cost cumulative:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 6), 6) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 12), 12) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 12), 12) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 3), 3) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 6), 6) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 6), 6) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/donjon/conf'
--- tribes/barbarians/donjon/conf	2013-10-29 10:55:20 +0000
+++ tribes/barbarians/donjon/conf	2014-03-16 06:39:32 +0000
@@ -13,7 +13,7 @@
 
 [buildcost]
 blackwood=7
-trunk=1
+log=1
 raw_stone=4
 
 [return_on_dismantle]

=== modified file 'tribes/barbarians/farm/conf'
--- tribes/barbarians/farm/conf	2014-03-10 10:45:21 +0000
+++ tribes/barbarians/farm/conf	2014-03-16 06:39:32 +0000
@@ -5,12 +5,12 @@
 space_consumer=true
 
 [buildcost]
-trunk=4
+log=4
 blackwood=1
 raw_stone=3
 
 [return_on_dismantle]
-trunk=1
+log=1
 blackwood=1
 raw_stone=2
 

=== modified file 'tribes/barbarians/farm/help.lua'
--- tribes/barbarians/farm/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/farm/help.lua	2014-03-16 06:39:32 +0000
@@ -33,11 +33,11 @@
 		rt(h3(_"Build cost:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 3), 3) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== renamed directory 'tribes/barbarians/felling_axe' => 'tribes/barbarians/felling_ax'
=== removed directory 'tribes/barbarians/ferner'
=== removed file 'tribes/barbarians/ferner/conf'
--- tribes/barbarians/ferner/conf	2014-03-12 19:11:45 +0000
+++ tribes/barbarians/ferner/conf	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-help=_Grows thatch reed.
-program=plantreed
-program=harvestreed
-
-[buildcost]
-carrier=1
-shovel=1
-
-[plantreed]
-0=findspace size:any radius:1
-1=walk coords
-2=animation reedplanting 1500 # Play a planting animation
-3=plant tribe:reed0t
-4=animation reedplanting 1500
-5=return
-
-[harvestreed]
-0=findobject attrib:grown_reed radius:1
-1=walk object
-2=animation harvesting 12000  #4sec animation cycle
-3=object harvest
-4=animation harvesting 1
-5=createware thatchreed
-6=return
-
-[idle]
-pics=idle_??.png
-hotspot=-4 11
-playercolor=true
-
-[walk]
-dirpics=walk_!!_??.png
-hotspot=8 23
-playercolor=true
-fps=10
-
-[walkload]
-dirpics=walkload_!!_??.png
-hotspot=7 23
-playercolor=true
-fps=10
-
-[reedplanting]
-pics=plantreed_??.png
-hotspot=10 21
-playercolor=true
-fps=10
-
-[harvesting]
-pics=harvest_??.png
-hotspot=10 22
-playercolor=true
-fps=5

=== removed file 'tribes/barbarians/ferner/harvest_00.png'
Binary files tribes/barbarians/ferner/harvest_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_00_pc.png'
Binary files tribes/barbarians/ferner/harvest_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_01.png'
Binary files tribes/barbarians/ferner/harvest_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_01_pc.png'
Binary files tribes/barbarians/ferner/harvest_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_02.png'
Binary files tribes/barbarians/ferner/harvest_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_02_pc.png'
Binary files tribes/barbarians/ferner/harvest_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_03.png'
Binary files tribes/barbarians/ferner/harvest_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_03_pc.png'
Binary files tribes/barbarians/ferner/harvest_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_04.png'
Binary files tribes/barbarians/ferner/harvest_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_04_pc.png'
Binary files tribes/barbarians/ferner/harvest_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_05.png'
Binary files tribes/barbarians/ferner/harvest_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_05_pc.png'
Binary files tribes/barbarians/ferner/harvest_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_06.png'
Binary files tribes/barbarians/ferner/harvest_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_06_pc.png'
Binary files tribes/barbarians/ferner/harvest_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_07.png'
Binary files tribes/barbarians/ferner/harvest_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_07_pc.png'
Binary files tribes/barbarians/ferner/harvest_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_08.png'
Binary files tribes/barbarians/ferner/harvest_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_08_pc.png'
Binary files tribes/barbarians/ferner/harvest_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_09.png'
Binary files tribes/barbarians/ferner/harvest_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_09_pc.png'
Binary files tribes/barbarians/ferner/harvest_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_10.png'
Binary files tribes/barbarians/ferner/harvest_10.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_10.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_10_pc.png'
Binary files tribes/barbarians/ferner/harvest_10_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_10_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_11.png'
Binary files tribes/barbarians/ferner/harvest_11.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_11.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_11_pc.png'
Binary files tribes/barbarians/ferner/harvest_11_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_11_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_12.png'
Binary files tribes/barbarians/ferner/harvest_12.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_12.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_12_pc.png'
Binary files tribes/barbarians/ferner/harvest_12_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_12_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_13.png'
Binary files tribes/barbarians/ferner/harvest_13.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_13.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_13_pc.png'
Binary files tribes/barbarians/ferner/harvest_13_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_13_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_14.png'
Binary files tribes/barbarians/ferner/harvest_14.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_14.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_14_pc.png'
Binary files tribes/barbarians/ferner/harvest_14_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_14_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_15.png'
Binary files tribes/barbarians/ferner/harvest_15.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_15.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_15_pc.png'
Binary files tribes/barbarians/ferner/harvest_15_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_15_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_16.png'
Binary files tribes/barbarians/ferner/harvest_16.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_16.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_16_pc.png'
Binary files tribes/barbarians/ferner/harvest_16_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_16_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_17.png'
Binary files tribes/barbarians/ferner/harvest_17.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_17.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_17_pc.png'
Binary files tribes/barbarians/ferner/harvest_17_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_17_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_18.png'
Binary files tribes/barbarians/ferner/harvest_18.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_18.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_18_pc.png'
Binary files tribes/barbarians/ferner/harvest_18_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_18_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_19.png'
Binary files tribes/barbarians/ferner/harvest_19.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_19.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/harvest_19_pc.png'
Binary files tribes/barbarians/ferner/harvest_19_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/harvest_19_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/idle_00.png'
Binary files tribes/barbarians/ferner/idle_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/idle_00_pc.png'
Binary files tribes/barbarians/ferner/idle_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/idle_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/menu.png'
Binary files tribes/barbarians/ferner/menu.png	2010-04-06 01:43:54 +0000 and tribes/barbarians/ferner/menu.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_00.png'
Binary files tribes/barbarians/ferner/plantflax_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_00_pc.png'
Binary files tribes/barbarians/ferner/plantflax_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_01.png'
Binary files tribes/barbarians/ferner/plantflax_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_01_pc.png'
Binary files tribes/barbarians/ferner/plantflax_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_02.png'
Binary files tribes/barbarians/ferner/plantflax_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_02_pc.png'
Binary files tribes/barbarians/ferner/plantflax_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_03.png'
Binary files tribes/barbarians/ferner/plantflax_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_03_pc.png'
Binary files tribes/barbarians/ferner/plantflax_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_04.png'
Binary files tribes/barbarians/ferner/plantflax_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_04_pc.png'
Binary files tribes/barbarians/ferner/plantflax_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_05.png'
Binary files tribes/barbarians/ferner/plantflax_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_05_pc.png'
Binary files tribes/barbarians/ferner/plantflax_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_06.png'
Binary files tribes/barbarians/ferner/plantflax_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_06_pc.png'
Binary files tribes/barbarians/ferner/plantflax_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_07.png'
Binary files tribes/barbarians/ferner/plantflax_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_07_pc.png'
Binary files tribes/barbarians/ferner/plantflax_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_08.png'
Binary files tribes/barbarians/ferner/plantflax_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_08_pc.png'
Binary files tribes/barbarians/ferner/plantflax_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_09.png'
Binary files tribes/barbarians/ferner/plantflax_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_09_pc.png'
Binary files tribes/barbarians/ferner/plantflax_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_10.png'
Binary files tribes/barbarians/ferner/plantflax_10.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_10.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_10_pc.png'
Binary files tribes/barbarians/ferner/plantflax_10_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_10_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_11.png'
Binary files tribes/barbarians/ferner/plantflax_11.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_11.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_11_pc.png'
Binary files tribes/barbarians/ferner/plantflax_11_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_11_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_12.png'
Binary files tribes/barbarians/ferner/plantflax_12.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_12.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_12_pc.png'
Binary files tribes/barbarians/ferner/plantflax_12_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_12_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_13.png'
Binary files tribes/barbarians/ferner/plantflax_13.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_13.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_13_pc.png'
Binary files tribes/barbarians/ferner/plantflax_13_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_13_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_14.png'
Binary files tribes/barbarians/ferner/plantflax_14.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_14.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_14_pc.png'
Binary files tribes/barbarians/ferner/plantflax_14_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_14_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_15.png'
Binary files tribes/barbarians/ferner/plantflax_15.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_15.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_15_pc.png'
Binary files tribes/barbarians/ferner/plantflax_15_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_15_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_16.png'
Binary files tribes/barbarians/ferner/plantflax_16.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_16.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_16_pc.png'
Binary files tribes/barbarians/ferner/plantflax_16_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_16_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_17.png'
Binary files tribes/barbarians/ferner/plantflax_17.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_17.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_17_pc.png'
Binary files tribes/barbarians/ferner/plantflax_17_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_17_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_18.png'
Binary files tribes/barbarians/ferner/plantflax_18.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_18.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_18_pc.png'
Binary files tribes/barbarians/ferner/plantflax_18_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_18_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_19.png'
Binary files tribes/barbarians/ferner/plantflax_19.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_19.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_19_pc.png'
Binary files tribes/barbarians/ferner/plantflax_19_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_19_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_20.png'
Binary files tribes/barbarians/ferner/plantflax_20.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_20.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_20_pc.png'
Binary files tribes/barbarians/ferner/plantflax_20_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_20_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_21.png'
Binary files tribes/barbarians/ferner/plantflax_21.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_21.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_21_pc.png'
Binary files tribes/barbarians/ferner/plantflax_21_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_21_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_22.png'
Binary files tribes/barbarians/ferner/plantflax_22.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_22.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_22_pc.png'
Binary files tribes/barbarians/ferner/plantflax_22_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_22_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_23.png'
Binary files tribes/barbarians/ferner/plantflax_23.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_23.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_23_pc.png'
Binary files tribes/barbarians/ferner/plantflax_23_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_23_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_24.png'
Binary files tribes/barbarians/ferner/plantflax_24.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_24.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantflax_24_pc.png'
Binary files tribes/barbarians/ferner/plantflax_24_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantflax_24_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_00.png'
Binary files tribes/barbarians/ferner/plantreed_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_00_pc.png'
Binary files tribes/barbarians/ferner/plantreed_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_01.png'
Binary files tribes/barbarians/ferner/plantreed_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_01_pc.png'
Binary files tribes/barbarians/ferner/plantreed_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_02.png'
Binary files tribes/barbarians/ferner/plantreed_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_02_pc.png'
Binary files tribes/barbarians/ferner/plantreed_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_03.png'
Binary files tribes/barbarians/ferner/plantreed_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_03_pc.png'
Binary files tribes/barbarians/ferner/plantreed_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_04.png'
Binary files tribes/barbarians/ferner/plantreed_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_04_pc.png'
Binary files tribes/barbarians/ferner/plantreed_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_05.png'
Binary files tribes/barbarians/ferner/plantreed_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_05_pc.png'
Binary files tribes/barbarians/ferner/plantreed_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_06.png'
Binary files tribes/barbarians/ferner/plantreed_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_06_pc.png'
Binary files tribes/barbarians/ferner/plantreed_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_07.png'
Binary files tribes/barbarians/ferner/plantreed_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_07_pc.png'
Binary files tribes/barbarians/ferner/plantreed_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_08.png'
Binary files tribes/barbarians/ferner/plantreed_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_08_pc.png'
Binary files tribes/barbarians/ferner/plantreed_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_09.png'
Binary files tribes/barbarians/ferner/plantreed_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_09_pc.png'
Binary files tribes/barbarians/ferner/plantreed_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_10.png'
Binary files tribes/barbarians/ferner/plantreed_10.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_10.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_10_pc.png'
Binary files tribes/barbarians/ferner/plantreed_10_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_10_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_11.png'
Binary files tribes/barbarians/ferner/plantreed_11.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_11.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_11_pc.png'
Binary files tribes/barbarians/ferner/plantreed_11_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_11_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_12.png'
Binary files tribes/barbarians/ferner/plantreed_12.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_12.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_12_pc.png'
Binary files tribes/barbarians/ferner/plantreed_12_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_12_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_13.png'
Binary files tribes/barbarians/ferner/plantreed_13.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_13.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_13_pc.png'
Binary files tribes/barbarians/ferner/plantreed_13_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_13_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_14.png'
Binary files tribes/barbarians/ferner/plantreed_14.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_14.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/plantreed_14_pc.png'
Binary files tribes/barbarians/ferner/plantreed_14_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/plantreed_14_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_00.png'
Binary files tribes/barbarians/ferner/walk_e_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_00_pc.png'
Binary files tribes/barbarians/ferner/walk_e_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_01.png'
Binary files tribes/barbarians/ferner/walk_e_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_01_pc.png'
Binary files tribes/barbarians/ferner/walk_e_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_02.png'
Binary files tribes/barbarians/ferner/walk_e_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_02_pc.png'
Binary files tribes/barbarians/ferner/walk_e_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_03.png'
Binary files tribes/barbarians/ferner/walk_e_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_03_pc.png'
Binary files tribes/barbarians/ferner/walk_e_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_04.png'
Binary files tribes/barbarians/ferner/walk_e_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_04_pc.png'
Binary files tribes/barbarians/ferner/walk_e_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_05.png'
Binary files tribes/barbarians/ferner/walk_e_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_05_pc.png'
Binary files tribes/barbarians/ferner/walk_e_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_06.png'
Binary files tribes/barbarians/ferner/walk_e_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_06_pc.png'
Binary files tribes/barbarians/ferner/walk_e_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_07.png'
Binary files tribes/barbarians/ferner/walk_e_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_07_pc.png'
Binary files tribes/barbarians/ferner/walk_e_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_08.png'
Binary files tribes/barbarians/ferner/walk_e_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_08_pc.png'
Binary files tribes/barbarians/ferner/walk_e_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_09.png'
Binary files tribes/barbarians/ferner/walk_e_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_e_09_pc.png'
Binary files tribes/barbarians/ferner/walk_e_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_e_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_00.png'
Binary files tribes/barbarians/ferner/walk_ne_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_00_pc.png'
Binary files tribes/barbarians/ferner/walk_ne_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_01.png'
Binary files tribes/barbarians/ferner/walk_ne_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_01_pc.png'
Binary files tribes/barbarians/ferner/walk_ne_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_02.png'
Binary files tribes/barbarians/ferner/walk_ne_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_02_pc.png'
Binary files tribes/barbarians/ferner/walk_ne_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_03.png'
Binary files tribes/barbarians/ferner/walk_ne_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_03_pc.png'
Binary files tribes/barbarians/ferner/walk_ne_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_04.png'
Binary files tribes/barbarians/ferner/walk_ne_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_04_pc.png'
Binary files tribes/barbarians/ferner/walk_ne_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_05.png'
Binary files tribes/barbarians/ferner/walk_ne_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_05_pc.png'
Binary files tribes/barbarians/ferner/walk_ne_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_06.png'
Binary files tribes/barbarians/ferner/walk_ne_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_06_pc.png'
Binary files tribes/barbarians/ferner/walk_ne_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_07.png'
Binary files tribes/barbarians/ferner/walk_ne_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_07_pc.png'
Binary files tribes/barbarians/ferner/walk_ne_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_08.png'
Binary files tribes/barbarians/ferner/walk_ne_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_08_pc.png'
Binary files tribes/barbarians/ferner/walk_ne_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_09.png'
Binary files tribes/barbarians/ferner/walk_ne_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_ne_09_pc.png'
Binary files tribes/barbarians/ferner/walk_ne_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_ne_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_00.png'
Binary files tribes/barbarians/ferner/walk_nw_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_00_pc.png'
Binary files tribes/barbarians/ferner/walk_nw_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_01.png'
Binary files tribes/barbarians/ferner/walk_nw_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_01_pc.png'
Binary files tribes/barbarians/ferner/walk_nw_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_02.png'
Binary files tribes/barbarians/ferner/walk_nw_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_02_pc.png'
Binary files tribes/barbarians/ferner/walk_nw_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_03.png'
Binary files tribes/barbarians/ferner/walk_nw_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_03_pc.png'
Binary files tribes/barbarians/ferner/walk_nw_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_04.png'
Binary files tribes/barbarians/ferner/walk_nw_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_04_pc.png'
Binary files tribes/barbarians/ferner/walk_nw_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_05.png'
Binary files tribes/barbarians/ferner/walk_nw_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_05_pc.png'
Binary files tribes/barbarians/ferner/walk_nw_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_06.png'
Binary files tribes/barbarians/ferner/walk_nw_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_06_pc.png'
Binary files tribes/barbarians/ferner/walk_nw_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_07.png'
Binary files tribes/barbarians/ferner/walk_nw_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_07_pc.png'
Binary files tribes/barbarians/ferner/walk_nw_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_08.png'
Binary files tribes/barbarians/ferner/walk_nw_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_08_pc.png'
Binary files tribes/barbarians/ferner/walk_nw_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_09.png'
Binary files tribes/barbarians/ferner/walk_nw_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_nw_09_pc.png'
Binary files tribes/barbarians/ferner/walk_nw_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_nw_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_00.png'
Binary files tribes/barbarians/ferner/walk_se_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_00_pc.png'
Binary files tribes/barbarians/ferner/walk_se_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_01.png'
Binary files tribes/barbarians/ferner/walk_se_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_01_pc.png'
Binary files tribes/barbarians/ferner/walk_se_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_02.png'
Binary files tribes/barbarians/ferner/walk_se_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_02_pc.png'
Binary files tribes/barbarians/ferner/walk_se_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_03.png'
Binary files tribes/barbarians/ferner/walk_se_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_03_pc.png'
Binary files tribes/barbarians/ferner/walk_se_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_04.png'
Binary files tribes/barbarians/ferner/walk_se_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_04_pc.png'
Binary files tribes/barbarians/ferner/walk_se_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_05.png'
Binary files tribes/barbarians/ferner/walk_se_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_05_pc.png'
Binary files tribes/barbarians/ferner/walk_se_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_06.png'
Binary files tribes/barbarians/ferner/walk_se_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_06_pc.png'
Binary files tribes/barbarians/ferner/walk_se_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_07.png'
Binary files tribes/barbarians/ferner/walk_se_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_07_pc.png'
Binary files tribes/barbarians/ferner/walk_se_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_08.png'
Binary files tribes/barbarians/ferner/walk_se_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_08_pc.png'
Binary files tribes/barbarians/ferner/walk_se_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_09.png'
Binary files tribes/barbarians/ferner/walk_se_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_se_09_pc.png'
Binary files tribes/barbarians/ferner/walk_se_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_se_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_00.png'
Binary files tribes/barbarians/ferner/walk_sw_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_00_pc.png'
Binary files tribes/barbarians/ferner/walk_sw_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_01.png'
Binary files tribes/barbarians/ferner/walk_sw_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_01_pc.png'
Binary files tribes/barbarians/ferner/walk_sw_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_02.png'
Binary files tribes/barbarians/ferner/walk_sw_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_02_pc.png'
Binary files tribes/barbarians/ferner/walk_sw_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_03.png'
Binary files tribes/barbarians/ferner/walk_sw_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_03_pc.png'
Binary files tribes/barbarians/ferner/walk_sw_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_04.png'
Binary files tribes/barbarians/ferner/walk_sw_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_04_pc.png'
Binary files tribes/barbarians/ferner/walk_sw_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_05.png'
Binary files tribes/barbarians/ferner/walk_sw_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_05_pc.png'
Binary files tribes/barbarians/ferner/walk_sw_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_06.png'
Binary files tribes/barbarians/ferner/walk_sw_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_06_pc.png'
Binary files tribes/barbarians/ferner/walk_sw_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_07.png'
Binary files tribes/barbarians/ferner/walk_sw_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_07_pc.png'
Binary files tribes/barbarians/ferner/walk_sw_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_08.png'
Binary files tribes/barbarians/ferner/walk_sw_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_08_pc.png'
Binary files tribes/barbarians/ferner/walk_sw_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_09.png'
Binary files tribes/barbarians/ferner/walk_sw_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_sw_09_pc.png'
Binary files tribes/barbarians/ferner/walk_sw_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_sw_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_00.png'
Binary files tribes/barbarians/ferner/walk_w_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_00_pc.png'
Binary files tribes/barbarians/ferner/walk_w_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_01.png'
Binary files tribes/barbarians/ferner/walk_w_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_01_pc.png'
Binary files tribes/barbarians/ferner/walk_w_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_02.png'
Binary files tribes/barbarians/ferner/walk_w_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_02_pc.png'
Binary files tribes/barbarians/ferner/walk_w_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_03.png'
Binary files tribes/barbarians/ferner/walk_w_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_03_pc.png'
Binary files tribes/barbarians/ferner/walk_w_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_04.png'
Binary files tribes/barbarians/ferner/walk_w_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_04_pc.png'
Binary files tribes/barbarians/ferner/walk_w_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_05.png'
Binary files tribes/barbarians/ferner/walk_w_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_05_pc.png'
Binary files tribes/barbarians/ferner/walk_w_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_06.png'
Binary files tribes/barbarians/ferner/walk_w_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_06_pc.png'
Binary files tribes/barbarians/ferner/walk_w_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_07.png'
Binary files tribes/barbarians/ferner/walk_w_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_07_pc.png'
Binary files tribes/barbarians/ferner/walk_w_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_08.png'
Binary files tribes/barbarians/ferner/walk_w_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_08_pc.png'
Binary files tribes/barbarians/ferner/walk_w_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_09.png'
Binary files tribes/barbarians/ferner/walk_w_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walk_w_09_pc.png'
Binary files tribes/barbarians/ferner/walk_w_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walk_w_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_00.png'
Binary files tribes/barbarians/ferner/walkload_e_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_00_pc.png'
Binary files tribes/barbarians/ferner/walkload_e_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_01.png'
Binary files tribes/barbarians/ferner/walkload_e_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_01_pc.png'
Binary files tribes/barbarians/ferner/walkload_e_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_02.png'
Binary files tribes/barbarians/ferner/walkload_e_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_02_pc.png'
Binary files tribes/barbarians/ferner/walkload_e_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_03.png'
Binary files tribes/barbarians/ferner/walkload_e_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_03_pc.png'
Binary files tribes/barbarians/ferner/walkload_e_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_04.png'
Binary files tribes/barbarians/ferner/walkload_e_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_04_pc.png'
Binary files tribes/barbarians/ferner/walkload_e_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_05.png'
Binary files tribes/barbarians/ferner/walkload_e_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_05_pc.png'
Binary files tribes/barbarians/ferner/walkload_e_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_06.png'
Binary files tribes/barbarians/ferner/walkload_e_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_06_pc.png'
Binary files tribes/barbarians/ferner/walkload_e_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_07.png'
Binary files tribes/barbarians/ferner/walkload_e_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_07_pc.png'
Binary files tribes/barbarians/ferner/walkload_e_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_08.png'
Binary files tribes/barbarians/ferner/walkload_e_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_08_pc.png'
Binary files tribes/barbarians/ferner/walkload_e_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_09.png'
Binary files tribes/barbarians/ferner/walkload_e_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_e_09_pc.png'
Binary files tribes/barbarians/ferner/walkload_e_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_e_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_00.png'
Binary files tribes/barbarians/ferner/walkload_ne_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_00_pc.png'
Binary files tribes/barbarians/ferner/walkload_ne_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_01.png'
Binary files tribes/barbarians/ferner/walkload_ne_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_01_pc.png'
Binary files tribes/barbarians/ferner/walkload_ne_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_02.png'
Binary files tribes/barbarians/ferner/walkload_ne_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_02_pc.png'
Binary files tribes/barbarians/ferner/walkload_ne_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_03.png'
Binary files tribes/barbarians/ferner/walkload_ne_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_03_pc.png'
Binary files tribes/barbarians/ferner/walkload_ne_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_04.png'
Binary files tribes/barbarians/ferner/walkload_ne_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_04_pc.png'
Binary files tribes/barbarians/ferner/walkload_ne_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_05.png'
Binary files tribes/barbarians/ferner/walkload_ne_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_05_pc.png'
Binary files tribes/barbarians/ferner/walkload_ne_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_06.png'
Binary files tribes/barbarians/ferner/walkload_ne_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_06_pc.png'
Binary files tribes/barbarians/ferner/walkload_ne_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_07.png'
Binary files tribes/barbarians/ferner/walkload_ne_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_07_pc.png'
Binary files tribes/barbarians/ferner/walkload_ne_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_08.png'
Binary files tribes/barbarians/ferner/walkload_ne_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_08_pc.png'
Binary files tribes/barbarians/ferner/walkload_ne_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_09.png'
Binary files tribes/barbarians/ferner/walkload_ne_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_ne_09_pc.png'
Binary files tribes/barbarians/ferner/walkload_ne_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_ne_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_00.png'
Binary files tribes/barbarians/ferner/walkload_nw_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_00_pc.png'
Binary files tribes/barbarians/ferner/walkload_nw_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_01.png'
Binary files tribes/barbarians/ferner/walkload_nw_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_01_pc.png'
Binary files tribes/barbarians/ferner/walkload_nw_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_02.png'
Binary files tribes/barbarians/ferner/walkload_nw_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_02_pc.png'
Binary files tribes/barbarians/ferner/walkload_nw_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_03.png'
Binary files tribes/barbarians/ferner/walkload_nw_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_03_pc.png'
Binary files tribes/barbarians/ferner/walkload_nw_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_04.png'
Binary files tribes/barbarians/ferner/walkload_nw_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_04_pc.png'
Binary files tribes/barbarians/ferner/walkload_nw_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_05.png'
Binary files tribes/barbarians/ferner/walkload_nw_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_05_pc.png'
Binary files tribes/barbarians/ferner/walkload_nw_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_06.png'
Binary files tribes/barbarians/ferner/walkload_nw_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_06_pc.png'
Binary files tribes/barbarians/ferner/walkload_nw_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_07.png'
Binary files tribes/barbarians/ferner/walkload_nw_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_07_pc.png'
Binary files tribes/barbarians/ferner/walkload_nw_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_08.png'
Binary files tribes/barbarians/ferner/walkload_nw_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_08_pc.png'
Binary files tribes/barbarians/ferner/walkload_nw_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_09.png'
Binary files tribes/barbarians/ferner/walkload_nw_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_nw_09_pc.png'
Binary files tribes/barbarians/ferner/walkload_nw_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_nw_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_00.png'
Binary files tribes/barbarians/ferner/walkload_se_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_00_pc.png'
Binary files tribes/barbarians/ferner/walkload_se_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_01.png'
Binary files tribes/barbarians/ferner/walkload_se_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_01_pc.png'
Binary files tribes/barbarians/ferner/walkload_se_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_02.png'
Binary files tribes/barbarians/ferner/walkload_se_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_02_pc.png'
Binary files tribes/barbarians/ferner/walkload_se_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_03.png'
Binary files tribes/barbarians/ferner/walkload_se_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_03_pc.png'
Binary files tribes/barbarians/ferner/walkload_se_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_04.png'
Binary files tribes/barbarians/ferner/walkload_se_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_04_pc.png'
Binary files tribes/barbarians/ferner/walkload_se_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_05.png'
Binary files tribes/barbarians/ferner/walkload_se_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_05_pc.png'
Binary files tribes/barbarians/ferner/walkload_se_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_06.png'
Binary files tribes/barbarians/ferner/walkload_se_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_06_pc.png'
Binary files tribes/barbarians/ferner/walkload_se_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_07.png'
Binary files tribes/barbarians/ferner/walkload_se_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_07_pc.png'
Binary files tribes/barbarians/ferner/walkload_se_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_08.png'
Binary files tribes/barbarians/ferner/walkload_se_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_08_pc.png'
Binary files tribes/barbarians/ferner/walkload_se_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_09.png'
Binary files tribes/barbarians/ferner/walkload_se_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_se_09_pc.png'
Binary files tribes/barbarians/ferner/walkload_se_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_se_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_00.png'
Binary files tribes/barbarians/ferner/walkload_sw_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_00_pc.png'
Binary files tribes/barbarians/ferner/walkload_sw_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_01.png'
Binary files tribes/barbarians/ferner/walkload_sw_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_01_pc.png'
Binary files tribes/barbarians/ferner/walkload_sw_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_02.png'
Binary files tribes/barbarians/ferner/walkload_sw_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_02_pc.png'
Binary files tribes/barbarians/ferner/walkload_sw_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_03.png'
Binary files tribes/barbarians/ferner/walkload_sw_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_03_pc.png'
Binary files tribes/barbarians/ferner/walkload_sw_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_04.png'
Binary files tribes/barbarians/ferner/walkload_sw_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_04_pc.png'
Binary files tribes/barbarians/ferner/walkload_sw_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_05.png'
Binary files tribes/barbarians/ferner/walkload_sw_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_05_pc.png'
Binary files tribes/barbarians/ferner/walkload_sw_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_06.png'
Binary files tribes/barbarians/ferner/walkload_sw_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_06_pc.png'
Binary files tribes/barbarians/ferner/walkload_sw_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_07.png'
Binary files tribes/barbarians/ferner/walkload_sw_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_07_pc.png'
Binary files tribes/barbarians/ferner/walkload_sw_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_08.png'
Binary files tribes/barbarians/ferner/walkload_sw_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_08_pc.png'
Binary files tribes/barbarians/ferner/walkload_sw_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_09.png'
Binary files tribes/barbarians/ferner/walkload_sw_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_sw_09_pc.png'
Binary files tribes/barbarians/ferner/walkload_sw_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_sw_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_00.png'
Binary files tribes/barbarians/ferner/walkload_w_00.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_00_pc.png'
Binary files tribes/barbarians/ferner/walkload_w_00_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_01.png'
Binary files tribes/barbarians/ferner/walkload_w_01.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_01_pc.png'
Binary files tribes/barbarians/ferner/walkload_w_01_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_02.png'
Binary files tribes/barbarians/ferner/walkload_w_02.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_02_pc.png'
Binary files tribes/barbarians/ferner/walkload_w_02_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_03.png'
Binary files tribes/barbarians/ferner/walkload_w_03.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_03_pc.png'
Binary files tribes/barbarians/ferner/walkload_w_03_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_04.png'
Binary files tribes/barbarians/ferner/walkload_w_04.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_04_pc.png'
Binary files tribes/barbarians/ferner/walkload_w_04_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_05.png'
Binary files tribes/barbarians/ferner/walkload_w_05.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_05_pc.png'
Binary files tribes/barbarians/ferner/walkload_w_05_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_06.png'
Binary files tribes/barbarians/ferner/walkload_w_06.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_06_pc.png'
Binary files tribes/barbarians/ferner/walkload_w_06_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_07.png'
Binary files tribes/barbarians/ferner/walkload_w_07.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_07_pc.png'
Binary files tribes/barbarians/ferner/walkload_w_07_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_08.png'
Binary files tribes/barbarians/ferner/walkload_w_08.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_08_pc.png'
Binary files tribes/barbarians/ferner/walkload_w_08_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_09.png'
Binary files tribes/barbarians/ferner/walkload_w_09.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/ferner/walkload_w_09_pc.png'
Binary files tribes/barbarians/ferner/walkload_w_09_pc.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/ferner/walkload_w_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed directory 'tribes/barbarians/fernery'
=== removed file 'tribes/barbarians/fernery/conf'
--- tribes/barbarians/fernery/conf	2014-03-12 19:11:45 +0000
+++ tribes/barbarians/fernery/conf	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-size=medium
-output=thatchreed
-
-[aihints]
-space_consumer=true
-
-[buildcost]
-trunk=5
-raw_stone=2
-
-[return_on_dismantle]
-trunk=2
-raw_stone=1
-
-[working positions]
-ferner=1
-
-[programs]
-plant_reed=_Plant reed
-harvest_reed=_Harvest reed
-work=_Work
-
-[plant_reed]
-sleep=18000  #orig sleep=20000 but ferner animation was increased by 2sec
-worker=plantreed
-
-[harvest_reed]
-sleep=5000
-worker=harvestreed
-
-[work]
-call=plant_reed
-call=harvest_reed
-return=skipped
-
-[idle]
-pics=fernery_i_??.png  # ???
-hotspot=46 44

=== removed file 'tribes/barbarians/fernery/fernery_i_00.png'
Binary files tribes/barbarians/fernery/fernery_i_00.png	2008-11-24 17:43:38 +0000 and tribes/barbarians/fernery/fernery_i_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/fernery/help.lua'
--- tribes/barbarians/fernery/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/fernery/help.lua	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-use("aux", "formatting")
-use("aux", "format_help")
-
-set_textdomain("tribe_barbarians")
-
-return {
-	text =
-		--rt(h1(_"The Barbarian Reed Yard")) ..
-	--Lore Section
-		rt(h2(_"Lore")) ..
-		rt("image=tribes/barbarians/fernery/fernery_i_00.png", p(
-			_[[‘We grow roofs’]])) ..
-		rt("text-align=right",p("font-size=10 font-style=italic", _[[Slogan of the Guild of Gardeners]])) ..
-	--General Section
-		rt(h2(_"General")) ..
-		text_line(_"Purpose:", _"The Reed Yard cultivates reed that serves two different purposes for the Barbarian tribe.<br>It is the traditional material for roofing, and it is woven into the extremely durable cloth that they use for their ships’ sails.","tribes/barbarians/thatchreed/menu.png") ..
-		text_line(_"Working radius:", "1") ..
-		text_line(_"Conquer range:", "n/a") ..
-		text_line(_"Vision range:", "4") ..
-	--Dependencies
-		rt(h2(_"Dependencies")) ..
-		text_line(_"Incoming:","n/a") ..
-		rt(h3(_"Outgoing:")) ..
-		dependencies({"tribes/barbarians/fernery/menu.png","tribes/barbarians/thatchreed/menu.png"},p(_"Thatch Reed")) ..
-		dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/constructionsite/menu.png"},p(_"Construction Site")) ..
-		rt(p(_"The Reed Yard’s output will only go to construction sites that need it.")) ..
-		dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/weaving-mill/menu.png"},p(_"Weaving-Mill")) ..
-	--Building Section
-		rt(h2(_"Building")) ..
-		text_line(_"Space required:",_"Medium plot","pics/medium.png") ..
-		text_line(_"Upgraded from:", "n/a") ..
-		rt(h3(_"Build cost:")) ..
-		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 5), 5) ..
-		rt(h3(_"Dismantle yields:")) ..
-		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 3), 3) ..
-		text_line(_"Upgradeable to:","n/a") ..
-	--Workers Section
-		rt(h2(_"Workers")) ..
-		rt(h3(_"Crew required:")) ..
-		image_line("tribes/barbarians/ferner/menu.png", 1, p(_"Gardener")) ..
-		text_line(_"Worker uses:", _"Shovel","tribes/barbarians/shovel/menu.png") ..
-		text_line(_"Experience levels:","n/a") ..
-	--Production Section
-		rt(h2(_"Production")) ..
-		text_line(_"Performance:", _"A Reed Yard can produce a sheaf of Thatch Reed in about %s on average.":format("65s"))
-}

=== removed file 'tribes/barbarians/fernery/menu.png'
Binary files tribes/barbarians/fernery/menu.png	2008-11-24 17:43:38 +0000 and tribes/barbarians/fernery/menu.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'tribes/barbarians/fishers_hut/conf'
--- tribes/barbarians/fishers_hut/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/fishers_hut/conf	2014-03-16 06:39:32 +0000
@@ -2,10 +2,10 @@
 output=fish
 
 [buildcost]
-trunk=4
+log=4
 
 [return_on_dismantle]
-trunk=2
+log=2
 
 [working positions]
 fisher=1

=== modified file 'tribes/barbarians/fishers_hut/help.lua'
--- tribes/barbarians/fishers_hut/help.lua	2014-03-06 19:41:44 +0000
+++ tribes/barbarians/fishers_hut/help.lua	2014-03-16 06:39:32 +0000
@@ -25,7 +25,7 @@
 		rt(h2(_"Outgoing:")) ..
 		dependencies({"tribes/barbarians/fishers_hut/menu.png","tribes/barbarians/fish/menu.png"},p(_"Fish")) ..
 		dependencies({"tribes/barbarians/fish/menu.png","tribes/barbarians/battlearena/menu.png"},p(_"Battle Arena")) ..
-		dependencies({"tribes/barbarians/fish/menu.png","tribes/barbarians/trainingscamp/menu.png"},p(_"Training Camp")) ..
+		dependencies({"tribes/barbarians/fish/menu.png","tribes/barbarians/trainingcamp/menu.png"},p(_"Training Camp")) ..
 		dependencies({"tribes/barbarians/fish/menu.png","tribes/barbarians/tavern/menu.png"},p(_"Tavern")) ..
 		dependencies({"tribes/barbarians/fish/menu.png","tribes/barbarians/inn/menu.png"},p(_"Inn")) ..
 		dependencies({"tribes/barbarians/fish/menu.png","tribes/barbarians/big_inn/menu.png"},p(_"Big Inn")) ..
@@ -34,9 +34,9 @@
 		text_line(_"Space required:",_"Small plot","pics/small.png") ..
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/fortress/conf'
--- tribes/barbarians/fortress/conf	2013-10-29 10:55:20 +0000
+++ tribes/barbarians/fortress/conf	2014-03-16 06:39:32 +0000
@@ -12,13 +12,13 @@
 
 [buildcost]
 blackwood=9
-trunk=5
+log=5
 raw_stone=4
 grout=2
 
 [return_on_dismantle]
 blackwood=4
-trunk=2
+log=2
 raw_stone=2
 grout=1
 

=== modified file 'tribes/barbarians/gamekeepers_hut/conf'
--- tribes/barbarians/gamekeepers_hut/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/gamekeepers_hut/conf	2014-03-16 06:39:32 +0000
@@ -1,11 +1,11 @@
 size=small
 
 [buildcost]
-trunk=4
+log=4
 raw_stone=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 raw_stone=1
 
 [working positions]

=== modified file 'tribes/barbarians/gamekeepers_hut/help.lua'
--- tribes/barbarians/gamekeepers_hut/help.lua	2014-03-06 19:41:44 +0000
+++ tribes/barbarians/gamekeepers_hut/help.lua	2014-03-16 06:39:32 +0000
@@ -27,10 +27,10 @@
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== added directory 'tribes/barbarians/gardener'
=== added file 'tribes/barbarians/gardener/conf'
--- tribes/barbarians/gardener/conf	1970-01-01 00:00:00 +0000
+++ tribes/barbarians/gardener/conf	2014-03-16 06:39:32 +0000
@@ -0,0 +1,53 @@
+help=_Grows thatch reed.
+program=plantreed
+program=harvestreed
+
+[buildcost]
+carrier=1
+shovel=1
+
+[plantreed]
+0=findspace size:any radius:1
+1=walk coords
+2=animation reedplanting 1500 # Play a planting animation
+3=plant tribe:reed0t
+4=animation reedplanting 1500
+5=return
+
+[harvestreed]
+0=findobject attrib:grown_reed radius:1
+1=walk object
+2=animation harvesting 12000  #4sec animation cycle
+3=object harvest
+4=animation harvesting 1
+5=createware thatchreed
+6=return
+
+[idle]
+pics=idle_??.png
+hotspot=-4 11
+playercolor=true
+
+[walk]
+dirpics=walk_!!_??.png
+hotspot=8 23
+playercolor=true
+fps=10
+
+[walkload]
+dirpics=walkload_!!_??.png
+hotspot=7 23
+playercolor=true
+fps=10
+
+[reedplanting]
+pics=plantreed_??.png
+hotspot=10 21
+playercolor=true
+fps=10
+
+[harvesting]
+pics=harvest_??.png
+hotspot=10 22
+playercolor=true
+fps=5

=== added file 'tribes/barbarians/gardener/harvest_00.png'
Binary files tribes/barbarians/gardener/harvest_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_00_pc.png'
Binary files tribes/barbarians/gardener/harvest_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_01.png'
Binary files tribes/barbarians/gardener/harvest_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_01_pc.png'
Binary files tribes/barbarians/gardener/harvest_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_02.png'
Binary files tribes/barbarians/gardener/harvest_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_02_pc.png'
Binary files tribes/barbarians/gardener/harvest_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_03.png'
Binary files tribes/barbarians/gardener/harvest_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_03_pc.png'
Binary files tribes/barbarians/gardener/harvest_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_04.png'
Binary files tribes/barbarians/gardener/harvest_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_04_pc.png'
Binary files tribes/barbarians/gardener/harvest_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_05.png'
Binary files tribes/barbarians/gardener/harvest_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_05_pc.png'
Binary files tribes/barbarians/gardener/harvest_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_06.png'
Binary files tribes/barbarians/gardener/harvest_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_06_pc.png'
Binary files tribes/barbarians/gardener/harvest_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_07.png'
Binary files tribes/barbarians/gardener/harvest_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_07_pc.png'
Binary files tribes/barbarians/gardener/harvest_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_08.png'
Binary files tribes/barbarians/gardener/harvest_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_08_pc.png'
Binary files tribes/barbarians/gardener/harvest_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_09.png'
Binary files tribes/barbarians/gardener/harvest_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_09_pc.png'
Binary files tribes/barbarians/gardener/harvest_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_10.png'
Binary files tribes/barbarians/gardener/harvest_10.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_10.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_10_pc.png'
Binary files tribes/barbarians/gardener/harvest_10_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_10_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_11.png'
Binary files tribes/barbarians/gardener/harvest_11.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_11.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_11_pc.png'
Binary files tribes/barbarians/gardener/harvest_11_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_11_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_12.png'
Binary files tribes/barbarians/gardener/harvest_12.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_12.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_12_pc.png'
Binary files tribes/barbarians/gardener/harvest_12_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_12_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_13.png'
Binary files tribes/barbarians/gardener/harvest_13.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_13.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_13_pc.png'
Binary files tribes/barbarians/gardener/harvest_13_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_13_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_14.png'
Binary files tribes/barbarians/gardener/harvest_14.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_14.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_14_pc.png'
Binary files tribes/barbarians/gardener/harvest_14_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_14_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_15.png'
Binary files tribes/barbarians/gardener/harvest_15.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_15.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_15_pc.png'
Binary files tribes/barbarians/gardener/harvest_15_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_15_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_16.png'
Binary files tribes/barbarians/gardener/harvest_16.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_16.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_16_pc.png'
Binary files tribes/barbarians/gardener/harvest_16_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_16_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_17.png'
Binary files tribes/barbarians/gardener/harvest_17.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_17.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_17_pc.png'
Binary files tribes/barbarians/gardener/harvest_17_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_17_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_18.png'
Binary files tribes/barbarians/gardener/harvest_18.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_18.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_18_pc.png'
Binary files tribes/barbarians/gardener/harvest_18_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_18_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_19.png'
Binary files tribes/barbarians/gardener/harvest_19.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_19.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/harvest_19_pc.png'
Binary files tribes/barbarians/gardener/harvest_19_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/harvest_19_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/idle_00.png'
Binary files tribes/barbarians/gardener/idle_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/idle_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/idle_00_pc.png'
Binary files tribes/barbarians/gardener/idle_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/idle_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/menu.png'
Binary files tribes/barbarians/gardener/menu.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/menu.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_00.png'
Binary files tribes/barbarians/gardener/plantflax_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_00_pc.png'
Binary files tribes/barbarians/gardener/plantflax_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_01.png'
Binary files tribes/barbarians/gardener/plantflax_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_01_pc.png'
Binary files tribes/barbarians/gardener/plantflax_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_02.png'
Binary files tribes/barbarians/gardener/plantflax_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_02_pc.png'
Binary files tribes/barbarians/gardener/plantflax_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_03.png'
Binary files tribes/barbarians/gardener/plantflax_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_03_pc.png'
Binary files tribes/barbarians/gardener/plantflax_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_04.png'
Binary files tribes/barbarians/gardener/plantflax_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_04_pc.png'
Binary files tribes/barbarians/gardener/plantflax_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_05.png'
Binary files tribes/barbarians/gardener/plantflax_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_05_pc.png'
Binary files tribes/barbarians/gardener/plantflax_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_06.png'
Binary files tribes/barbarians/gardener/plantflax_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_06_pc.png'
Binary files tribes/barbarians/gardener/plantflax_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_07.png'
Binary files tribes/barbarians/gardener/plantflax_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_07_pc.png'
Binary files tribes/barbarians/gardener/plantflax_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_08.png'
Binary files tribes/barbarians/gardener/plantflax_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_08_pc.png'
Binary files tribes/barbarians/gardener/plantflax_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_09.png'
Binary files tribes/barbarians/gardener/plantflax_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_09_pc.png'
Binary files tribes/barbarians/gardener/plantflax_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_10.png'
Binary files tribes/barbarians/gardener/plantflax_10.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_10.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_10_pc.png'
Binary files tribes/barbarians/gardener/plantflax_10_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_10_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_11.png'
Binary files tribes/barbarians/gardener/plantflax_11.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_11.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_11_pc.png'
Binary files tribes/barbarians/gardener/plantflax_11_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_11_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_12.png'
Binary files tribes/barbarians/gardener/plantflax_12.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_12.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_12_pc.png'
Binary files tribes/barbarians/gardener/plantflax_12_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_12_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_13.png'
Binary files tribes/barbarians/gardener/plantflax_13.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_13.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_13_pc.png'
Binary files tribes/barbarians/gardener/plantflax_13_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_13_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_14.png'
Binary files tribes/barbarians/gardener/plantflax_14.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_14.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_14_pc.png'
Binary files tribes/barbarians/gardener/plantflax_14_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_14_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_15.png'
Binary files tribes/barbarians/gardener/plantflax_15.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_15.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_15_pc.png'
Binary files tribes/barbarians/gardener/plantflax_15_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_15_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_16.png'
Binary files tribes/barbarians/gardener/plantflax_16.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_16.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_16_pc.png'
Binary files tribes/barbarians/gardener/plantflax_16_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_16_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_17.png'
Binary files tribes/barbarians/gardener/plantflax_17.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_17.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_17_pc.png'
Binary files tribes/barbarians/gardener/plantflax_17_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_17_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_18.png'
Binary files tribes/barbarians/gardener/plantflax_18.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_18.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_18_pc.png'
Binary files tribes/barbarians/gardener/plantflax_18_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_18_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_19.png'
Binary files tribes/barbarians/gardener/plantflax_19.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_19.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_19_pc.png'
Binary files tribes/barbarians/gardener/plantflax_19_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_19_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_20.png'
Binary files tribes/barbarians/gardener/plantflax_20.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_20.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_20_pc.png'
Binary files tribes/barbarians/gardener/plantflax_20_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_20_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_21.png'
Binary files tribes/barbarians/gardener/plantflax_21.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_21.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_21_pc.png'
Binary files tribes/barbarians/gardener/plantflax_21_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_21_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_22.png'
Binary files tribes/barbarians/gardener/plantflax_22.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_22.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_22_pc.png'
Binary files tribes/barbarians/gardener/plantflax_22_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_22_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_23.png'
Binary files tribes/barbarians/gardener/plantflax_23.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_23.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_23_pc.png'
Binary files tribes/barbarians/gardener/plantflax_23_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_23_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_24.png'
Binary files tribes/barbarians/gardener/plantflax_24.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_24.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantflax_24_pc.png'
Binary files tribes/barbarians/gardener/plantflax_24_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantflax_24_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_00.png'
Binary files tribes/barbarians/gardener/plantreed_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_00_pc.png'
Binary files tribes/barbarians/gardener/plantreed_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_01.png'
Binary files tribes/barbarians/gardener/plantreed_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_01_pc.png'
Binary files tribes/barbarians/gardener/plantreed_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_02.png'
Binary files tribes/barbarians/gardener/plantreed_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_02_pc.png'
Binary files tribes/barbarians/gardener/plantreed_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_03.png'
Binary files tribes/barbarians/gardener/plantreed_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_03_pc.png'
Binary files tribes/barbarians/gardener/plantreed_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_04.png'
Binary files tribes/barbarians/gardener/plantreed_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_04_pc.png'
Binary files tribes/barbarians/gardener/plantreed_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_05.png'
Binary files tribes/barbarians/gardener/plantreed_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_05_pc.png'
Binary files tribes/barbarians/gardener/plantreed_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_06.png'
Binary files tribes/barbarians/gardener/plantreed_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_06_pc.png'
Binary files tribes/barbarians/gardener/plantreed_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_07.png'
Binary files tribes/barbarians/gardener/plantreed_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_07_pc.png'
Binary files tribes/barbarians/gardener/plantreed_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_08.png'
Binary files tribes/barbarians/gardener/plantreed_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_08_pc.png'
Binary files tribes/barbarians/gardener/plantreed_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_09.png'
Binary files tribes/barbarians/gardener/plantreed_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_09_pc.png'
Binary files tribes/barbarians/gardener/plantreed_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_10.png'
Binary files tribes/barbarians/gardener/plantreed_10.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_10.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_10_pc.png'
Binary files tribes/barbarians/gardener/plantreed_10_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_10_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_11.png'
Binary files tribes/barbarians/gardener/plantreed_11.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_11.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_11_pc.png'
Binary files tribes/barbarians/gardener/plantreed_11_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_11_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_12.png'
Binary files tribes/barbarians/gardener/plantreed_12.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_12.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_12_pc.png'
Binary files tribes/barbarians/gardener/plantreed_12_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_12_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_13.png'
Binary files tribes/barbarians/gardener/plantreed_13.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_13.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_13_pc.png'
Binary files tribes/barbarians/gardener/plantreed_13_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_13_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_14.png'
Binary files tribes/barbarians/gardener/plantreed_14.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_14.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/plantreed_14_pc.png'
Binary files tribes/barbarians/gardener/plantreed_14_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/plantreed_14_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_00.png'
Binary files tribes/barbarians/gardener/walk_e_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_00_pc.png'
Binary files tribes/barbarians/gardener/walk_e_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_01.png'
Binary files tribes/barbarians/gardener/walk_e_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_01_pc.png'
Binary files tribes/barbarians/gardener/walk_e_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_02.png'
Binary files tribes/barbarians/gardener/walk_e_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_02_pc.png'
Binary files tribes/barbarians/gardener/walk_e_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_03.png'
Binary files tribes/barbarians/gardener/walk_e_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_03_pc.png'
Binary files tribes/barbarians/gardener/walk_e_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_04.png'
Binary files tribes/barbarians/gardener/walk_e_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_04_pc.png'
Binary files tribes/barbarians/gardener/walk_e_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_05.png'
Binary files tribes/barbarians/gardener/walk_e_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_05_pc.png'
Binary files tribes/barbarians/gardener/walk_e_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_06.png'
Binary files tribes/barbarians/gardener/walk_e_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_06_pc.png'
Binary files tribes/barbarians/gardener/walk_e_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_07.png'
Binary files tribes/barbarians/gardener/walk_e_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_07_pc.png'
Binary files tribes/barbarians/gardener/walk_e_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_08.png'
Binary files tribes/barbarians/gardener/walk_e_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_08_pc.png'
Binary files tribes/barbarians/gardener/walk_e_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_09.png'
Binary files tribes/barbarians/gardener/walk_e_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_e_09_pc.png'
Binary files tribes/barbarians/gardener/walk_e_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_e_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_00.png'
Binary files tribes/barbarians/gardener/walk_ne_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_00_pc.png'
Binary files tribes/barbarians/gardener/walk_ne_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_01.png'
Binary files tribes/barbarians/gardener/walk_ne_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_01_pc.png'
Binary files tribes/barbarians/gardener/walk_ne_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_02.png'
Binary files tribes/barbarians/gardener/walk_ne_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_02_pc.png'
Binary files tribes/barbarians/gardener/walk_ne_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_03.png'
Binary files tribes/barbarians/gardener/walk_ne_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_03_pc.png'
Binary files tribes/barbarians/gardener/walk_ne_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_04.png'
Binary files tribes/barbarians/gardener/walk_ne_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_04_pc.png'
Binary files tribes/barbarians/gardener/walk_ne_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_05.png'
Binary files tribes/barbarians/gardener/walk_ne_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_05_pc.png'
Binary files tribes/barbarians/gardener/walk_ne_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_06.png'
Binary files tribes/barbarians/gardener/walk_ne_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_06_pc.png'
Binary files tribes/barbarians/gardener/walk_ne_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_07.png'
Binary files tribes/barbarians/gardener/walk_ne_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_07_pc.png'
Binary files tribes/barbarians/gardener/walk_ne_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_08.png'
Binary files tribes/barbarians/gardener/walk_ne_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_08_pc.png'
Binary files tribes/barbarians/gardener/walk_ne_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_09.png'
Binary files tribes/barbarians/gardener/walk_ne_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_ne_09_pc.png'
Binary files tribes/barbarians/gardener/walk_ne_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_ne_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_00.png'
Binary files tribes/barbarians/gardener/walk_nw_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_00_pc.png'
Binary files tribes/barbarians/gardener/walk_nw_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_01.png'
Binary files tribes/barbarians/gardener/walk_nw_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_01_pc.png'
Binary files tribes/barbarians/gardener/walk_nw_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_02.png'
Binary files tribes/barbarians/gardener/walk_nw_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_02_pc.png'
Binary files tribes/barbarians/gardener/walk_nw_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_03.png'
Binary files tribes/barbarians/gardener/walk_nw_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_03_pc.png'
Binary files tribes/barbarians/gardener/walk_nw_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_04.png'
Binary files tribes/barbarians/gardener/walk_nw_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_04_pc.png'
Binary files tribes/barbarians/gardener/walk_nw_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_05.png'
Binary files tribes/barbarians/gardener/walk_nw_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_05_pc.png'
Binary files tribes/barbarians/gardener/walk_nw_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_06.png'
Binary files tribes/barbarians/gardener/walk_nw_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_06_pc.png'
Binary files tribes/barbarians/gardener/walk_nw_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_07.png'
Binary files tribes/barbarians/gardener/walk_nw_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_07_pc.png'
Binary files tribes/barbarians/gardener/walk_nw_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_08.png'
Binary files tribes/barbarians/gardener/walk_nw_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_08_pc.png'
Binary files tribes/barbarians/gardener/walk_nw_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_09.png'
Binary files tribes/barbarians/gardener/walk_nw_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_nw_09_pc.png'
Binary files tribes/barbarians/gardener/walk_nw_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_nw_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_00.png'
Binary files tribes/barbarians/gardener/walk_se_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_00_pc.png'
Binary files tribes/barbarians/gardener/walk_se_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_01.png'
Binary files tribes/barbarians/gardener/walk_se_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_01_pc.png'
Binary files tribes/barbarians/gardener/walk_se_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_02.png'
Binary files tribes/barbarians/gardener/walk_se_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_02_pc.png'
Binary files tribes/barbarians/gardener/walk_se_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_03.png'
Binary files tribes/barbarians/gardener/walk_se_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_03_pc.png'
Binary files tribes/barbarians/gardener/walk_se_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_04.png'
Binary files tribes/barbarians/gardener/walk_se_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_04_pc.png'
Binary files tribes/barbarians/gardener/walk_se_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_05.png'
Binary files tribes/barbarians/gardener/walk_se_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_05_pc.png'
Binary files tribes/barbarians/gardener/walk_se_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_06.png'
Binary files tribes/barbarians/gardener/walk_se_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_06_pc.png'
Binary files tribes/barbarians/gardener/walk_se_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_07.png'
Binary files tribes/barbarians/gardener/walk_se_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_07_pc.png'
Binary files tribes/barbarians/gardener/walk_se_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_08.png'
Binary files tribes/barbarians/gardener/walk_se_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_08_pc.png'
Binary files tribes/barbarians/gardener/walk_se_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_09.png'
Binary files tribes/barbarians/gardener/walk_se_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_se_09_pc.png'
Binary files tribes/barbarians/gardener/walk_se_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_se_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_00.png'
Binary files tribes/barbarians/gardener/walk_sw_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_00_pc.png'
Binary files tribes/barbarians/gardener/walk_sw_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_01.png'
Binary files tribes/barbarians/gardener/walk_sw_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_01_pc.png'
Binary files tribes/barbarians/gardener/walk_sw_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_02.png'
Binary files tribes/barbarians/gardener/walk_sw_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_02_pc.png'
Binary files tribes/barbarians/gardener/walk_sw_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_03.png'
Binary files tribes/barbarians/gardener/walk_sw_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_03_pc.png'
Binary files tribes/barbarians/gardener/walk_sw_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_04.png'
Binary files tribes/barbarians/gardener/walk_sw_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_04_pc.png'
Binary files tribes/barbarians/gardener/walk_sw_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_05.png'
Binary files tribes/barbarians/gardener/walk_sw_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_05_pc.png'
Binary files tribes/barbarians/gardener/walk_sw_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_06.png'
Binary files tribes/barbarians/gardener/walk_sw_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_06_pc.png'
Binary files tribes/barbarians/gardener/walk_sw_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_07.png'
Binary files tribes/barbarians/gardener/walk_sw_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_07_pc.png'
Binary files tribes/barbarians/gardener/walk_sw_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_08.png'
Binary files tribes/barbarians/gardener/walk_sw_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_08_pc.png'
Binary files tribes/barbarians/gardener/walk_sw_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_09.png'
Binary files tribes/barbarians/gardener/walk_sw_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_sw_09_pc.png'
Binary files tribes/barbarians/gardener/walk_sw_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_sw_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_00.png'
Binary files tribes/barbarians/gardener/walk_w_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_00_pc.png'
Binary files tribes/barbarians/gardener/walk_w_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_01.png'
Binary files tribes/barbarians/gardener/walk_w_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_01_pc.png'
Binary files tribes/barbarians/gardener/walk_w_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_02.png'
Binary files tribes/barbarians/gardener/walk_w_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_02_pc.png'
Binary files tribes/barbarians/gardener/walk_w_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_03.png'
Binary files tribes/barbarians/gardener/walk_w_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_03_pc.png'
Binary files tribes/barbarians/gardener/walk_w_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_04.png'
Binary files tribes/barbarians/gardener/walk_w_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_04_pc.png'
Binary files tribes/barbarians/gardener/walk_w_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_05.png'
Binary files tribes/barbarians/gardener/walk_w_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_05_pc.png'
Binary files tribes/barbarians/gardener/walk_w_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_06.png'
Binary files tribes/barbarians/gardener/walk_w_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_06_pc.png'
Binary files tribes/barbarians/gardener/walk_w_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_07.png'
Binary files tribes/barbarians/gardener/walk_w_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_07_pc.png'
Binary files tribes/barbarians/gardener/walk_w_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_08.png'
Binary files tribes/barbarians/gardener/walk_w_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_08_pc.png'
Binary files tribes/barbarians/gardener/walk_w_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_09.png'
Binary files tribes/barbarians/gardener/walk_w_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walk_w_09_pc.png'
Binary files tribes/barbarians/gardener/walk_w_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walk_w_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_00.png'
Binary files tribes/barbarians/gardener/walkload_e_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_00_pc.png'
Binary files tribes/barbarians/gardener/walkload_e_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_01.png'
Binary files tribes/barbarians/gardener/walkload_e_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_01_pc.png'
Binary files tribes/barbarians/gardener/walkload_e_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_02.png'
Binary files tribes/barbarians/gardener/walkload_e_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_02_pc.png'
Binary files tribes/barbarians/gardener/walkload_e_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_03.png'
Binary files tribes/barbarians/gardener/walkload_e_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_03_pc.png'
Binary files tribes/barbarians/gardener/walkload_e_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_04.png'
Binary files tribes/barbarians/gardener/walkload_e_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_04_pc.png'
Binary files tribes/barbarians/gardener/walkload_e_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_05.png'
Binary files tribes/barbarians/gardener/walkload_e_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_05_pc.png'
Binary files tribes/barbarians/gardener/walkload_e_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_06.png'
Binary files tribes/barbarians/gardener/walkload_e_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_06_pc.png'
Binary files tribes/barbarians/gardener/walkload_e_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_07.png'
Binary files tribes/barbarians/gardener/walkload_e_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_07_pc.png'
Binary files tribes/barbarians/gardener/walkload_e_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_08.png'
Binary files tribes/barbarians/gardener/walkload_e_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_08_pc.png'
Binary files tribes/barbarians/gardener/walkload_e_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_09.png'
Binary files tribes/barbarians/gardener/walkload_e_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_e_09_pc.png'
Binary files tribes/barbarians/gardener/walkload_e_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_e_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_00.png'
Binary files tribes/barbarians/gardener/walkload_ne_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_00_pc.png'
Binary files tribes/barbarians/gardener/walkload_ne_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_01.png'
Binary files tribes/barbarians/gardener/walkload_ne_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_01_pc.png'
Binary files tribes/barbarians/gardener/walkload_ne_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_02.png'
Binary files tribes/barbarians/gardener/walkload_ne_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_02_pc.png'
Binary files tribes/barbarians/gardener/walkload_ne_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_03.png'
Binary files tribes/barbarians/gardener/walkload_ne_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_03_pc.png'
Binary files tribes/barbarians/gardener/walkload_ne_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_04.png'
Binary files tribes/barbarians/gardener/walkload_ne_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_04_pc.png'
Binary files tribes/barbarians/gardener/walkload_ne_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_05.png'
Binary files tribes/barbarians/gardener/walkload_ne_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_05_pc.png'
Binary files tribes/barbarians/gardener/walkload_ne_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_06.png'
Binary files tribes/barbarians/gardener/walkload_ne_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_06_pc.png'
Binary files tribes/barbarians/gardener/walkload_ne_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_07.png'
Binary files tribes/barbarians/gardener/walkload_ne_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_07_pc.png'
Binary files tribes/barbarians/gardener/walkload_ne_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_08.png'
Binary files tribes/barbarians/gardener/walkload_ne_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_08_pc.png'
Binary files tribes/barbarians/gardener/walkload_ne_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_09.png'
Binary files tribes/barbarians/gardener/walkload_ne_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_ne_09_pc.png'
Binary files tribes/barbarians/gardener/walkload_ne_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_ne_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_00.png'
Binary files tribes/barbarians/gardener/walkload_nw_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_00_pc.png'
Binary files tribes/barbarians/gardener/walkload_nw_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_01.png'
Binary files tribes/barbarians/gardener/walkload_nw_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_01_pc.png'
Binary files tribes/barbarians/gardener/walkload_nw_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_02.png'
Binary files tribes/barbarians/gardener/walkload_nw_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_02_pc.png'
Binary files tribes/barbarians/gardener/walkload_nw_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_03.png'
Binary files tribes/barbarians/gardener/walkload_nw_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_03_pc.png'
Binary files tribes/barbarians/gardener/walkload_nw_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_04.png'
Binary files tribes/barbarians/gardener/walkload_nw_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_04_pc.png'
Binary files tribes/barbarians/gardener/walkload_nw_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_05.png'
Binary files tribes/barbarians/gardener/walkload_nw_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_05_pc.png'
Binary files tribes/barbarians/gardener/walkload_nw_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_06.png'
Binary files tribes/barbarians/gardener/walkload_nw_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_06_pc.png'
Binary files tribes/barbarians/gardener/walkload_nw_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_07.png'
Binary files tribes/barbarians/gardener/walkload_nw_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_07_pc.png'
Binary files tribes/barbarians/gardener/walkload_nw_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_08.png'
Binary files tribes/barbarians/gardener/walkload_nw_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_08_pc.png'
Binary files tribes/barbarians/gardener/walkload_nw_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_09.png'
Binary files tribes/barbarians/gardener/walkload_nw_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_nw_09_pc.png'
Binary files tribes/barbarians/gardener/walkload_nw_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_nw_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_00.png'
Binary files tribes/barbarians/gardener/walkload_se_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_00_pc.png'
Binary files tribes/barbarians/gardener/walkload_se_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_01.png'
Binary files tribes/barbarians/gardener/walkload_se_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_01_pc.png'
Binary files tribes/barbarians/gardener/walkload_se_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_02.png'
Binary files tribes/barbarians/gardener/walkload_se_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_02_pc.png'
Binary files tribes/barbarians/gardener/walkload_se_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_03.png'
Binary files tribes/barbarians/gardener/walkload_se_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_03_pc.png'
Binary files tribes/barbarians/gardener/walkload_se_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_04.png'
Binary files tribes/barbarians/gardener/walkload_se_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_04_pc.png'
Binary files tribes/barbarians/gardener/walkload_se_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_05.png'
Binary files tribes/barbarians/gardener/walkload_se_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_05_pc.png'
Binary files tribes/barbarians/gardener/walkload_se_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_06.png'
Binary files tribes/barbarians/gardener/walkload_se_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_06_pc.png'
Binary files tribes/barbarians/gardener/walkload_se_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_07.png'
Binary files tribes/barbarians/gardener/walkload_se_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_07_pc.png'
Binary files tribes/barbarians/gardener/walkload_se_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_08.png'
Binary files tribes/barbarians/gardener/walkload_se_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_08_pc.png'
Binary files tribes/barbarians/gardener/walkload_se_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_09.png'
Binary files tribes/barbarians/gardener/walkload_se_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_se_09_pc.png'
Binary files tribes/barbarians/gardener/walkload_se_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_se_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_00.png'
Binary files tribes/barbarians/gardener/walkload_sw_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_00_pc.png'
Binary files tribes/barbarians/gardener/walkload_sw_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_01.png'
Binary files tribes/barbarians/gardener/walkload_sw_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_01_pc.png'
Binary files tribes/barbarians/gardener/walkload_sw_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_02.png'
Binary files tribes/barbarians/gardener/walkload_sw_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_02_pc.png'
Binary files tribes/barbarians/gardener/walkload_sw_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_03.png'
Binary files tribes/barbarians/gardener/walkload_sw_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_03_pc.png'
Binary files tribes/barbarians/gardener/walkload_sw_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_04.png'
Binary files tribes/barbarians/gardener/walkload_sw_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_04_pc.png'
Binary files tribes/barbarians/gardener/walkload_sw_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_05.png'
Binary files tribes/barbarians/gardener/walkload_sw_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_05_pc.png'
Binary files tribes/barbarians/gardener/walkload_sw_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_06.png'
Binary files tribes/barbarians/gardener/walkload_sw_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_06_pc.png'
Binary files tribes/barbarians/gardener/walkload_sw_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_07.png'
Binary files tribes/barbarians/gardener/walkload_sw_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_07_pc.png'
Binary files tribes/barbarians/gardener/walkload_sw_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_08.png'
Binary files tribes/barbarians/gardener/walkload_sw_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_08_pc.png'
Binary files tribes/barbarians/gardener/walkload_sw_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_09.png'
Binary files tribes/barbarians/gardener/walkload_sw_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_sw_09_pc.png'
Binary files tribes/barbarians/gardener/walkload_sw_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_sw_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_00.png'
Binary files tribes/barbarians/gardener/walkload_w_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_00.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_00_pc.png'
Binary files tribes/barbarians/gardener/walkload_w_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_00_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_01.png'
Binary files tribes/barbarians/gardener/walkload_w_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_01.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_01_pc.png'
Binary files tribes/barbarians/gardener/walkload_w_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_01_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_02.png'
Binary files tribes/barbarians/gardener/walkload_w_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_02.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_02_pc.png'
Binary files tribes/barbarians/gardener/walkload_w_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_02_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_03.png'
Binary files tribes/barbarians/gardener/walkload_w_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_03.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_03_pc.png'
Binary files tribes/barbarians/gardener/walkload_w_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_03_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_04.png'
Binary files tribes/barbarians/gardener/walkload_w_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_04.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_04_pc.png'
Binary files tribes/barbarians/gardener/walkload_w_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_04_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_05.png'
Binary files tribes/barbarians/gardener/walkload_w_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_05.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_05_pc.png'
Binary files tribes/barbarians/gardener/walkload_w_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_05_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_06.png'
Binary files tribes/barbarians/gardener/walkload_w_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_06.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_06_pc.png'
Binary files tribes/barbarians/gardener/walkload_w_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_06_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_07.png'
Binary files tribes/barbarians/gardener/walkload_w_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_07.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_07_pc.png'
Binary files tribes/barbarians/gardener/walkload_w_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_07_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_08.png'
Binary files tribes/barbarians/gardener/walkload_w_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_08.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_08_pc.png'
Binary files tribes/barbarians/gardener/walkload_w_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_08_pc.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_09.png'
Binary files tribes/barbarians/gardener/walkload_w_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_09.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/gardener/walkload_w_09_pc.png'
Binary files tribes/barbarians/gardener/walkload_w_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/gardener/walkload_w_09_pc.png	2014-03-16 06:39:32 +0000 differ
=== modified file 'tribes/barbarians/goldmine/conf'
--- tribes/barbarians/goldmine/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/goldmine/conf	2014-03-16 06:39:32 +0000
@@ -1,13 +1,13 @@
 size=mine
-output=goldstone
+output=goldore
 enhancement=deep_goldmine
 
 [buildcost]
-trunk=4
+log=4
 raw_stone=2
 
 [return_on_dismantle]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]
@@ -29,7 +29,7 @@
 consume=ration
 animate=working 20000
 mine=gold 2 33 5
-produce=goldstone
+produce=goldore
 
 [idle]
 pics=goldmine_i_??.png

=== modified file 'tribes/barbarians/goldmine/help.lua'
--- tribes/barbarians/goldmine/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/goldmine/help.lua	2014-03-16 06:39:32 +0000
@@ -15,7 +15,7 @@
 		rt(h2(_"General")) ..
 		rt(p(_"A %1$s exploits only %2$s of the resource. From there on out, it will only have a 5%% chance of finding %3$s.":bformat(_"Gold Mine","1/3",_"Gold Ore"))) ..
 		rt(h3(_"Purpose:")) ..
-		image_line("tribes/barbarians/goldstone/menu.png", 1, p(_"Dig %s out of the ground in mountain terrain.":format(_"Gold Ore"))) ..
+		image_line("tribes/barbarians/goldore/menu.png", 1, p(_"Dig %s out of the ground in mountain terrain.":format(_"Gold Ore"))) ..
 		text_line(_"Working radius:", "2") ..
 		text_line(_"Conquer range:", "n/a") ..
 		text_line(_"Vision range:", "4") ..
@@ -26,8 +26,8 @@
 		dependencies({"tribes/barbarians/inn/menu.png","tribes/barbarians/ration/menu.png","tribes/barbarians/goldmine/menu.png"}, p(_"%s from an Inn":format(_"Ration"))) ..
 		dependencies({"tribes/barbarians/big_inn/menu.png","tribes/barbarians/ration/menu.png","tribes/barbarians/goldmine/menu.png"}, p(_"%s from a Big Inn":format(_"Ration"))) ..
 		rt(h3(_"Outgoing:")) ..
-		dependencies({"tribes/barbarians/resi_gold2/resi_00.png","tribes/barbarians/goldmine/menu.png","tribes/barbarians/goldstone/menu.png"}, p(_"Gold Ore")) ..
-		dependencies({"tribes/barbarians/goldstone/menu.png","tribes/barbarians/smelting_works/menu.png"}, p(_"Smelting Works")) ..
+		dependencies({"tribes/barbarians/resi_gold2/resi_00.png","tribes/barbarians/goldmine/menu.png","tribes/barbarians/goldore/menu.png"}, p(_"Gold Ore")) ..
+		dependencies({"tribes/barbarians/goldore/menu.png","tribes/barbarians/smelting_works/menu.png"}, p(_"Smelting Works")) ..
 		rt(p(_"%s always goes to the %s. It has no other use.":format(_"Gold Ore",_"Smelting Works"))) ..
 	--Building Section
 		rt(h2(_"Building")) ..
@@ -35,10 +35,10 @@
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:",_"Deep Gold Mine","tribes/barbarians/deep_goldmine/menu.png") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== renamed directory 'tribes/barbarians/goldstone' => 'tribes/barbarians/goldore'
=== modified file 'tribes/barbarians/goldore/conf'
--- tribes/barbarians/goldstone/conf	2014-02-25 14:45:19 +0000
+++ tribes/barbarians/goldore/conf	2014-03-16 06:39:32 +0000
@@ -1,7 +1,3 @@
-# Note: this ware once was called gold stone, but because it felt awkward
-# to natural speakers, we changed its name to gold ore. The internal name was
-# kept to goldstone though to not break any older savegames.
-
 help=_Gold ore is mined in a goldmine. Smelted in a smelting works, it turns into gold which is used as a precious building material and to produce weapons and armor.
 preciousness=2
 

=== modified file 'tribes/barbarians/granitemine/conf'
--- tribes/barbarians/granitemine/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/granitemine/conf	2014-03-16 06:39:32 +0000
@@ -2,11 +2,11 @@
 output=raw_stone
 
 [buildcost]
-trunk=4
+log=4
 raw_stone=2
 
 [return_on_dismantle]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]

=== modified file 'tribes/barbarians/granitemine/help.lua'
--- tribes/barbarians/granitemine/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/granitemine/help.lua	2014-03-16 06:39:32 +0000
@@ -35,10 +35,10 @@
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/hardener/conf'
--- tribes/barbarians/hardener/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/hardener/conf	2014-03-16 06:39:32 +0000
@@ -5,25 +5,25 @@
 is_basic=true
 
 [buildcost]
-trunk=3
+log=3
 raw_stone=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 raw_stone=1
 
 [working positions] #  like lumberjack
 lumberjack=1
 
 [inputs]
-trunk=8
+log=8
 
 [programs]
 work=_Work
 
 [work]
 return=skipped unless economy needs blackwood
-consume=trunk:2
+consume=log:2
 sleep=43000
 animate=working 24000
 produce=blackwood

=== modified file 'tribes/barbarians/helmsmithy/conf'
--- tribes/barbarians/helmsmithy/conf	2014-02-25 14:45:19 +0000
+++ tribes/barbarians/helmsmithy/conf	2014-03-16 06:39:32 +0000
@@ -1,20 +1,20 @@
 size=big
 output=helm
 output=mask
-output=warhelmet
+output=warhelm
 
 [aihints]
 build_material=false
 
 [buildcost]
-trunk=3
+log=3
 blackwood=1
 raw_stone=2
 grout=2
 thatchreed=3
 
 [return_on_dismantle]
-trunk=1
+log=1
 raw_stone=2
 grout=1
 thatchreed=1
@@ -30,7 +30,7 @@
 [programs]
 produce_helm=_Produce helm
 produce_mask=_Produce mask
-produce_warhelmet=_Produce warhelm
+produce_warhelm=_Produce warhelm
 work=_Work
 
 [produce_helm]
@@ -47,17 +47,17 @@
 animate=working 45000
 produce=mask
 
-[produce_warhelmet]
-return=skipped unless economy needs warhelmet
+[produce_warhelm]
+return=skipped unless economy needs warhelm
 consume=coal gold iron:2
 sleep=32000
 animate=working 55000
-produce=warhelmet
+produce=warhelm
 
 [work]
 call=produce_helm
 call=produce_mask
-call=produce_warhelmet
+call=produce_warhelm
 sleep=20000
 return=skipped
 

=== modified file 'tribes/barbarians/hunters_hut/conf'
--- tribes/barbarians/hunters_hut/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/hunters_hut/conf	2014-03-16 06:39:32 +0000
@@ -2,11 +2,11 @@
 output=meat
 
 [buildcost]
-trunk=4
+log=4
 raw_stone=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 raw_stone=1
 
 [aihints]

=== modified file 'tribes/barbarians/hunters_hut/help.lua'
--- tribes/barbarians/hunters_hut/help.lua	2014-03-06 19:41:44 +0000
+++ tribes/barbarians/hunters_hut/help.lua	2014-03-16 06:39:32 +0000
@@ -25,7 +25,7 @@
 		rt(h3(_"Outgoing:")) ..
 		dependencies({"tribes/barbarians/hunters_hut/menu.png","tribes/barbarians/meat/menu.png"},p(_"Meat")) ..
 		dependencies({"tribes/barbarians/meat/menu.png","tribes/barbarians/battlearena/menu.png"},p(_"Battle Arena")) ..
-		dependencies({"tribes/barbarians/meat/menu.png","tribes/barbarians/trainingscamp/menu.png"},p(_"Training Camp")) ..
+		dependencies({"tribes/barbarians/meat/menu.png","tribes/barbarians/trainingcamp/menu.png"},p(_"Training Camp")) ..
 		dependencies({"tribes/barbarians/meat/menu.png","tribes/barbarians/tavern/menu.png"},p(_"Tavern")) ..
 		dependencies({"tribes/barbarians/meat/menu.png","tribes/barbarians/inn/menu.png"},p(_"Inn")) ..
 		dependencies({"tribes/barbarians/meat/menu.png","tribes/barbarians/big_inn/menu.png"},p(_"Big Inn")) ..
@@ -35,10 +35,10 @@
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/inn/conf'
--- tribes/barbarians/inn/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/inn/conf	2014-03-16 06:39:32 +0000
@@ -6,12 +6,12 @@
 output=snack
 
 [enhancement_cost]
-trunk=2
+log=2
 grout=2
 thatchreed=1
 
 [return_on_dismantle_on_enhanced]
-trunk=1
+log=1
 grout=1
 
 [working positions]

=== modified file 'tribes/barbarians/lime_kiln/conf'
--- tribes/barbarians/lime_kiln/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/lime_kiln/conf	2014-03-16 06:39:32 +0000
@@ -2,12 +2,12 @@
 output=grout
 
 [buildcost]
-trunk=4
+log=4
 raw_stone=2
 blackwood=1
 
 [return_on_dismantle]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]

=== modified file 'tribes/barbarians/lime_kiln/help.lua'
--- tribes/barbarians/lime_kiln/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/lime_kiln/help.lua	2014-03-16 06:39:32 +0000
@@ -22,7 +22,7 @@
 		rt(h3(_"Incoming:")) ..
 		dependencies({"tribes/barbarians/granitemine/menu.png;tribes/barbarians/quarry/menu.png","tribes/barbarians/raw_stone/menu.png","tribes/barbarians/lime_kiln/menu.png"}) ..
 		rt(p(_"Raw Stone from the Granite Mine or Quarry")) ..
-		dependencies({"tribes/barbarians/coalmine/menu.png;tribes/barbarians/burners_house/menu.png","tribes/barbarians/coal/menu.png","tribes/barbarians/axefactory/menu.png"}) ..
+		dependencies({"tribes/barbarians/coalmine/menu.png;tribes/barbarians/burners_house/menu.png","tribes/barbarians/coal/menu.png","tribes/barbarians/axfactory/menu.png"}) ..
 		rt(p(_"%s from the Coal mine or the Charcoal Burner’s House":format(_"Coal"))) ..
 		dependencies({"tribes/barbarians/well/menu.png","tribes/barbarians/water/menu.png","tribes/barbarians/lime_kiln/menu.png"},p(_"Water from the Well")) ..
 		--rt() ..
@@ -37,11 +37,11 @@
 		rt(h3(_"Build cost:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== added directory 'tribes/barbarians/log'
=== added file 'tribes/barbarians/log/conf'
--- tribes/barbarians/log/conf	1970-01-01 00:00:00 +0000
+++ tribes/barbarians/log/conf	2014-03-16 06:39:32 +0000
@@ -0,0 +1,12 @@
+help=_Logs are a principal building material of the barbarians. The trees are felled by lumberjacks; rangers care for the supply of trees. Logs are also used in the metal workshop to build basic tools, and in the charcoal burner’s house in the production of coal. The wood hardener refines logs by hardening them in the fire which gives blackwood.
+
+
+preciousness=14
+default_target_quantity=40
+
+# Barbarian logs are made of black wood from the black forests
+# they come from.
+
+[idle]
+pics=idle.png
+hotspot=6 7

=== added file 'tribes/barbarians/log/idle.png'
Binary files tribes/barbarians/log/idle.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/log/idle.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/log/menu.png'
Binary files tribes/barbarians/log/menu.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/log/menu.png	2014-03-16 06:39:32 +0000 differ
=== modified file 'tribes/barbarians/lumberjack/conf'
--- tribes/barbarians/lumberjack/conf	2014-02-22 16:49:17 +0000
+++ tribes/barbarians/lumberjack/conf	2014-03-16 06:39:32 +0000
@@ -3,7 +3,7 @@
 
 [buildcost]
 carrier=1
-felling_axe=1
+felling_ax=1
 
 [chop]
 0=findobject attrib:tree radius:10
@@ -13,7 +13,7 @@
 4=playFX ../../../sound/spoken/timber 192
 5=object fall
 6=animation idle 2000
-7=createware trunk
+7=createware log
 8=return
 
 [hacking]

=== modified file 'tribes/barbarians/lumberjacks_hut/conf'
--- tribes/barbarians/lumberjacks_hut/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/lumberjacks_hut/conf	2014-03-16 06:39:32 +0000
@@ -1,18 +1,18 @@
 size=small
-output=trunk
+output=log
 
 [buildcost]
-trunk=3
+log=3
 
 [return_on_dismantle]
-trunk=2
+log=2
 
 [working positions]
 lumberjack=1
 
 [aihints]
 is_basic=true
-trunkproducer=true
+logproducer=true
 
 [programs]
 work=_Work

=== modified file 'tribes/barbarians/lumberjacks_hut/help.lua'
--- tribes/barbarians/lumberjacks_hut/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/lumberjacks_hut/help.lua	2014-03-16 06:39:32 +0000
@@ -14,7 +14,7 @@
 	--General Section
 		rt(h2(_"General")) ..
 		rt(h3(_"Purpose:")) ..
-		image_line("tribes/barbarians/trunk/menu.png",1,p(_"Fell trees in the surrounding area and process them into logs.")) ..
+		image_line("tribes/barbarians/log/menu.png",1,p(_"Fell trees in the surrounding area and process them into logs.")) ..
 		text_line(_"Working radius:", "10") ..
 		text_line(_"Conquer range:", "n/a") ..
 		text_line(_"Vision range:", "4") ..
@@ -23,25 +23,25 @@
 		rt(p(_"The Lumberjack’s Hut needs trees in the immediate vicinity to fell.")) ..
 		text_line(_"Incoming:", "n/a") ..
 		rt(h3(_"Outgoing:")) ..
-		dependencies({"tribes/barbarians/lumberjacks_hut/menu.png","tribes/barbarians/trunk/menu.png"},p(_"Log")) ..
-		dependencies({"tribes/barbarians/trunk/menu.png","tribes/barbarians/constructionsite/menu.png"},p(_"Construction Site")) ..
-		dependencies({"tribes/barbarians/trunk/menu.png","tribes/barbarians/burners_house/menu.png"},p(_"Charcoal Burner’s House")) ..
-		dependencies({"tribes/barbarians/trunk/menu.png","tribes/barbarians/metalworks/menu.png"},p(_"Metal Workshop")) ..
-		dependencies({"tribes/barbarians/trunk/menu.png","tribes/barbarians/hardener/menu.png"},p(_"Wood Hardener")) ..
+		dependencies({"tribes/barbarians/lumberjacks_hut/menu.png","tribes/barbarians/log/menu.png"},p(_"Log")) ..
+		dependencies({"tribes/barbarians/log/menu.png","tribes/barbarians/constructionsite/menu.png"},p(_"Construction Site")) ..
+		dependencies({"tribes/barbarians/log/menu.png","tribes/barbarians/burners_house/menu.png"},p(_"Charcoal Burner’s House")) ..
+		dependencies({"tribes/barbarians/log/menu.png","tribes/barbarians/metalworks/menu.png"},p(_"Metal Workshop")) ..
+		dependencies({"tribes/barbarians/log/menu.png","tribes/barbarians/hardener/menu.png"},p(_"Wood Hardener")) ..
 	--Building Section
 		rt(h2(_"Building")) ..
 		text_line(_"Space required:",_"Small plot","pics/small.png") ..
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 3), 3) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 3), 3) ..
 		rt(h3(_"Dismantle yields:")) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..
 		rt(h3(_"Crew required:")) ..
 		image_line("tribes/barbarians/lumberjack/menu.png", 1, p(_"Lumberjack")) ..
-		text_line(_"Worker uses:",_"Felling Ax","tribes/barbarians/felling_axe/menu.png") ..
+		text_line(_"Worker uses:",_"Felling Ax","tribes/barbarians/felling_ax/menu.png") ..
 		text_line(_"Experience levels:","n/a") ..
 	--Production Section
 		rt(h2(_"Production")) ..

=== modified file 'tribes/barbarians/metalworks/conf'
--- tribes/barbarians/metalworks/conf	2014-03-12 19:11:45 +0000
+++ tribes/barbarians/metalworks/conf	2014-03-16 06:39:32 +0000
@@ -1,6 +1,6 @@
 size=medium
-output=felling_axe
-output=bakingtray
+output=felling_ax
+output=bread_paddle
 output=fire_tongs
 output=fishing_rod
 output=hammer
@@ -9,10 +9,10 @@
 output=scythe
 output=shovel
 output=hunting_spear
-enhancement=axefactory
+enhancement=axfactory
 
 [buildcost]
-trunk=1
+log=1
 blackwood=1
 raw_stone=2
 grout=1
@@ -28,15 +28,15 @@
 
 [inputs]
 iron=8
-trunk=8
+log=8
 
 [aihints]
 build_material=false
 is_basic=true
 
 [programs]
-produce_felling_axe=_Produce felling ax
-produce_bakingtray=_Produce bread paddle
+produce_felling_ax=_Produce felling ax
+produce_bread_paddle=_Produce bread paddle
 produce_fire_tongs=_Produce fire tongs
 produce_fishing_rod=_Produce fishing rod
 produce_hammer=_Produce hammer
@@ -47,25 +47,25 @@
 produce_hunting_spear=_Produce hunting spear
 work=_Work
 
-[produce_felling_axe]
-return=skipped unless economy needs felling_axe
-consume=iron trunk
+[produce_felling_ax]
+return=skipped unless economy needs felling_ax
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
-produce=felling_axe
+produce=felling_ax
 
-[produce_bakingtray]
-return=skipped unless economy needs bakingtray
-consume=iron trunk
+[produce_bread_paddle]
+return=skipped unless economy needs bread_paddle
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
-produce=bakingtray
+produce=bread_paddle
 
 [produce_fire_tongs]
 return=skipped unless economy needs fire_tongs
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -73,7 +73,7 @@
 
 [produce_fishing_rod]
 return=skipped unless economy needs fishing_rod
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -81,7 +81,7 @@
 
 [produce_hammer]
 return=skipped unless economy needs hammer
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -89,7 +89,7 @@
 
 [produce_kitchen_tools]
 return=skipped unless economy needs kitchen_tools
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -97,7 +97,7 @@
 
 [produce_pick]
 return=skipped unless economy needs pick
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -105,7 +105,7 @@
 
 [produce_scythe]
 return=skipped unless economy needs scythe
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -113,7 +113,7 @@
 
 [produce_shovel]
 return=skipped unless economy needs shovel
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -121,14 +121,14 @@
 
 [produce_hunting_spear]
 return=skipped unless economy needs hunting_spear
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=hunting_spear
 
 [work]
-call=produce_bakingtray
+call=produce_bread_paddle
 call=produce_fire_tongs
 call=produce_fishing_rod
 call=produce_hammer
@@ -137,7 +137,7 @@
 call=produce_scythe
 call=produce_shovel
 call=produce_hunting_spear
-call=produce_felling_axe
+call=produce_felling_ax
 return=skipped
 
 [build]

=== modified file 'tribes/barbarians/metalworks/help.lua'
--- tribes/barbarians/metalworks/help.lua	2014-03-10 08:58:35 +0000
+++ tribes/barbarians/metalworks/help.lua	2014-03-16 06:39:32 +0000
@@ -14,8 +14,8 @@
 	--General Section
 		rt(h2(_"General")) ..
 		text_line(_"Purpose:", _"The Barbarian Metal Workshop is the basic production site in a series of three buildings and creates all the tools that Barbarians need. The others are for weapons.") ..
-		rt("image=tribes/barbarians/bakingtray/menu.png;tribes/barbarians/felling_axe/menu.png;tribes/barbarians/fire_tongs/menu.png;tribes/barbarians/fishing_rod/menu.png;tribes/barbarians/hammer/menu.png;tribes/barbarians/hunting_spear/menu.png;tribes/barbarians/kitchen_tools/menu.png;tribes/barbarians/pick/menu.png;tribes/barbarians/scythe/menu.png;tribes/barbarians/shovel/menu.png image-align=right",p("")) ..
-		rt(p(_"It can make Bread Paddles, Felling Axes, Fire Tongs, Fishing Rods, Hammers, Hunting Spears, Kitchen Tools, Picks, Scythes and Shovels.")) ..
+		rt("image=tribes/barbarians/bread_paddle/menu.png;tribes/barbarians/felling_ax/menu.png;tribes/barbarians/fire_tongs/menu.png;tribes/barbarians/fishing_rod/menu.png;tribes/barbarians/hammer/menu.png;tribes/barbarians/hunting_spear/menu.png;tribes/barbarians/kitchen_tools/menu.png;tribes/barbarians/pick/menu.png;tribes/barbarians/scythe/menu.png;tribes/barbarians/shovel/menu.png image-align=right",p("")) ..
+		rt(p(_"It can make Bread Paddles, Felling axs, Fire Tongs, Fishing Rods, Hammers, Hunting Spears, Kitchen Tools, Picks, Scythes and Shovels.")) ..
 		text_line(_"Working radius:", "n/a") ..
 		text_line(_"Conquer range:", "n/a") ..
 		text_line(_"Vision range:", "4") ..
@@ -23,10 +23,10 @@
 		rt(h2(_"Dependencies")) ..
 		rt(h3(_"Incoming:")) ..
 		dependencies({"tribes/barbarians/smelting_works/menu.png","tribes/barbarians/iron/menu.png","tribes/barbarians/metalworks/menu.png"},p(_"%s from the Smelting Works":format(_"Iron"))) ..
-		dependencies({"tribes/barbarians/lumberjacks_hut/menu.png","tribes/barbarians/trunk/menu.png","tribes/barbarians/metalworks/menu.png"},p(_"%s from the Lumberjack’s hut":format(_"Log"))) ..
+		dependencies({"tribes/barbarians/lumberjacks_hut/menu.png","tribes/barbarians/log/menu.png","tribes/barbarians/metalworks/menu.png"},p(_"%s from the Lumberjack’s hut":format(_"Log"))) ..
 		rt(h3(_"Outgoing:")) ..
-		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/bakingtray/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/baker/menu.png" },p(_"Baker")) ..
-		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/felling_axe/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/lumberjack/menu.png" },p(_"Lumberjack")) ..
+		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/bread_paddle/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/baker/menu.png" },p(_"Baker")) ..
+		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/felling_ax/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/lumberjack/menu.png" },p(_"Lumberjack")) ..
 		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/fire_tongs/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/smelter/menu.png" },p(_"Smelter")) ..
 		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/fishing_rod/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/fisher/menu.png" },p(_"Fisher")) ..
 		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/hammer/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/builder/menu.png" },p(_"Builder")) ..
@@ -39,7 +39,7 @@
 		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/pick/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/stonemason/menu.png" },p(_"Stonemason")) ..
 		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/scythe/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/farmer/menu.png" },p(_"Farmer")) ..
 		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/shovel/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/ranger/menu.png" },p(_"Ranger")) ..
-		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/shovel/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/ferner/menu.png" },p(_"Gardener")) ..
+		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/shovel/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/gardener/menu.png" },p(_"Gardener")) ..
 	--Building Section
 		rt(h2(_"Building")) ..
 		text_line(_"Space required:",_"Medium plot","pics/medium.png") ..
@@ -49,14 +49,14 @@
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 1), 1) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 1), 1) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 1), 1) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 1), 1) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 1), 1) ..
-		text_line(_"Upgradeable to:",_"Axfactory","tribes/barbarians/axefactory/menu.png") ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 1), 1) ..
+		text_line(_"Upgradeable to:",_"Axfactory","tribes/barbarians/axfactory/menu.png") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..
 		rt(h3(_"Crew required:")) ..

=== modified file 'tribes/barbarians/micro-brewery/conf'
--- tribes/barbarians/micro-brewery/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/micro-brewery/conf	2014-03-16 06:39:32 +0000
@@ -6,13 +6,13 @@
 build_material=false
 
 [buildcost]
-trunk=3
+log=3
 blackwood=2
 raw_stone=3
 thatchreed=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 blackwood=1
 raw_stone=2
 

=== modified file 'tribes/barbarians/micro-brewery/help.lua'
--- tribes/barbarians/micro-brewery/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/micro-brewery/help.lua	2014-03-16 06:39:32 +0000
@@ -34,12 +34,12 @@
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 2), 2) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 2), 2) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 3), 3) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 3), 3) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 3), 3) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:",_"Brewery","tribes/barbarians/brewery/menu.png") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/oremine/conf'
--- tribes/barbarians/oremine/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/oremine/conf	2014-03-16 06:39:32 +0000
@@ -3,11 +3,11 @@
 enhancement=deep_oremine
 
 [buildcost]
-trunk=4
+log=4
 raw_stone=2
 
 [return_on_dismantle]
-trunk=2
+log=2
 raw_stone=1
 
 [working positions]

=== modified file 'tribes/barbarians/oremine/help.lua'
--- tribes/barbarians/oremine/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/oremine/help.lua	2014-03-16 06:39:32 +0000
@@ -35,10 +35,10 @@
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:",_"Deep Iron Ore Mine","tribes/barbarians/deep_oremine/menu.png") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/port/conf'
--- tribes/barbarians/port/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/port/conf	2014-03-16 06:39:32 +0000
@@ -3,7 +3,7 @@
 heal_per_second=170
 
 [buildcost]
-trunk=3
+log=3
 blackwood=3
 raw_stone=5
 grout=2
@@ -12,7 +12,7 @@
 gold=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 blackwood=2
 raw_stone=3
 grout=1

=== modified file 'tribes/barbarians/quarry/conf'
--- tribes/barbarians/quarry/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/quarry/conf	2014-03-16 06:39:32 +0000
@@ -2,10 +2,10 @@
 output=raw_stone
 
 [buildcost]
-trunk=4
+log=4
 
 [return_on_dismantle]
-trunk=2
+log=2
 
 [working positions]
 stonemason=1

=== modified file 'tribes/barbarians/quarry/help.lua'
--- tribes/barbarians/quarry/help.lua	2014-03-06 19:41:44 +0000
+++ tribes/barbarians/quarry/help.lua	2014-03-16 06:39:32 +0000
@@ -31,9 +31,9 @@
 		text_line(_"Space required:",_"Small plot","pics/small.png") ..
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/barbarians/rangers_hut/conf'
--- tribes/barbarians/rangers_hut/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/rangers_hut/conf	2014-03-16 06:39:32 +0000
@@ -1,16 +1,16 @@
 size=small
 
 [buildcost]
-trunk=4
+log=4
 
 [return_on_dismantle]
-trunk=3
+log=3
 
 [working positions]
 ranger=1
 
 [aihints]
-renews_map_resource=trunk
+renews_map_resource=log
 space_consumer=true
 
 [programs]

=== modified file 'tribes/barbarians/rangers_hut/help.lua'
--- tribes/barbarians/rangers_hut/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/rangers_hut/help.lua	2014-03-16 06:39:32 +0000
@@ -28,9 +28,9 @@
 		text_line(_"Space required:",_"Small plot","pics/small.png") ..
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 		rt(h3(_"Dismantle yields:")) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== added directory 'tribes/barbarians/reed_yard'
=== added file 'tribes/barbarians/reed_yard/conf'
--- tribes/barbarians/reed_yard/conf	1970-01-01 00:00:00 +0000
+++ tribes/barbarians/reed_yard/conf	2014-03-16 06:39:32 +0000
@@ -0,0 +1,38 @@
+size=medium
+output=thatchreed
+
+[aihints]
+space_consumer=true
+
+[buildcost]
+log=5
+raw_stone=2
+
+[return_on_dismantle]
+log=2
+raw_stone=1
+
+[working positions]
+gardener=1
+
+[programs]
+plant_reed=_Plant reed
+harvest_reed=_Harvest reed
+work=_Work
+
+[plant_reed]
+sleep=18000  #orig sleep=20000 but gardener animation was increased by 2sec
+worker=plantreed
+
+[harvest_reed]
+sleep=5000
+worker=harvestreed
+
+[work]
+call=plant_reed
+call=harvest_reed
+return=skipped
+
+[idle]
+pics=reed_yard_i_??.png  # ???
+hotspot=46 44

=== added file 'tribes/barbarians/reed_yard/help.lua'
--- tribes/barbarians/reed_yard/help.lua	1970-01-01 00:00:00 +0000
+++ tribes/barbarians/reed_yard/help.lua	2014-03-16 06:39:32 +0000
@@ -0,0 +1,48 @@
+use("aux", "formatting")
+use("aux", "format_help")
+
+set_textdomain("tribe_barbarians")
+
+return {
+	text =
+		--rt(h1(_"The Barbarian Reed Yard")) ..
+	--Lore Section
+		rt(h2(_"Lore")) ..
+		rt("image=tribes/barbarians/reed_yard/reed_yard_i_00.png", p(
+			_[[‘We grow roofs’]])) ..
+		rt("text-align=right",p("font-size=10 font-style=italic", _[[Slogan of the Guild of Gardeners]])) ..
+	--General Section
+		rt(h2(_"General")) ..
+		text_line(_"Purpose:", _"The Reed Yard cultivates reed that serves two different purposes for the Barbarian tribe.<br>It is the traditional material for roofing, and it is woven into the extremely durable cloth that they use for their ships’ sails.","tribes/barbarians/thatchreed/menu.png") ..
+		text_line(_"Working radius:", "1") ..
+		text_line(_"Conquer range:", "n/a") ..
+		text_line(_"Vision range:", "4") ..
+	--Dependencies
+		rt(h2(_"Dependencies")) ..
+		text_line(_"Incoming:","n/a") ..
+		rt(h3(_"Outgoing:")) ..
+		dependencies({"tribes/barbarians/reed_yard/menu.png","tribes/barbarians/thatchreed/menu.png"},p(_"Thatch Reed")) ..
+		dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/constructionsite/menu.png"},p(_"Construction Site")) ..
+		rt(p(_"The Reed Yard’s output will only go to construction sites that need it.")) ..
+		dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/weaving-mill/menu.png"},p(_"Weaving-Mill")) ..
+	--Building Section
+		rt(h2(_"Building")) ..
+		text_line(_"Space required:",_"Medium plot","pics/medium.png") ..
+		text_line(_"Upgraded from:", "n/a") ..
+		rt(h3(_"Build cost:")) ..
+		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 5), 5) ..
+		rt(h3(_"Dismantle yields:")) ..
+		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 1), 1) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 3), 3) ..
+		text_line(_"Upgradeable to:","n/a") ..
+	--Workers Section
+		rt(h2(_"Workers")) ..
+		rt(h3(_"Crew required:")) ..
+		image_line("tribes/barbarians/gardener/menu.png", 1, p(_"Gardener")) ..
+		text_line(_"Worker uses:", _"Shovel","tribes/barbarians/shovel/menu.png") ..
+		text_line(_"Experience levels:","n/a") ..
+	--Production Section
+		rt(h2(_"Production")) ..
+		text_line(_"Performance:", _"A Reed Yard can produce a sheaf of Thatch Reed in about %s on average.":format("65s"))
+}

=== added file 'tribes/barbarians/reed_yard/menu.png'
Binary files tribes/barbarians/reed_yard/menu.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/reed_yard/menu.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/barbarians/reed_yard/reed_yard_i_00.png'
Binary files tribes/barbarians/reed_yard/reed_yard_i_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/reed_yard/reed_yard_i_00.png	2014-03-16 06:39:32 +0000 differ
=== modified file 'tribes/barbarians/scouts_hut/conf'
--- tribes/barbarians/scouts_hut/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/scouts_hut/conf	2014-03-16 06:39:32 +0000
@@ -1,11 +1,11 @@
 size=small
 
 [buildcost]
-trunk=2
+log=2
 raw_stone=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 raw_stone=1
 
 [inputs]

=== modified file 'tribes/barbarians/scripting/sc00_headquarters_medium.lua'
--- tribes/barbarians/scripting/sc00_headquarters_medium.lua	2012-02-15 21:25:34 +0000
+++ tribes/barbarians/scripting/sc00_headquarters_medium.lua	2014-03-16 06:39:32 +0000
@@ -19,12 +19,12 @@
 
    hq = prefilled_buildings(player, { "headquarters", sf.x, sf.y,
       wares = {
-         axe = 5,
-         bakingtray = 2,
+         ax = 5,
+         bread_paddle = 2,
          blackwood = 32,
          cloth = 5,
          coal = 12,
-         felling_axe = 4,
+         felling_ax = 4,
          fire_tongs = 2,
          fish = 6,
          fishing_rod = 2,
@@ -45,7 +45,7 @@
          shovel = 4,
          snack = 3,
          thatchreed = 24,
-         trunk = 80,
+         log = 80,
       },
       workers = {
          blacksmith = 2,
@@ -53,7 +53,7 @@
          builder = 10,
          burner = 1,
          carrier = 40,
-         ferner = 1,
+         gardener = 1,
          geologist = 4,
          ["lime-burner"] = 1,
          lumberjack = 3,

=== modified file 'tribes/barbarians/scripting/sc01_citadel_village.lua'
--- tribes/barbarians/scripting/sc01_citadel_village.lua	2014-03-08 05:30:43 +0000
+++ tribes/barbarians/scripting/sc01_citadel_village.lua	2014-03-16 06:39:32 +0000
@@ -24,12 +24,12 @@
    if not pcall(function()
        place_building_in_region(plr, "warehouse", sf:region(7), {
          wares = {
-            axe = 5,
-            bakingtray = 2,
+            ax = 5,
+            bread_paddle = 2,
             blackwood = 32,
             cloth = 5,
             coal = 1,
-            felling_axe = 4,
+            felling_ax = 4,
             fire_tongs = 2,
             fishing_rod = 2,
             grout = 12,
@@ -45,14 +45,14 @@
             shovel = 4,
             snack = 3,
             thatchreed = 24,
-            trunk = 79,
+            log = 79,
          },
          workers = {
             brewer = 1,
             builder = 10,
             burner = 1,
             carrier = 38,
-            ferner = 1,
+            gardener = 1,
             geologist = 4,
             lumberjack = 2,
             miner = 4,
@@ -73,7 +73,7 @@
          }
       })
 
-      place_building_in_region(plr, "trainingscamp", sf:region(12))
+      place_building_in_region(plr, "trainingcamp", sf:region(12))
 
       place_building_in_region(plr, "helmsmithy", sf:region(12), {
          wares = { iron = 4, gold = 4 }
@@ -81,11 +81,11 @@
       place_building_in_region(plr, "metalworks", sf:region(12), {
          wares = { iron = 8 },
       })
-      place_building_in_region(plr, "axefactory", sf:region(12), {
+      place_building_in_region(plr, "axfactory", sf:region(12), {
          wares = { coal = 8 },
       })
       place_building_in_region(plr, "hardener", sf:region(12), {
-         wares = { trunk = 1 },
+         wares = { log = 1 },
       })
       place_building_in_region(plr, "lime_kiln", sf:region(12), {
          wares = { raw_stone = 6, coal = 3 },

=== renamed directory 'tribes/barbarians/sharpaxe' => 'tribes/barbarians/sharpax'
=== modified file 'tribes/barbarians/shipconstruction/conf'
--- tribes/barbarians/shipconstruction/conf	2012-02-20 15:54:26 +0000
+++ tribes/barbarians/shipconstruction/conf	2014-03-16 06:39:32 +0000
@@ -4,7 +4,7 @@
 
 [buildcost]
 blackwood=10
-trunk=2
+log=2
 cloth=4
 
 [program]

=== modified file 'tribes/barbarians/shipyard/conf'
--- tribes/barbarians/shipyard/conf	2013-07-23 17:50:05 +0000
+++ tribes/barbarians/shipyard/conf	2014-03-16 06:39:32 +0000
@@ -5,13 +5,13 @@
 needs_water=true
 
 [buildcost]
-trunk=3
+log=3
 blackwood=2
 raw_stone=3
 cloth=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 blackwood=1
 raw_stone=2
 
@@ -20,7 +20,7 @@
 
 [inputs]
 blackwood=10
-trunk=2
+log=2
 cloth=4
 
 [programs]

=== modified file 'tribes/barbarians/smelting_works/conf'
--- tribes/barbarians/smelting_works/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/smelting_works/conf	2014-03-16 06:39:32 +0000
@@ -6,14 +6,14 @@
 build_material=false
 
 [buildcost]
-trunk=3
+log=3
 blackwood=1
 raw_stone=1
 grout=1
 thatchreed=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 blackwood=1
 raw_stone=1
 
@@ -22,7 +22,7 @@
 
 [inputs]
 ironore=8
-goldstone=8
+goldore=8
 coal=8
 
 [programs]
@@ -39,7 +39,7 @@
 
 [smelt_gold]
 return=skipped unless economy needs gold
-consume=coal goldstone
+consume=coal goldore
 sleep=32000
 animate=working 35000
 produce=gold

=== modified file 'tribes/barbarians/soldier/conf'
--- tribes/barbarians/soldier/conf	2012-03-14 21:05:00 +0000
+++ tribes/barbarians/soldier/conf	2014-03-16 06:39:32 +0000
@@ -46,7 +46,7 @@
 # SOLDIER SPECIFIC STUFF ENDS HERE
 
 [buildcost]
-axe=1
+ax=1
 carrier=1
 
 [idle]

=== modified file 'tribes/barbarians/tavern/conf'
--- tribes/barbarians/tavern/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/tavern/conf	2014-03-16 06:39:32 +0000
@@ -3,13 +3,13 @@
 enhancement=inn
 
 [buildcost]
-trunk=3
+log=3
 blackwood=2
 raw_stone=1
 thatchreed=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 blackwood=1
 raw_stone=1
 

=== renamed directory 'tribes/barbarians/trainingscamp' => 'tribes/barbarians/trainingcamp'
=== modified file 'tribes/barbarians/trainingcamp/conf'
--- tribes/barbarians/trainingscamp/conf	2014-03-10 10:45:21 +0000
+++ tribes/barbarians/trainingcamp/conf	2014-03-16 06:39:32 +0000
@@ -3,14 +3,14 @@
 trainer_patience=5
 
 [buildcost]
-trunk=6
+log=6
 raw_stone=4
 grout=6
 gold=4
 thatchreed=3
 
 [return_on_dismantle]
-trunk=3
+log=3
 raw_stone=2
 grout=2
 gold=2
@@ -22,14 +22,14 @@
 pittabread=10
 fish=6
 meat=6
-sharpaxe=2
-broadaxe=2
-bronzeaxe=2
-battleaxe=2
-warriorsaxe=2
+sharpax=2
+broadax=2
+bronzeax=2
+battleax=2
+warriorsax=2
 helm=2
 mask=2
-warhelmet=2
+warhelm=2
 
 [soldier attack]
 min_level=0
@@ -58,35 +58,35 @@
 check_soldier=soldier attack 0 # Fails when aren't any soldier of level 0 attack
 sleep=30000
 check_soldier=soldier attack 0 # Because the soldier can be expulsed by the player
-consume=sharpaxe fish,meat pittabread
+consume=sharpax fish,meat pittabread
 train=soldier attack 0 1
 
 [upgrade_soldier_attack_1]
 check_soldier=soldier attack 1
 sleep=30000
 check_soldier=soldier attack 1
-consume=broadaxe fish,meat pittabread
+consume=broadax fish,meat pittabread
 train=soldier attack 1 2
 
 [upgrade_soldier_attack_2]
 check_soldier=soldier attack 2
 sleep=30000
 check_soldier=soldier attack 2
-consume=bronzeaxe fish,meat pittabread
+consume=bronzeax fish,meat pittabread
 train=soldier attack 2 3
 
 [upgrade_soldier_attack_3]
 check_soldier=soldier attack 3
 sleep=30000
 check_soldier=soldier attack 3
-consume=battleaxe fish,meat:2 pittabread
+consume=battleax fish,meat:2 pittabread
 train=soldier attack 3 4
 
 [upgrade_soldier_attack_4]
 check_soldier=soldier attack 4
 sleep=30000
 check_soldier=soldier attack 4
-consume=warriorsaxe fish,meat pittabread:2
+consume=warriorsax fish,meat pittabread:2
 train=soldier attack 4 5
 
 [upgrade_soldier_hp_0]
@@ -107,19 +107,19 @@
 check_soldier=soldier hp 2
 sleep=30000
 check_soldier=soldier hp 2
-consume=warhelmet fish,meat:2 pittabread
+consume=warhelm fish,meat:2 pittabread
 train=soldier hp 2 3
 
 [build]
-pics=trainingscamp_b_??.png  # ???
+pics=trainingcamp_b_??.png  # ???
 hotspot=110 77
 
 [unoccupied]
-pics=trainingscamp_u_??.png  # ???
+pics=trainingcamp_u_??.png  # ???
 hotspot=110 75
 
 [idle]
-pics=trainingscamp_i_??.png  # ???
+pics=trainingcamp_i_??.png  # ???
 hotspot=110 75
 playercolor=true
 fps=10

=== modified file 'tribes/barbarians/trainingcamp/help.lua'
--- tribes/barbarians/trainingscamp/help.lua	2014-03-10 10:45:21 +0000
+++ tribes/barbarians/trainingcamp/help.lua	2014-03-16 06:39:32 +0000
@@ -8,7 +8,7 @@
 		--rt(h1(_"The Barbarian Training Camp")) ..
 	--Lore Section
 		rt(h2(_"Lore")) ..
-		rt("image=tribes/barbarians/trainingscamp/trainingscamp_i_00.png", p(
+		rt("image=tribes/barbarians/trainingcamp/trainingcamp_i_00.png", p(
 			_[[‘He who is strong shall neither forgive nor forget, but revenge injustice suffered – in the past and for all future.’]])) ..
 		rt("text-align=right",p("font-size=10 font-style=italic", _[[Chief Chat’Karuth in a speech to his army.]])) ..
 	--General Section
@@ -22,15 +22,15 @@
 		text_line(_"Vision range:", "4") ..
 	--Dependencies
 		rt(h2(_"Dependencies")) ..
-		dependencies({"tribes/barbarians/soldier/untrained.png","tribes/barbarians/trainingscamp/menu.png","tribes/barbarians/soldier/fulltrained-evade.png"}) ..
-		dependencies({"tribes/barbarians/soldier/untrained+evade.png","tribes/barbarians/trainingscamp/menu.png","tribes/barbarians/soldier/fulltrained.png"}) ..
+		dependencies({"tribes/barbarians/soldier/untrained.png","tribes/barbarians/trainingcamp/menu.png","tribes/barbarians/soldier/fulltrained-evade.png"}) ..
+		dependencies({"tribes/barbarians/soldier/untrained+evade.png","tribes/barbarians/trainingcamp/menu.png","tribes/barbarians/soldier/fulltrained.png"}) ..
 		rt(h3(_"Training Attack:")) ..
-		dependencies({"tribes/barbarians/axefactory/menu.png","tribes/barbarians/sharpaxe/menu.png;tribes/barbarians/broadaxe/menu.png","tribes/barbarians/trainingscamp/menu.png"}) ..
+		dependencies({"tribes/barbarians/axfactory/menu.png","tribes/barbarians/sharpax/menu.png;tribes/barbarians/broadax/menu.png","tribes/barbarians/trainingcamp/menu.png"}) ..
 		rt(p(_"Provided by the Axfactory")) ..
-		dependencies({"tribes/barbarians/warmill/menu.png","tribes/barbarians/sharpaxe/menu.png;tribes/barbarians/broadaxe/menu.png;tribes/barbarians/bronzeaxe/menu.png;tribes/barbarians/battleaxe/menu.png;tribes/barbarians/warriorsaxe/menu.png","tribes/barbarians/trainingscamp/menu.png"}) ..
+		dependencies({"tribes/barbarians/warmill/menu.png","tribes/barbarians/sharpax/menu.png;tribes/barbarians/broadax/menu.png;tribes/barbarians/bronzeax/menu.png;tribes/barbarians/battleax/menu.png;tribes/barbarians/warriorsax/menu.png","tribes/barbarians/trainingcamp/menu.png"}) ..
 		rt(p(_"Provided by the War Mill")) ..
 		rt(h3(_"Training Health:")) ..
-		dependencies({"tribes/barbarians/helmsmithy/menu.png","tribes/barbarians/helm/menu.png;tribes/barbarians/mask/menu.png;tribes/barbarians/warhelmet/menu.png","tribes/barbarians/trainingscamp/menu.png"}) ..
+		dependencies({"tribes/barbarians/helmsmithy/menu.png","tribes/barbarians/helm/menu.png;tribes/barbarians/mask/menu.png;tribes/barbarians/warhelm/menu.png","tribes/barbarians/trainingcamp/menu.png"}) ..
 		rt(p(_"Provided by the Helm Smithy")) ..
 		rt(h3(_"Training Both")) ..
 		image_line("tribes/barbarians/pittabread/menu.png",1,p(_"%s and":format(_"Pitta Bread"))) ..
@@ -44,13 +44,13 @@
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 3), 3) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 6), 6) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 4), 4) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 6), 6) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 6), 6) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "gold", ngettext("%i Gold", "%i Gold", 2), 2) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 2), 2) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 3), 3) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 3), 3) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 3), 3) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_b_00.png' => 'tribes/barbarians/trainingcamp/trainingcamp_b_00.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_b_01.png' => 'tribes/barbarians/trainingcamp/trainingcamp_b_01.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_b_02.png' => 'tribes/barbarians/trainingcamp/trainingcamp_b_02.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_b_03.png' => 'tribes/barbarians/trainingcamp/trainingcamp_b_03.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_00.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_00.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_00_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_00_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_01.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_01.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_01_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_01_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_02.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_02.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_02_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_02_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_03.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_03.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_03_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_03_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_04.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_04.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_04_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_04_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_05.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_05.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_05_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_05_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_06.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_06.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_06_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_06_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_07.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_07.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_07_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_07_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_08.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_08.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_08_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_08_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_09.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_09.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_09_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_09_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_10.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_10.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_10_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_10_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_11.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_11.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_11_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_11_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_12.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_12.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_12_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_12_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_13.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_13.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_13_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_13_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_14.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_14.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_14_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_14_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_15.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_15.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_15_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_15_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_16.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_16.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_16_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_16_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_17.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_17.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_17_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_17_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_18.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_18.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_18_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_18_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_19.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_19.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_i_19_pc.png' => 'tribes/barbarians/trainingcamp/trainingcamp_i_19_pc.png'
=== renamed file 'tribes/barbarians/trainingscamp/trainingscamp_u_00.png' => 'tribes/barbarians/trainingcamp/trainingcamp_u_00.png'
=== removed directory 'tribes/barbarians/trunk'
=== removed file 'tribes/barbarians/trunk/conf'
--- tribes/barbarians/trunk/conf	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/trunk/conf	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-help=_Logs are a principal building material of the barbarians. The trees are felled by lumberjacks; rangers care for the supply of trees. Logs are also used in the metal workshop to build basic tools, and in the charcoal burner’s house in the production of coal. The wood hardener refines logs by hardening them in the fire which gives blackwood.
-
-
-preciousness=14
-default_target_quantity=40
-
-# Barbarian logs are made of black wood from the black forests
-# they come from.
-
-[idle]
-pics=trunk_idle.png
-hotspot=6 7

=== removed file 'tribes/barbarians/trunk/menu.png'
Binary files tribes/barbarians/trunk/menu.png	2009-11-12 01:02:38 +0000 and tribes/barbarians/trunk/menu.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/trunk/trunk_idle.png'
Binary files tribes/barbarians/trunk/trunk_idle.png	2010-08-01 14:35:38 +0000 and tribes/barbarians/trunk/trunk_idle.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'tribes/barbarians/warehouse/conf'
--- tribes/barbarians/warehouse/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/warehouse/conf	2014-03-16 06:39:32 +0000
@@ -2,14 +2,14 @@
 heal_per_second=170
 
 [buildcost]
-trunk=3
+log=3
 blackwood=2
 raw_stone=2
 grout=3
 thatchreed=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 blackwood=1
 raw_stone=1
 grout=1

=== renamed directory 'tribes/barbarians/warhelmet' => 'tribes/barbarians/warhelm'
=== modified file 'tribes/barbarians/warmill/conf'
--- tribes/barbarians/warmill/conf	2014-03-03 20:59:04 +0000
+++ tribes/barbarians/warmill/conf	2014-03-16 06:39:32 +0000
@@ -1,18 +1,18 @@
 size=medium
 buildable=no
-output=axe
-output=sharpaxe
-output=broadaxe
-output=bronzeaxe
-output=battleaxe
-output=warriorsaxe
+output=ax
+output=sharpax
+output=broadax
+output=bronzeax
+output=battleax
+output=warriorsax
 enhanced_building=yes
 
 [aihints]
 build_material=false
 
 [enhancement_cost]
-trunk=1
+log=1
 blackwood=1
 raw_stone=2
 grout=1
@@ -33,75 +33,75 @@
 gold=8
 
 [programs]
-produce_axe=_Produce ax
-produce_sharpaxe=_Produce sharp ax
-produce_broadaxe=_Produce broad ax
-produce_bronzeaxe=_Produce bronze ax
-produce_battleaxe=_Produce battle ax
-produce_warriorsaxe=_Produce warrior’s ax
+produce_ax=_Produce ax
+produce_sharpax=_Produce sharp ax
+produce_broadax=_Produce broad ax
+produce_bronzeax=_Produce bronze ax
+produce_battleax=_Produce battle ax
+produce_warriorsax=_Produce warrior’s ax
 work=_Work
 
-[produce_axe]
-return=skipped unless economy needs axe
+[produce_ax]
+return=skipped unless economy needs ax
 consume=coal iron
 sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
-produce=axe
+produce=ax
 
-[produce_sharpaxe]
-return=skipped unless economy needs sharpaxe
+[produce_sharpax]
+return=skipped unless economy needs sharpax
 consume=coal iron:2
 sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
-produce=sharpaxe
-
-[produce_broadaxe]
-return=skipped unless economy needs broadaxe
-consume=coal:2 iron:2
-sleep=32000
-playFX=../../../sound/smiths/smith 192
-animate=working 25000
-playFX=../../../sound/smiths/sharpening 192
-produce=broadaxe
-
-[produce_bronzeaxe]
-return=skipped unless economy needs bronzeaxe
-consume=coal:2 iron:2
-sleep=32000
-playFX=../../../sound/smiths/smith 192
-animate=working 25000
-playFX=../../../sound/smiths/sharpening 192
-produce=bronzeaxe
-
-[produce_battleaxe]
-return=skipped unless economy needs battleaxe
+produce=sharpax
+
+[produce_broadax]
+return=skipped unless economy needs broadax
+consume=coal:2 iron:2
+sleep=32000
+playFX=../../../sound/smiths/smith 192
+animate=working 25000
+playFX=../../../sound/smiths/sharpening 192
+produce=broadax
+
+[produce_bronzeax]
+return=skipped unless economy needs bronzeax
+consume=coal:2 iron:2
+sleep=32000
+playFX=../../../sound/smiths/smith 192
+animate=working 25000
+playFX=../../../sound/smiths/sharpening 192
+produce=bronzeax
+
+[produce_battleax]
+return=skipped unless economy needs battleax
 consume=coal gold iron:2
 sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
-produce=battleaxe
+produce=battleax
 
-[produce_warriorsaxe]
-return=skipped unless economy needs warriorsaxe
+[produce_warriorsax]
+return=skipped unless economy needs warriorsax
 consume=coal:2 gold:2 iron:2
 sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
-produce=warriorsaxe
+produce=warriorsax
 
 [work]
-call=produce_axe
-call=produce_sharpaxe
-call=produce_broadaxe
-call=produce_bronzeaxe
-call=produce_battleaxe
-call=produce_warriorsaxe
+call=produce_ax
+call=produce_sharpax
+call=produce_broadax
+call=produce_bronzeax
+call=produce_battleax
+call=produce_warriorsax
 return=skipped
 
 [build]

=== modified file 'tribes/barbarians/warmill/help.lua'
--- tribes/barbarians/warmill/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/warmill/help.lua	2014-03-16 06:39:32 +0000
@@ -14,7 +14,7 @@
 	--General Section
 		rt(h2(_"General")) ..
 		text_line(_"Purpose:", _"The Barbarian War Mill is their most advanced production site for weapons. As such it needs to be upgraded from an Axfactory.") ..
-		rt("image=tribes/barbarians/axe/menu.png;tribes/barbarians/sharpaxe/menu.png;tribes/barbarians/broadaxe/menu.png;tribes/barbarians/bronzeaxe/menu.png;tribes/barbarians/battleaxe/menu.png;tribes/barbarians/warriorsaxe/menu.png image-align=right",p("The War Mill produces all the axes that the Barbarians use for warfare.")) ..
+		rt("image=tribes/barbarians/ax/menu.png;tribes/barbarians/sharpax/menu.png;tribes/barbarians/broadax/menu.png;tribes/barbarians/bronzeax/menu.png;tribes/barbarians/battleax/menu.png;tribes/barbarians/warriorsax/menu.png image-align=right",p("The War Mill produces all the axes that the Barbarians use for warfare.")) ..
 		text_line(_"Working radius:", "n/a") ..
 		text_line(_"Conquer range:", "n/a") ..
 		text_line(_"Vision range:", "4") ..
@@ -26,31 +26,31 @@
 		dependencies({"tribes/barbarians/coalmine/menu.png;tribes/barbarians/burners_house/menu.png","tribes/barbarians/coal/menu.png","tribes/barbarians/warmill/menu.png"}) ..
 		rt(p(_"Coal from the Coal mine or the Charcoal Burner’s House")) ..
 		rt(h3(_"Outgoing:")) ..
-		dependencies({"tribes/barbarians/warmill/menu.png","tribes/barbarians/axe/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/soldier/menu.png"},p(_"Soldier")) ..
-		dependencies({"tribes/barbarians/warmill/menu.png","tribes/barbarians/sharpaxe/menu.png;tribes/barbarians/broadaxe/menu.png;tribes/barbarians/bronzeaxe/menu.png;tribes/barbarians/battleaxe/menu.png;tribes/barbarians/warriorsaxe/menu.png","tribes/barbarians/trainingscamp/menu.png"}) ..
+		dependencies({"tribes/barbarians/warmill/menu.png","tribes/barbarians/ax/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/soldier/menu.png"},p(_"Soldier")) ..
+		dependencies({"tribes/barbarians/warmill/menu.png","tribes/barbarians/sharpax/menu.png;tribes/barbarians/broadax/menu.png;tribes/barbarians/bronzeax/menu.png;tribes/barbarians/battleax/menu.png;tribes/barbarians/warriorsax/menu.png","tribes/barbarians/trainingcamp/menu.png"}) ..
 		rt(p(_"Training Camp")) ..
 	--Building Section
 		rt(h2(_"Building")) ..
 		text_line(_"Space required:",_"Medium plot","pics/medium.png") ..
-		text_line(_"Upgraded from:", _"Axfactory","tribes/barbarians/axefactory/menu.png") ..
+		text_line(_"Upgraded from:", _"Axfactory","tribes/barbarians/axfactory/menu.png") ..
 		rt(h3(_"Upgrade cost:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 1), 1) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 1), 1) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 1), 1) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 2), 2) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 1), 1) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 1), 1) ..
 		rt(h3(_"Cost cumulative:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 3), 3) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 3), 3) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 3), 3) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 6), 6) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 3), 3) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 3), 3) ..
 		rt(h3(_"Dismantle yields:")) ..
 		help_building_line("barbarians", "blackwood", ngettext("%i Blackwood", "%i Blackwood", 2), 2) ..
 		help_building_line("barbarians", "thatchreed", ngettext("%i Thatch Reed", "%i Thatch Reeds", 2), 2) ..
 		help_building_line("barbarians", "grout", ngettext("%i Grout", "%i Grout", 2), 2) ..
 		help_building_line("barbarians", "raw_stone", ngettext("%i Raw Stone", "%i Raw Stones", 3), 3) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== renamed directory 'tribes/barbarians/warriorsaxe' => 'tribes/barbarians/warriorsax'
=== modified file 'tribes/barbarians/weaving-mill/conf'
--- tribes/barbarians/weaving-mill/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/weaving-mill/conf	2014-03-16 06:39:32 +0000
@@ -5,12 +5,12 @@
 build_material=false
 
 [buildcost]
-trunk=5
+log=5
 raw_stone=2
 thatchreed=2
 
 [return_on_dismantle]
-trunk=2
+log=2
 raw_stone=2
 
 [working positions]

=== modified file 'tribes/barbarians/well/conf'
--- tribes/barbarians/well/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/well/conf	2014-03-16 06:39:32 +0000
@@ -2,10 +2,10 @@
 output=water
 
 [buildcost]
-trunk=4
+log=4
 
 [return_on_dismantle]
-trunk=2
+log=2
 
 [aihints]
 build_material=false

=== modified file 'tribes/barbarians/well/help.lua'
--- tribes/barbarians/well/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/well/help.lua	2014-03-16 06:39:32 +0000
@@ -32,10 +32,10 @@
 		text_line(_"Space required:",_"Small plot","pics/small.png") ..
 		text_line(_"Upgraded from:", "n/a") ..
 		rt(h3(_"Build cost:")) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 4), 4) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 4), 4) ..
 
 		rt(h3(_"Dismantle yields:")) ..
-		help_building_line("barbarians", "trunk", ngettext("%i Log", "%i Logs", 2), 2) ..
+		help_building_line("barbarians", "log", ngettext("%i Log", "%i Logs", 2), 2) ..
 		text_line(_"Upgradeable to:","n/a") ..
 	--Workers Section
 		rt(h2(_"Workers")) ..

=== modified file 'tribes/empire/arena/conf'
--- tribes/empire/arena/conf	2014-03-10 10:45:21 +0000
+++ tribes/empire/arena/conf	2014-03-16 06:39:32 +0000
@@ -4,14 +4,14 @@
 trainer_patience=8
 
 [buildcost]
-trunk=2
+log=2
 stone=4
 marble=5
 wood=5
 marblecolumn=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=3
 marble=3
 wood=2

=== renamed directory 'tribes/empire/armour' => 'tribes/empire/armor'
=== renamed directory 'tribes/empire/armoursmith' => 'tribes/empire/armorsmith'
=== renamed directory 'tribes/empire/armoursmithy' => 'tribes/empire/armorsmithy'
=== modified file 'tribes/empire/armorsmithy/conf'
--- tribes/empire/armoursmithy/conf	2014-02-25 14:45:19 +0000
+++ tribes/empire/armorsmithy/conf	2014-03-16 06:39:32 +0000
@@ -1,14 +1,14 @@
 size=medium
 output=helm
-output=armour
-output=chain_armour
-output=plate_armour
+output=armor
+output=chain_armor
+output=plate_armor
 
 [aihints]
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 stone=2
 marble=2
 marblecolumn=3
@@ -19,7 +19,7 @@
 marblecolumn=2
 
 [working positions]
-armoursmith=1
+armorsmith=1
 
 [inputs]
 iron=8
@@ -29,9 +29,9 @@
 
 [programs]
 produce_helm=_Produce helm
-produce_armour=_Produce armor
-produce_chain_armour=_Produce chain armor
-produce_plate_armour=_Produce plate armor
+produce_armor=_Produce armor
+produce_chain_armor=_Produce chain armor
+produce_plate_armor=_Produce plate armor
 work=_Work
 
 [produce_helm]
@@ -41,32 +41,32 @@
 animate=working 35000
 produce=helm
 
-[produce_armour]
-return=skipped unless economy needs armour
+[produce_armor]
+return=skipped unless economy needs armor
 consume=iron coal cloth
 sleep=32000
 animate=working 45000
-produce=armour
+produce=armor
 
-[produce_chain_armour]
-return=skipped unless economy needs chain_armour
+[produce_chain_armor]
+return=skipped unless economy needs chain_armor
 consume=iron:2 coal cloth
 sleep=32000
 animate=working 45000
-produce=chain_armour
+produce=chain_armor
 
-[produce_plate_armour]
-return=skipped unless economy needs plate_armour
+[produce_plate_armor]
+return=skipped unless economy needs plate_armor
 consume=iron:2 coal:2 cloth gold
 sleep=32000
 animate=working 45000
-produce=plate_armour
+produce=plate_armor
 
 [work]
 call=produce_helm
-call=produce_armour
-call=produce_chain_armour
-call=produce_plate_armour
+call=produce_armor
+call=produce_chain_armor
+call=produce_plate_armor
 sleep=20000
 return=skipped
 

=== renamed directory 'tribes/empire/axe' => 'tribes/empire/ax'
=== modified file 'tribes/empire/baker/conf'
--- tribes/empire/baker/conf	2012-02-15 21:25:34 +0000
+++ tribes/empire/baker/conf	2014-03-16 06:39:32 +0000
@@ -1,7 +1,7 @@
 help=_Bakes bread for workers.
 
 [buildcost]
-bakingtray=1
+bread_paddle=1
 carrier=1
 
 [idle]

=== modified file 'tribes/empire/bakery/conf'
--- tribes/empire/bakery/conf	2013-09-08 14:07:22 +0000
+++ tribes/empire/bakery/conf	2014-03-16 06:39:32 +0000
@@ -5,7 +5,7 @@
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 wood=2
 stone=3
 

=== removed directory 'tribes/empire/bakingtray'
=== removed file 'tribes/empire/bakingtray/conf'
--- tribes/empire/bakingtray/conf	2014-02-24 21:12:30 +0000
+++ tribes/empire/bakingtray/conf	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-help=_The bread paddle is the tool of the baker, each baker needs one. It is produced by the toolsmith.
-
-[idle]
-pics=idle.png
-hotspot=6 6

=== removed file 'tribes/empire/bakingtray/idle.png'
Binary files tribes/empire/bakingtray/idle.png	2012-02-15 21:25:34 +0000 and tribes/empire/bakingtray/idle.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/empire/bakingtray/menu.png'
Binary files tribes/empire/bakingtray/menu.png	2012-02-15 21:25:34 +0000 and tribes/empire/bakingtray/menu.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'tribes/empire/barracks/conf'
--- tribes/empire/barracks/conf	2013-10-29 10:55:20 +0000
+++ tribes/empire/barracks/conf	2014-03-16 06:39:32 +0000
@@ -12,7 +12,7 @@
 
 
 [buildcost]
-trunk=1
+log=1
 wood=2
 
 [return_on_dismantle]

=== modified file 'tribes/empire/barrier/conf'
--- tribes/empire/barrier/conf	2013-10-29 10:55:20 +0000
+++ tribes/empire/barrier/conf	2014-03-16 06:39:32 +0000
@@ -12,18 +12,18 @@
 
 
 [buildcost]
-trunk=2
+log=2
 wood=2
 stone=2
 marble=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 wood=1
 stone=1
 
 [enhancement_cost]
-trunk=1
+log=1
 wood=2
 stone=1
 marble=1

=== added directory 'tribes/empire/bread_paddle'
=== added file 'tribes/empire/bread_paddle/conf'
--- tribes/empire/bread_paddle/conf	1970-01-01 00:00:00 +0000
+++ tribes/empire/bread_paddle/conf	2014-03-16 06:39:32 +0000
@@ -0,0 +1,5 @@
+help=_The bread paddle is the tool of the baker, each baker needs one. It is produced by the toolsmith.
+
+[idle]
+pics=idle.png
+hotspot=6 6

=== added file 'tribes/empire/bread_paddle/idle.png'
Binary files tribes/empire/bread_paddle/idle.png	1970-01-01 00:00:00 +0000 and tribes/empire/bread_paddle/idle.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/empire/bread_paddle/menu.png'
Binary files tribes/empire/bread_paddle/menu.png	1970-01-01 00:00:00 +0000 and tribes/empire/bread_paddle/menu.png	2014-03-16 06:39:32 +0000 differ
=== modified file 'tribes/empire/brewery/conf'
--- tribes/empire/brewery/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/brewery/conf	2014-03-16 06:39:32 +0000
@@ -5,7 +5,7 @@
 build_material=false
 
 [buildcost]
-trunk=1
+log=1
 wood=2
 stone=2
 

=== modified file 'tribes/empire/burners_house/conf'
--- tribes/empire/burners_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/burners_house/conf	2014-03-16 06:39:32 +0000
@@ -5,12 +5,12 @@
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 stone=2
 marble=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=1
 marble=1
 
@@ -18,14 +18,14 @@
 burner=1
 
 [inputs]
-trunk=8
+log=8
 
 [programs]
 work=_Work
 
 [work]
-return=skipped unless economy needs coal or not economy needs trunk
-consume=trunk:6
+return=skipped unless economy needs coal or not economy needs log
+consume=log:6
 sleep=30000
 animate=working 90000 # charcoal fires are burning some days in real life
 produce=coal

=== renamed directory 'tribes/empire/chain_armour' => 'tribes/empire/chain_armor'
=== modified file 'tribes/empire/coalmine/conf'
--- tribes/empire/coalmine/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/coalmine/conf	2014-03-16 06:39:32 +0000
@@ -3,11 +3,11 @@
 enhancement=deep_coalmine
 
 [buildcost]
-trunk=4
+log=4
 wood=2
 
 [return_on_dismantle]
-trunk=2
+log=2
 wood=1
 
 [working positions]

=== modified file 'tribes/empire/conf'
--- tribes/empire/conf	2014-03-10 09:15:02 +0000
+++ tribes/empire/conf	2014-03-16 06:39:32 +0000
@@ -10,9 +10,9 @@
 icon=pics/icon.png
 # Wares and workers positions in wares window. Columns are separated by ;,
 # Entries in the columns separated by ,
-wares_order=stone, trunk, wood, wool,cloth;   fish,meat, water, wheat, flour, bread, beer, grape, wine, ration, meal;  marble, marblecolumn, coal, ironore, iron, goldstone, gold;    pick, axe, saw, shovel, hammer, fishing_rod, hunting_spear, scythe, bakingtray, basket, kitchen_tools, fire_tongs;   wood_lance, lance, advanced_lance, heavy_lance, war_lance, helm, armour, chain_armour, plate_armour
+wares_order=stone, log, wood, wool,cloth;   fish,meat, water, wheat, flour, bread, beer, grape, wine, ration, meal;  marble, marblecolumn, coal, ironore, iron, goldore, gold;    pick, ax, saw, shovel, hammer, fishing_rod, hunting_spear, scythe, bread_paddle, basket, kitchen_tools, fire_tongs;   wood_lance, lance, advanced_lance, heavy_lance, war_lance, helm, armor, chain_armor, plate_armor
 
-workers_order=carrier, donkey, donkeybreeder;   stonemason, carpenter, lumberjack, forester, builder, shepherd, weaver, shipwright; fisher, hunter, farmer, miller, baker, brewer, pig-breeder, vinefarmer, innkeeper; geologist, miner, master-miner, burner, smelter; toolsmith; soldier, trainer, weaponsmith, armoursmith, scout
+workers_order=carrier, donkey, donkeybreeder;   stonemason, carpenter, lumberjack, forester, builder, shepherd, weaver, shipwright; fisher, hunter, farmer, miller, baker, brewer, pig-breeder, vinefarmer, innkeeper; geologist, miner, master-miner, burner, smelter; toolsmith; soldier, trainer, weaponsmith, armorsmith, scout
 
 # No idea for the frontier. Maybe some javelins?
 [frontier]
@@ -55,13 +55,13 @@
 
 [ware types]
 advanced_lance=_Advanced Lance
-armour=_Armor
-axe=_Ax
-bakingtray=_Bread Paddle
+armor=_Armor
+ax=_Ax
+bread_paddle=_Bread Paddle
 basket=_Basket
 beer=_Beer
 bread=_Bread
-chain_armour=_Chain Armor
+chain_armor=_Chain Armor
 cloth=_Cloth
 coal=_Coal
 fire_tongs=_Fire Tongs
@@ -69,7 +69,7 @@
 fishing_rod=_Fishing Rod
 flour=_Flour
 gold=_Gold
-goldstone=_Gold Ore
+goldore=_Gold Ore
 grape=_Grape
 hammer=_Hammer
 heavy_lance=_Heavy Lance
@@ -84,13 +84,13 @@
 meal=_Meal
 meat=_Meat
 pick=_Pick
-plate_armour=_Plate Armor
+plate_armor=_Plate Armor
 ration=_Ration
 saw=_Saw
 scythe=_Scythe
 shovel=_Shovel
 stone=_Stones
-trunk=_Log
+log=_Log
 war_lance=_War-Lance
 water=_Water
 wheat=_Wheat
@@ -107,7 +107,7 @@
 soldier=_Soldier
 
 [worker types]
-armoursmith=_Armorsmith
+armorsmith=_Armorsmith
 baker=_Baker
 brewer=_Brewer
 builder=_Builder
@@ -185,7 +185,7 @@
 smelting_works=_Smelting Works
 shipyard=_Shipyard
 toolsmithy=_Toolsmithy
-armoursmithy=_Armor Smithy
+armorsmithy=_Armor Smithy
 donkeyfarm=_Donkey Farm
 sheepfarm=_Sheep Farm
 weaving-mill=_Weaving Mill
@@ -215,7 +215,7 @@
 [trainingsite types]
 colosseum=_Colosseum
 arena=_Arena
-trainingscamp=_Training Camp
+trainingcamp=_Training Camp
 
 [initializations]
 headquarters_medium=_Headquarters Medium

=== modified file 'tribes/empire/constructionsite/conf'
--- tribes/empire/constructionsite/conf	2010-08-01 14:35:38 +0000
+++ tribes/empire/constructionsite/conf	2014-03-16 06:39:32 +0000
@@ -1,5 +1,5 @@
 # The constructionsite is a mess. Not nice and clean, but rather some
-# trunks laying around on piles, maybe some tools.
+# logs laying around on piles, maybe some tools.
 
 size=small   # dummy; overridden by building size
 buildable=no # counterintuitive, but correct: player can't build constructionsite

=== modified file 'tribes/empire/deep_coalmine/conf'
--- tribes/empire/deep_coalmine/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/deep_coalmine/conf	2014-03-16 06:39:32 +0000
@@ -4,11 +4,11 @@
 output=coal
 
 [enhancement_cost]
-trunk=4
+log=4
 wood=2
 
 [return_on_dismantle_on_enhanced]
-trunk=2
+log=2
 wood=1
 
 [working positions]
@@ -48,4 +48,4 @@
 
 [empty]
 pics=deep_coalmine_e_??.png
-hotspot=49 61
\ No newline at end of file
+hotspot=49 61

=== modified file 'tribes/empire/deep_goldmine/conf'
--- tribes/empire/deep_goldmine/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/deep_goldmine/conf	2014-03-16 06:39:32 +0000
@@ -1,14 +1,14 @@
 size=mine
 buildable=no
 enhanced_building=yes
-output=goldstone
+output=goldore
 
 [enhancement_cost]
-trunk=4
+log=4
 wood=2
 
 [return_on_dismantle_on_enhanced]
-trunk=2
+log=2
 wood=1
 
 [working positions]
@@ -26,16 +26,16 @@
 work=_Work
 
 [work]
-return=skipped unless economy needs goldstone or not economy needs meal
-return=skipped unless economy needs goldstone or not economy needs wine
+return=skipped unless economy needs goldore or not economy needs meal
+return=skipped unless economy needs goldore or not economy needs wine
 sleep=43000
 consume=meal wine
 animate=working 18000
 mine=gold 2 100 5
-produce=goldstone
+produce=goldore
 animate=working 18000
 mine=gold 2 100 5
-produce=goldstone:2
+produce=goldore:2
 
 [idle]
 pics=deep_goldmine_i_??.png

=== modified file 'tribes/empire/deep_marblemine/conf'
--- tribes/empire/deep_marblemine/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/deep_marblemine/conf	2014-03-16 06:39:32 +0000
@@ -5,11 +5,11 @@
 output=stone
 
 [enhancement_cost]
-trunk=4
+log=4
 wood=2
 
 [return_on_dismantle_on_enhanced]
-trunk=2
+log=2
 wood=1
 
 [working positions]

=== modified file 'tribes/empire/deep_oremine/conf'
--- tribes/empire/deep_oremine/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/deep_oremine/conf	2014-03-16 06:39:32 +0000
@@ -4,11 +4,11 @@
 output=ironore
 
 [enhancement_cost]
-trunk=4
+log=4
 wood=2
 
 [return_on_dismantle_on_enhanced]
-trunk=2
+log=2
 wood=1
 
 [working positions]

=== modified file 'tribes/empire/donkeyfarm/conf'
--- tribes/empire/donkeyfarm/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/donkeyfarm/conf	2014-03-16 06:39:32 +0000
@@ -6,12 +6,12 @@
 recruitment=true
 
 [buildcost]
-trunk=2
+log=2
 stone=2
 wood=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=2
 
 [working positions]

=== modified file 'tribes/empire/fishers_house/conf'
--- tribes/empire/fishers_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/fishers_house/conf	2014-03-16 06:39:32 +0000
@@ -2,7 +2,7 @@
 output=fish
 
 [buildcost]
-trunk=1
+log=1
 wood=1
 stone=1
 

=== modified file 'tribes/empire/foresters_house/conf'
--- tribes/empire/foresters_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/foresters_house/conf	2014-03-16 06:39:32 +0000
@@ -1,7 +1,7 @@
 size=small
 
 [buildcost]
-trunk=1
+log=1
 wood=1
 stone=1
 
@@ -14,7 +14,7 @@
 
 [aihints]
 space_consumer=true
-renews_map_resource=trunk
+renews_map_resource=log
 
 [programs]
 work=_Work

=== modified file 'tribes/empire/fortress/conf'
--- tribes/empire/fortress/conf	2013-10-29 10:55:20 +0000
+++ tribes/empire/fortress/conf	2014-03-16 06:39:32 +0000
@@ -13,14 +13,14 @@
 
 [buildcost]
 wood=5
-trunk=2
+log=2
 stone=8
 marble=2
 marblecolumn=2
 
 [return_on_dismantle]
 wood=2
-trunk=1
+log=1
 stone=5
 marble=1
 marblecolumn=1

=== modified file 'tribes/empire/goldmine/conf'
--- tribes/empire/goldmine/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/goldmine/conf	2014-03-16 06:39:32 +0000
@@ -1,13 +1,13 @@
 size=mine
-output=goldstone
+output=goldore
 enhancement=deep_goldmine
 
 [buildcost]
-trunk=4
+log=4
 wood=2
 
 [return_on_dismantle]
-trunk=2
+log=2
 wood=1
 
 [working positions]
@@ -26,16 +26,16 @@
 work=_Work
 
 [work]
-return=skipped unless economy needs goldstone or not economy needs ration
-return=skipped unless economy needs goldstone or not economy needs wine
+return=skipped unless economy needs goldore or not economy needs ration
+return=skipped unless economy needs goldore or not economy needs wine
 sleep=45000
 consume=ration wine
 animate=working 20000
 mine=gold 2 50 5
-produce=goldstone
+produce=goldore
 animate=working 20000
 mine=gold 2 50 5
-produce=goldstone
+produce=goldore
 
 [idle]
 pics=goldmine_i_??.png
@@ -48,4 +48,4 @@
 
 [empty]
 pics=goldmine_e_??.png
-hotspot=49 49
\ No newline at end of file
+hotspot=49 49

=== renamed directory 'tribes/empire/goldstone' => 'tribes/empire/goldore'
=== modified file 'tribes/empire/hunters_house/conf'
--- tribes/empire/hunters_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/hunters_house/conf	2014-03-16 06:39:32 +0000
@@ -2,7 +2,7 @@
 output=meat
 
 [buildcost]
-trunk=1
+log=1
 wood=1
 stone=1
 

=== added directory 'tribes/empire/log'
=== added file 'tribes/empire/log/conf'
--- tribes/empire/log/conf	1970-01-01 00:00:00 +0000
+++ tribes/empire/log/conf	2014-03-16 06:39:32 +0000
@@ -0,0 +1,9 @@
+help=_Logs are an important building material for the Empire. The lumberjacks fell the trees; foresters care for the supply of trees. Logs are also used by the charcoal burner, the toolsmithy and the sawmill.
+
+
+preciousness=14
+default_target_quantity=40
+
+[idle]
+pics=idle.png
+hotspot=6 7

=== added file 'tribes/empire/log/idle.png'
Binary files tribes/empire/log/idle.png	1970-01-01 00:00:00 +0000 and tribes/empire/log/idle.png	2014-03-16 06:39:32 +0000 differ
=== added file 'tribes/empire/log/menu.png'
Binary files tribes/empire/log/menu.png	1970-01-01 00:00:00 +0000 and tribes/empire/log/menu.png	2014-03-16 06:39:32 +0000 differ
=== modified file 'tribes/empire/lumberjack/conf'
--- tribes/empire/lumberjack/conf	2014-02-22 16:49:17 +0000
+++ tribes/empire/lumberjack/conf	2014-03-16 06:39:32 +0000
@@ -3,7 +3,7 @@
 
 [buildcost]
 carrier=1
-axe=1
+ax=1
 
 [chop]
 0=findobject attrib:tree radius:10
@@ -13,7 +13,7 @@
 4=playFX ../../../sound/spoken/timber 156
 5=object fall
 6=animation idle 2000
-7=createware trunk
+7=createware log
 8=return
 
 [hacking]

=== modified file 'tribes/empire/lumberjacks_house/conf'
--- tribes/empire/lumberjacks_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/lumberjacks_house/conf	2014-03-16 06:39:32 +0000
@@ -1,12 +1,12 @@
 size=small
-output=trunk
+output=log
 
 [buildcost]
-trunk=2
+log=2
 wood=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 wood=1
 
 [working positions]
@@ -14,7 +14,7 @@
 
 [aihints]
 is_basic=true
-trunkproducer=true
+logproducer=true
 
 [programs]
 work=_Work

=== modified file 'tribes/empire/marblemine/conf'
--- tribes/empire/marblemine/conf	2014-03-10 10:45:21 +0000
+++ tribes/empire/marblemine/conf	2014-03-16 06:39:32 +0000
@@ -4,11 +4,11 @@
 enhancement=deep_marblemine
 
 [buildcost]
-trunk=4
+log=4
 wood=2
 
 [return_on_dismantle]
-trunk=2
+log=2
 wood=1
 
 [working positions]

=== modified file 'tribes/empire/mill/conf'
--- tribes/empire/mill/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/mill/conf	2014-03-16 06:39:32 +0000
@@ -2,12 +2,12 @@
 output=flour
 
 [buildcost]
-trunk=3
+log=3
 stone=3
 marble=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=2
 marble=1
 

=== modified file 'tribes/empire/oremine/conf'
--- tribes/empire/oremine/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/oremine/conf	2014-03-16 06:39:32 +0000
@@ -3,11 +3,11 @@
 enhancement=deep_oremine
 
 [buildcost]
-trunk=4
+log=4
 wood=2
 
 [return_on_dismantle]
-trunk=2
+log=2
 wood=1
 
 [working positions]
@@ -48,4 +48,4 @@
 
 [empty]
 pics=oremine_e_??.png
-hotspot=49 49
\ No newline at end of file
+hotspot=49 49

=== modified file 'tribes/empire/outpost/conf'
--- tribes/empire/outpost/conf	2013-10-29 10:55:20 +0000
+++ tribes/empire/outpost/conf	2014-03-16 06:39:32 +0000
@@ -12,7 +12,7 @@
 
 
 [buildcost]
-trunk=1
+log=1
 wood=1
 stone=1
 marble=1

=== modified file 'tribes/empire/piggery/conf'
--- tribes/empire/piggery/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/piggery/conf	2014-03-16 06:39:32 +0000
@@ -2,12 +2,12 @@
 output=meat
 
 [buildcost]
-trunk=2
+log=2
 stone=2
 marblecolumn=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=1
 marble=1
 

=== renamed directory 'tribes/empire/plate_armour' => 'tribes/empire/plate_armor'
=== modified file 'tribes/empire/port/conf'
--- tribes/empire/port/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/port/conf	2014-03-16 06:39:32 +0000
@@ -3,7 +3,7 @@
 heal_per_second=170
 
 [buildcost]
-trunk=3
+log=3
 wood=4
 stone=4
 marble=2
@@ -12,7 +12,7 @@
 gold=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 wood=1
 stone=2
 marble=2

=== modified file 'tribes/empire/quarry/conf'
--- tribes/empire/quarry/conf	2014-03-10 10:45:21 +0000
+++ tribes/empire/quarry/conf	2014-03-16 06:39:32 +0000
@@ -3,11 +3,11 @@
 output=marble
 
 [buildcost]
-trunk=2
+log=2
 wood=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 
 [working positions]
 stonemason=1

=== modified file 'tribes/empire/sawmill/conf'
--- tribes/empire/sawmill/conf	2014-03-12 19:11:45 +0000
+++ tribes/empire/sawmill/conf	2014-03-16 06:39:32 +0000
@@ -5,26 +5,26 @@
 is_basic=true
 
 [buildcost]
-trunk=2
+log=2
 stone=1
 wood=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=1
 
 [working positions]
 carpenter=1
 
 [inputs]
-trunk=8
+log=8
 
 [programs]
 work=_Work
 
 [work]
 return=skipped unless economy needs wood
-consume=trunk:2
+consume=log:2
 sleep=16500 # much faster than barbarians hardener
 playFX=../../../sound/sawmill/sawmill 180
 animate=working 20000 # much more faster than barbarians hardener

=== modified file 'tribes/empire/scouts_house/conf'
--- tribes/empire/scouts_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/scouts_house/conf	2014-03-16 06:39:32 +0000
@@ -1,11 +1,11 @@
 size=small
 
 [buildcost]
-trunk=2
+log=2
 stone=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 
 [aihints]
 build_material=false

=== modified file 'tribes/empire/scripting/sc00_headquarters_medium.lua'
--- tribes/empire/scripting/sc00_headquarters_medium.lua	2012-02-15 21:25:34 +0000
+++ tribes/empire/scripting/sc00_headquarters_medium.lua	2014-03-16 06:39:32 +0000
@@ -22,8 +22,8 @@
       wares = {
          helm = 4,
          wood_lance = 5,
-         axe = 6,
-         bakingtray = 2,
+         ax = 6,
+         bread_paddle = 2,
          basket = 2,
          bread = 8,
          cloth = 5,
@@ -49,7 +49,7 @@
          scythe = 5,
          shovel = 6,
          stone = 40,
-         trunk = 30,
+         log = 30,
          water = 12,
          wheat = 4,
          wine = 8,
@@ -57,7 +57,7 @@
          wool = 2,
       },
       workers = {
-         armoursmith = 1,
+         armorsmith = 1,
          brewer = 1,
          builder = 10,
          burner = 1,

=== modified file 'tribes/empire/scripting/sc01_castle_village.lua'
--- tribes/empire/scripting/sc01_castle_village.lua	2014-03-08 05:30:43 +0000
+++ tribes/empire/scripting/sc01_castle_village.lua	2014-03-16 06:39:32 +0000
@@ -26,8 +26,8 @@
          wares = {
             helm = 2,
             wood_lance = 5,
-            axe = 6,
-            bakingtray = 2,
+            ax = 6,
+            bread_paddle = 2,
             basket = 2,
             fire_tongs = 2,
             fishing_rod = 2,
@@ -47,7 +47,7 @@
             scythe = 5,
             shovel = 6,
             stone = 40,
-            trunk = 29,
+            log = 29,
             water = 12,
             wheat = 4,
             wine = 8,
@@ -79,7 +79,7 @@
          },
       })
 
-      place_building_in_region(plr, "trainingscamp", sf:region(11), {
+      place_building_in_region(plr, "trainingcamp", sf:region(11), {
          wares = {
             fish = 2,
             meat = 2,
@@ -87,7 +87,7 @@
          },
       })
 
-      place_building_in_region(plr, "armoursmithy", sf:region(11), {
+      place_building_in_region(plr, "armorsmithy", sf:region(11), {
          wares = {
                gold = 4,
                coal = 8,
@@ -110,7 +110,7 @@
 
       place_building_in_region(plr, "sawmill", sf:region(11), {
          wares = {
-            trunk = 1,
+            log = 1,
          }
       })
 

=== modified file 'tribes/empire/sentry/conf'
--- tribes/empire/sentry/conf	2013-10-29 10:55:20 +0000
+++ tribes/empire/sentry/conf	2014-03-16 06:39:32 +0000
@@ -13,7 +13,7 @@
 
 [buildcost]
 wood=1
-trunk=1
+log=1
 stone=1
 
 [return_on_dismantle]

=== modified file 'tribes/empire/sheepfarm/conf'
--- tribes/empire/sheepfarm/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/sheepfarm/conf	2014-03-16 06:39:32 +0000
@@ -5,12 +5,12 @@
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 stone=2
 wood=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=2
 
 [working positions]

=== modified file 'tribes/empire/shipconstruction/conf'
--- tribes/empire/shipconstruction/conf	2012-02-26 21:51:25 +0000
+++ tribes/empire/shipconstruction/conf	2014-03-16 06:39:32 +0000
@@ -4,7 +4,7 @@
 
 [buildcost]
 wood=10
-trunk=2
+log=2
 cloth=4
 
 [program]

=== modified file 'tribes/empire/shipyard/conf'
--- tribes/empire/shipyard/conf	2013-07-23 17:50:05 +0000
+++ tribes/empire/shipyard/conf	2014-03-16 06:39:32 +0000
@@ -5,13 +5,13 @@
 needs_water=true
 
 [buildcost]
-trunk=3
+log=3
 wood=2
 stone=3
 cloth=2
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=2
 cloth=1
 
@@ -20,7 +20,7 @@
 
 [inputs]
 wood=10
-trunk=2
+log=2
 cloth=4
 
 [programs]

=== modified file 'tribes/empire/smelting_works/conf'
--- tribes/empire/smelting_works/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/smelting_works/conf	2014-03-16 06:39:32 +0000
@@ -6,7 +6,7 @@
 build_material=false
 
 [buildcost]
-trunk=1
+log=1
 stone=4
 marble=2
 
@@ -19,7 +19,7 @@
 
 [inputs]
 ironore=8
-goldstone=8
+goldore=8
 coal=8
 
 [programs]
@@ -36,7 +36,7 @@
 
 [smelt_gold]
 return=skipped unless economy needs gold
-consume=goldstone coal
+consume=goldore coal
 sleep=25000
 animate=working 35000
 produce=gold

=== modified file 'tribes/empire/stonemasons_house/conf'
--- tribes/empire/stonemasons_house/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/stonemasons_house/conf	2014-03-16 06:39:32 +0000
@@ -5,7 +5,7 @@
 is_basic=true
 
 [buildcost]
-trunk=1
+log=1
 wood=1
 stone=1
 marble=3 # someone who works on marble should like marble

=== modified file 'tribes/empire/toolsmithy/conf'
--- tribes/empire/toolsmithy/conf	2014-03-03 20:59:04 +0000
+++ tribes/empire/toolsmithy/conf	2014-03-16 06:39:32 +0000
@@ -1,6 +1,6 @@
 size=medium
-output=axe
-output=bakingtray
+output=ax
+output=bread_paddle
 output=fire_tongs
 output=fishing_rod
 output=hammer
@@ -13,7 +13,7 @@
 output=saw
 
 [buildcost]
-trunk=1
+log=1
 stone=2
 marble=2
 marblecolumn=1
@@ -31,10 +31,10 @@
 
 [inputs]
 iron=8
-trunk=8
+log=8
 
 [programs]
-produce_bakingtray=_Produce bread paddle
+produce_bread_paddle=_Produce bread paddle
 produce_fire_tongs=_Produce fire tongs
 produce_fishing_rod=_Produce fishing rod
 produce_hammer=_Produce hammer
@@ -45,20 +45,20 @@
 produce_hunting_spear=_Produce hunting spear
 produce_basket=_Produce basket
 produce_saw=_Produce saw
-produce_axe=_Produce ax
+produce_ax=_Produce ax
 work=_Work
 
-[produce_bakingtray]
-return=skipped unless economy needs bakingtray
-consume=iron trunk
+[produce_bread_paddle]
+return=skipped unless economy needs bread_paddle
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
-produce=bakingtray
+produce=bread_paddle
 
 [produce_fire_tongs]
 return=skipped unless economy needs fire_tongs
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -66,7 +66,7 @@
 
 [produce_fishing_rod]
 return=skipped unless economy needs fishing_rod
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -74,7 +74,7 @@
 
 [produce_hammer]
 return=skipped unless economy needs hammer
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -82,7 +82,7 @@
 
 [produce_kitchen_tools]
 return=skipped unless economy needs kitchen_tools
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -90,7 +90,7 @@
 
 [produce_pick]
 return=skipped unless economy needs pick
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -98,7 +98,7 @@
 
 [produce_scythe]
 return=skipped unless economy needs scythe
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -106,7 +106,7 @@
 
 [produce_shovel]
 return=skipped unless economy needs shovel
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -114,7 +114,7 @@
 
 [produce_hunting_spear]
 return=skipped unless economy needs hunting_spear
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -122,7 +122,7 @@
 
 [produce_basket]
 return=skipped unless economy needs basket
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
@@ -130,22 +130,22 @@
 
 [produce_saw]
 return=skipped unless economy needs saw
-consume=iron trunk
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=saw
 
-[produce_axe]
-return=skipped unless economy needs axe
-consume=iron trunk
+[produce_ax]
+return=skipped unless economy needs ax
+consume=iron log
 sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
-produce=axe
+produce=ax
 
 [work]
-call=produce_bakingtray
+call=produce_bread_paddle
 call=produce_fire_tongs
 call=produce_fishing_rod
 call=produce_hammer
@@ -156,7 +156,7 @@
 call=produce_hunting_spear
 call=produce_basket
 call=produce_saw
-call=produce_axe
+call=produce_ax
 return=skipped
 
 [idle]

=== modified file 'tribes/empire/tower/conf'
--- tribes/empire/tower/conf	2013-10-29 10:55:20 +0000
+++ tribes/empire/tower/conf	2014-03-16 06:39:32 +0000
@@ -12,7 +12,7 @@
 
 
 [buildcost]
-trunk=2
+log=2
 wood=3
 stone=4
 marblecolumn=2

=== renamed directory 'tribes/empire/trainingscamp' => 'tribes/empire/trainingcamp'
=== modified file 'tribes/empire/trainingcamp/conf'
--- tribes/empire/trainingscamp/conf	2014-03-10 10:45:21 +0000
+++ tribes/empire/trainingcamp/conf	2014-03-16 06:39:32 +0000
@@ -3,7 +3,7 @@
 trainer_patience=12
 
 [buildcost]
-trunk=2
+log=2
 stone=5
 wood=4
 marble=5
@@ -30,9 +30,9 @@
 heavy_lance=2
 war_lance=2
 helm=2
-armour=2
-chain_armour=2
-plate_armour=2
+armor=2
+chain_armor=2
+plate_armor=2
 
 [soldier attack]
 min_level=0
@@ -96,23 +96,23 @@
 check_soldier=soldier hp 1
 sleep=30000
 check_soldier=soldier hp 1
-consume=armour bread fish,meat
+consume=armor bread fish,meat
 train=soldier hp 1 2
 
 [upgrade_soldier_hp_2]
 check_soldier=soldier hp 2
 sleep=30000
 check_soldier=soldier hp 2
-consume=chain_armour bread:2 fish,meat:2
+consume=chain_armor bread:2 fish,meat:2
 train=soldier hp 2 3
 
 [upgrade_soldier_hp_3]
 check_soldier=soldier hp 3
 sleep=30000
 check_soldier=soldier hp 3
-consume=plate_armour bread:2 fish,meat:2
+consume=plate_armor bread:2 fish,meat:2
 train=soldier hp 3 4
 
 [idle]
-pics=trainingscamp_i_??.png  # ???
+pics=trainingcamp_i_??.png  # ???
 hotspot=82 105

=== renamed file 'tribes/empire/trainingscamp/trainingscamp_i_00.png' => 'tribes/empire/trainingcamp/trainingcamp_i_00.png'
=== removed directory 'tribes/empire/trunk'
=== removed file 'tribes/empire/trunk/conf'
--- tribes/empire/trunk/conf	2014-03-05 18:47:03 +0000
+++ tribes/empire/trunk/conf	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-help=_Logs are an important building material for the Empire. The lumberjacks fell the trees; foresters care for the supply of trees. Logs are also used by the charcoal burner, the toolsmithy and the sawmill.
-
-
-preciousness=14
-default_target_quantity=40
-
-[idle]
-pics=trunk_idle.png
-hotspot=6 7

=== removed file 'tribes/empire/trunk/menu.png'
Binary files tribes/empire/trunk/menu.png	2009-11-12 12:21:22 +0000 and tribes/empire/trunk/menu.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/empire/trunk/trunk_idle.png'
Binary files tribes/empire/trunk/trunk_idle.png	2010-08-01 14:35:38 +0000 and tribes/empire/trunk/trunk_idle.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'tribes/empire/warehouse/conf'
--- tribes/empire/warehouse/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/warehouse/conf	2014-03-16 06:39:32 +0000
@@ -2,7 +2,7 @@
 heal_per_second=170
 
 [buildcost]
-trunk=2
+log=2
 wood=2
 stone=2
 marble=3

=== modified file 'tribes/empire/weaponsmithy/conf'
--- tribes/empire/weaponsmithy/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/weaponsmithy/conf	2014-03-16 06:39:32 +0000
@@ -9,13 +9,13 @@
 build_material=false
 
 [buildcost]
-trunk=2
+log=2
 stone=2
 marble=2
 marblecolumn=3
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=1
 marble=2
 marblecolumn=1

=== modified file 'tribes/empire/weaving-mill/conf'
--- tribes/empire/weaving-mill/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/weaving-mill/conf	2014-03-16 06:39:32 +0000
@@ -2,12 +2,12 @@
 output=cloth
 
 [buildcost]
-trunk=3
+log=3
 stone=4
 marble=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 stone=3
 
 [working positions]

=== modified file 'tribes/empire/well/conf'
--- tribes/empire/well/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/well/conf	2014-03-16 06:39:32 +0000
@@ -2,12 +2,12 @@
 output=water
 
 [buildcost]
-trunk=2
+log=2
 stone=1
 marble=1
 
 [return_on_dismantle]
-trunk=1
+log=1
 marble=1
 
 [aihints]

=== modified file 'tribes/empire/wood/conf'
--- tribes/empire/wood/conf	2014-02-24 21:12:30 +0000
+++ tribes/empire/wood/conf	2014-03-16 06:39:32 +0000
@@ -3,8 +3,8 @@
 default_target_quantity=40
 preciousness=7
 
-# These are planks created out of trunks.
-# The roman sawmiller know exactly, howto cut the trunks.
+# These are planks created out of logs.
+# The roman sawmiller know exactly, howto cut the logs.
 
 [idle]
 pics=idle.png


Follow ups