5 files changed, 46 insertions, 90 deletions

diff --git a/games/ember/Makefile b/games/ember/Makefile
index 825b93dac184..2797757e4337 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ember
-PORTVERSION=	0.5.6
-PORTREVISION=	2
+PORTVERSION=	0.5.7
 CATEGORIES=	games
 MASTER_SITES=	SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \
 		http://amber.worldforge.org/ember/releases/stable/
@@ -18,15 +17,16 @@ DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Ember is a WorldForge 3d client using the OGRE 3d library
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libOgreMain-1.6.3.so:${PORTSDIR}/graphics/ogre3d
-RUN_DEPENDS=	${LOCALBASE}/lib/libOgreMain-1.6.3.so:${PORTSDIR}/graphics/ogre3d
+BUILD_DEPENDS=	${LOCALBASE}/lib/libOgreMain-1.6.4.so:${PORTSDIR}/graphics/ogre3d
+RUN_DEPENDS=	${LOCALBASE}/lib/libOgreMain-1.6.4.so:${PORTSDIR}/graphics/ogre3d
 LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 		eris-1.3:${PORTSDIR}/devel/eris \
 		varconf-1.0.6:${PORTSDIR}/devel/varconf \
 		mercator-0.2.6:${PORTSDIR}/devel/mercator \
 		openal.0:${PORTSDIR}/audio/openal \
 		alut.1:${PORTSDIR}/audio/freealut \
-		wfut-0.2:${PORTSDIR}/devel/libwfut
+		wfut-0.2:${PORTSDIR}/devel/libwfut \
+		boost_thread.4:${PORTSDIR}/devel/boost-libs
 
 CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit --enable-debug
 CONFIGURE_ENV+=	LUA_LIBS="-L${LUA_LIBDIR} -llua" \
diff --git a/games/ember/distinfo b/games/ember/distinfo
index 68a15810ec45..702d8aa998fa 100644
--- a/games/ember/distinfo
+++ b/games/ember/distinfo
@@ -1,6 +1,6 @@
-MD5 (ember-0.5.6.tar.bz2) = 9cbfe1138ac688a88c79fc28fd69e212
-SHA256 (ember-0.5.6.tar.bz2) = e81c8fe5819566ff101f9d12c079fa7c7919ba048cfc223a45656bc0ba711c8a
-SIZE (ember-0.5.6.tar.bz2) = 1966772
-MD5 (ember-media-0.5.6.tar.bz2) = b6100ce3c456e06a15a4e94f87ccf8b1
-SHA256 (ember-media-0.5.6.tar.bz2) = ce706d9814bb05ce613a9695741b718128f4bd5dce0a857ff36810e42a86714c
-SIZE (ember-media-0.5.6.tar.bz2) = 209313052
+MD5 (ember-0.5.7.tar.bz2) = 031a8ae80c6e33068f53ecb89a0320b9
+SHA256 (ember-0.5.7.tar.bz2) = 17f7dbe0e1ce32cbaaab61cebf2180480640e05020ef7c2e0ed8b9e19169c823
+SIZE (ember-0.5.7.tar.bz2) = 1779214
+MD5 (ember-media-0.5.7.tar.bz2) = c9ade2286274e42ff874975f72f11d2c
+SHA256 (ember-media-0.5.7.tar.bz2) = 8771a9535a81b293194a3a857750dd6e2f7d6422bc10083e5de0ccc9d5798ada
+SIZE (ember-media-0.5.7.tar.bz2) = 208647851
diff --git a/games/ember/files/patch-ConnectedAdapter.cpp b/games/ember/files/patch-ConnectedAdapter.cpp
deleted file mode 100644
index 211420ec4c47..000000000000
--- a/games/ember/files/patch-ConnectedAdapter.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/services/server/ConnectedAdapter.cpp.orig	2009-04-05 11:57:35.000000000 +0200
-+++ src/services/server/ConnectedAdapter.cpp	2009-04-05 11:57:43.000000000 +0200
-@@ -25,6 +25,7 @@
- #endif
- 
- #include "ConnectedAdapter.h"
-+#include <Atlas/Objects/Operation.h>
- #include <Eris/Connection.h>
- #include <Eris/Account.h>
- #include <Eris/Lobby.h>
diff --git a/games/ember/files/patch-EntityMoveAdjuster.h b/games/ember/files/patch-EntityMoveAdjuster.h
deleted file mode 100644
index a1b8367eb7cd..000000000000
--- a/games/ember/files/patch-EntityMoveAdjuster.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/components/ogre/manipulation/EntityMoveAdjuster.h.orig	2009-04-05 14:18:35.000000000 +0200
-+++ src/components/ogre/manipulation/EntityMoveAdjuster.h	2009-04-05 14:18:58.000000000 +0200
-@@ -23,6 +23,7 @@
- #ifndef EMBEROGREENTITYMOVEADJUSTER_H
- #define EMBEROGREENTITYMOVEADJUSTER_H
- 
-+#include <Atlas/Objects/Operation.h>
- #include <Eris/Timeout.h>
- 
- namespace EmberOgre {
diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist
index 93caddca41bd..1f1b12251603 100644
--- a/games/ember/pkg-plist
+++ b/games/ember/pkg-plist
@@ -11,17 +11,6 @@ etc/ember/ogre.cfg
 etc/ember/resources.cfg
 etc/ember/terrain.cfg
 share/applications/ember.desktop
-share/ember/carpenter/blockspec/adapters.blockspec.xml
-share/ember/carpenter/blockspec/fences.blockspec.xml
-share/ember/carpenter/blockspec/floors.blockspec.xml
-share/ember/carpenter/blockspec/roofs.blockspec.xml
-share/ember/carpenter/blockspec/slopewalls.blockspec.xml
-share/ember/carpenter/blockspec/walls.blockspec.xml
-share/ember/carpenter/blueprints/empty.blueprint.xml
-share/ember/carpenter/blueprints/house.blueprint.xml
-share/ember/carpenter/blueprints/sty.blueprint.xml
-share/ember/carpenter/modelblockspecs/general.modelblocks.xml
-share/ember/jesus/modelmappings/general.modelmapping.xml
 share/ember/media/shared/COPYING.txt
 share/ember/media/shared/LICENSING.txt
 share/ember/media/shared/common/3d_objects/environment/models/boulder/graniteA.mesh
@@ -147,18 +136,6 @@ share/ember/media/shared/common/3d_objects/environment/textures/stone_yellow/S.p
 share/ember/media/shared/common/3d_objects/environment/textures/water/D.png
 share/ember/media/shared/common/3d_objects/environment/textures/water/N.png
 share/ember/media/shared/common/3d_objects/environment/textures/water/S.png
-share/ember/media/shared/common/3d_objects/items/building_element/models/columns/pillar_fractured.mesh
-share/ember/media/shared/common/3d_objects/items/building_element/models/columns/pillar_segmented.mesh
-share/ember/media/shared/common/3d_objects/items/building_element/models/door_element/door_element.mesh
-share/ember/media/shared/common/3d_objects/items/building_element/models/gallows/gallows.mesh
-share/ember/media/shared/common/3d_objects/items/building_element/models/normal_slope_roof/normal_slope_roof.mesh
-share/ember/media/shared/common/3d_objects/items/building_element/models/normal_slope_wall/normal_slope_wall.mesh
-share/ember/media/shared/common/3d_objects/items/building_element/models/standard_wall/standard_wall.mesh
-share/ember/media/shared/common/3d_objects/items/building_element/models/wall_blocks/floor_3x3x0_3.mesh
-share/ember/media/shared/common/3d_objects/items/building_element/models/wall_blocks/wall_1_5x3x0_3.mesh
-share/ember/media/shared/common/3d_objects/items/building_element/models/wall_blocks/wall_3x3x0_3.mesh
-share/ember/media/shared/common/3d_objects/items/building_primitives/models/columns/turned_cylindrical_column.mesh
-share/ember/media/shared/common/3d_objects/items/building_primitives/models/jetty/jetty.mesh
 share/ember/media/shared/common/3d_objects/items/containers/models/barrel/barrel.mesh
 share/ember/media/shared/common/3d_objects/items/containers/models/bottle/bottle.mesh
 share/ember/media/shared/common/3d_objects/items/containers/models/bottlejug/bottlejug.mesh
@@ -322,6 +299,7 @@ share/ember/media/shared/common/3d_objects/plants/grass/textures/ducktail_yellow
 share/ember/media/shared/common/3d_objects/plants/grass/textures/ducktail_yellow/S.png
 share/ember/media/shared/common/3d_objects/plants/mushrooms/models/amanita/amanita.mesh
 share/ember/media/shared/common/3d_objects/plants/mushrooms/models/galerina/galerina.mesh
+share/ember/media/shared/common/3d_objects/plants/mushrooms/models/silkfoot/silkfoot.mesh
 share/ember/media/shared/common/3d_objects/plants/mushrooms/textures/amanita/D.png
 share/ember/media/shared/common/3d_objects/plants/mushrooms/textures/amanita/N.png
 share/ember/media/shared/common/3d_objects/plants/mushrooms/textures/amanita/S.png
@@ -337,6 +315,7 @@ share/ember/media/shared/common/3d_objects/plants/mushrooms/textures/silkfoot/S.
 share/ember/media/shared/common/3d_objects/plants/shrubs/models/bush/bush.mesh
 share/ember/media/shared/common/3d_objects/plants/shrubs/models/fern/fern.mesh
 share/ember/media/shared/common/3d_objects/plants/shrubs/models/leaf/leaves.mesh
+share/ember/media/shared/common/3d_objects/plants/shrubs/models/shrub_A/shrub_A.mesh
 share/ember/media/shared/common/3d_objects/plants/shrubs/models/shrub_B/shrub_B.mesh
 share/ember/media/shared/common/3d_objects/plants/shrubs/textures/bush_gnarly_brown/D.png
 share/ember/media/shared/common/3d_objects/plants/shrubs/textures/bush_gnarly_brown/N.png
@@ -468,6 +447,7 @@ share/ember/media/shared/common/3d_objects/structures/models/cg_smithy/cg_smithy
 share/ember/media/shared/common/3d_objects/structures/models/concrete_stairs/concrete_stairs.mesh
 share/ember/media/shared/common/3d_objects/structures/models/fire_place_A/fire_place_A.mesh
 share/ember/media/shared/common/3d_objects/structures/models/ground_pallisade/ground_pallisade.mesh
+share/ember/media/shared/common/3d_objects/structures/models/jetty/jetty.mesh
 share/ember/media/shared/common/3d_objects/structures/models/log/tree_log.mesh
 share/ember/media/shared/common/3d_objects/structures/models/market_tent/market_tent.mesh
 share/ember/media/shared/common/3d_objects/structures/models/marketstall/marketstall_canvasA.mesh
@@ -791,6 +771,7 @@ share/ember/media/shared/common/3d_skeletons/creatures/quadruped_v2/textures/dee
 share/ember/media/shared/common/3d_skeletons/creatures/quadruped_v2/textures/greyhair/greyhair256.png
 share/ember/media/shared/common/3d_skeletons/creatures/quadruped_v2/textures/mottled_oker/quadruped_v2.png
 share/ember/media/shared/common/3d_skeletons/creatures/quadruped_v2/textures/pink_pig/low/quadruped_v2.png
+share/ember/media/shared/common/3d_skeletons/creatures/tubular/models/bluegill/animation/bluegill.skeleton
 share/ember/media/shared/common/3d_skeletons/creatures/tubular/models/fish_01/fish_01.mesh
 share/ember/media/shared/common/3d_skeletons/creatures/tubular/textures/scaly_brown_white/tubular.png
 share/ember/media/shared/common/3d_skeletons/insects/models/spider/animation/spider.skeleton
@@ -870,30 +851,30 @@ share/ember/media/shared/common/resources/ogre/scripts/materials/vegetation.mate
 share/ember/media/shared/common/resources/ogre/scripts/overlays/Compass.overlay
 share/ember/media/shared/common/resources/ogre/scripts/particle/smoke.particle
 share/ember/media/shared/common/resources/ogre/scripts/particle/sun.particle
-share/ember/media/shared/common/resources/ogre/scripts/programs/All_In_Wonder.cg
-share/ember/media/shared/common/resources/ogre/scripts/programs/All_In_Wonder.program
-share/ember/media/shared/common/resources/ogre/scripts/programs/Animation.cg
 share/ember/media/shared/common/resources/ogre/scripts/programs/Common.program
 share/ember/media/shared/common/resources/ogre/scripts/programs/DepthShadowmap.material
 share/ember/media/shared/common/resources/ogre/scripts/programs/DepthShadowmap.program
 share/ember/media/shared/common/resources/ogre/scripts/programs/DepthShadowmapCasterFp.glsl
 share/ember/media/shared/common/resources/ogre/scripts/programs/DepthShadowmapCasterVp.glsl
-share/ember/media/shared/common/resources/ogre/scripts/programs/Example_Basic.cg
-share/ember/media/shared/common/resources/ogre/scripts/programs/Example_BumpMapping.cg
-share/ember/media/shared/common/resources/ogre/scripts/programs/Example_CelShading.cg
 share/ember/media/shared/common/resources/ogre/scripts/programs/Example_Fresnel.cg
-share/ember/media/shared/common/resources/ogre/scripts/programs/Example_Projection.cg
-share/ember/media/shared/common/resources/ogre/scripts/programs/Examples.program
 share/ember/media/shared/common/resources/ogre/scripts/programs/Grass.cg
-share/ember/media/shared/common/resources/ogre/scripts/programs/Light.cg
 share/ember/media/shared/common/resources/ogre/scripts/programs/LightingFp.glsl
 share/ember/media/shared/common/resources/ogre/scripts/programs/LightingVp.glsl
-share/ember/media/shared/common/resources/ogre/scripts/programs/OffsetMapping.cg
-share/ember/media/shared/common/resources/ogre/scripts/programs/OffsetMappingFp.glsl
-share/ember/media/shared/common/resources/ogre/scripts/programs/OffsetMappingVp.glsl
 share/ember/media/shared/common/resources/ogre/scripts/programs/Splat.cg
 share/ember/media/shared/common/resources/ogre/scripts/programs/Splat.program
 share/ember/media/shared/common/resources/ogre/scripts/programs/SplatFp.glsl
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/All_In_Wonder.cg
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/All_In_Wonder.program
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/Animation.cg
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/Example_Basic.cg
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/Example_BumpMapping.cg
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/Example_CelShading.cg
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/Example_Projection.cg
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/Examples.program
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/Light.cg
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/OffsetMapping.cg
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/OffsetMappingFp.glsl
+share/ember/media/shared/common/resources/ogre/scripts/programs/old/OffsetMappingVp.glsl
 share/ember/media/shared/common/resources/ogre/textures/axes.png
 share/ember/media/shared/common/resources/ogre/textures/dark.png
 share/ember/media/shared/common/resources/ogre/textures/flare.png
@@ -939,9 +920,6 @@ share/ember/media/shared/core/axes.png
 share/ember/media/shared/core/ember_progress_bar.png
 share/ember/media/shared/core/ember_progress_bar_frame.png
 share/ember/media/shared/core/ember_splash.png
-share/ember/media/user/COPYING.txt
-share/ember/media/user/LICENSING.txt
-share/ember/media/user/README
 share/ember/media/shared/entityrecipes/barrel.entityrecipe
 share/ember/media/shared/entityrecipes/birch.entityrecipe
 share/ember/media/shared/entityrecipes/boulder.entityrecipe
@@ -956,6 +934,8 @@ share/ember/media/shared/entityrecipes/mushroom.entityrecipe
 share/ember/media/shared/entityrecipes/oak.entityrecipe
 share/ember/media/shared/entityrecipes/stone_palissade.entityrecipe
 share/ember/media/shared/entityrecipes/test.entityrecipe
+share/ember/media/shared/entityrecipes/tinderbox.entityrecipe
+share/ember/media/shared/entityrecipes/torch.entityrecipe
 share/ember/media/shared/entityrecipes/vegetables.entityrecipe
 share/ember/media/shared/gui/CEGUIConfig.xsd
 share/ember/media/shared/gui/Falagard.xsd
@@ -984,6 +964,7 @@ share/ember/media/shared/gui/cegui/datafiles/layouts/EntityBrowser.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/EntityCreator.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/EntityEditor.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/EntityPicker.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/EntityPickerSelector.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/Environment.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/GUILayout.xsd
 share/ember/media/shared/gui/cegui/datafiles/layouts/Give.layout
@@ -1006,6 +987,7 @@ share/ember/media/shared/gui/cegui/datafiles/layouts/PickingInfo.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/Quit.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/ScriptEdit.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/ServerBrowser.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/ServerLogger.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/ServerWidget.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/Status.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/Tasks.layout
@@ -1038,7 +1020,6 @@ share/ember/media/shared/modeldefinitions/bed.modeldef
 share/ember/media/shared/modeldefinitions/birchA.modeldef
 share/ember/media/shared/modeldefinitions/birchB.modeldef
 share/ember/media/shared/modeldefinitions/birchC.modeldef
-share/ember/media/shared/modeldefinitions/birch_mk1.modeldef
 share/ember/media/shared/modeldefinitions/boat.modeldef
 share/ember/media/shared/modeldefinitions/bottle.modeldef
 share/ember/media/shared/modeldefinitions/bowls.modeldef
@@ -1078,6 +1059,7 @@ share/ember/media/shared/modeldefinitions/deer.modeldef
 share/ember/media/shared/modeldefinitions/don_jon.modeldef
 share/ember/media/shared/modeldefinitions/door.modeldef
 share/ember/media/shared/modeldefinitions/edibles.modeldef
+share/ember/media/shared/modeldefinitions/entitymappings.entitymap.xml
 share/ember/media/shared/modeldefinitions/environment.modeldef.xml
 share/ember/media/shared/modeldefinitions/fencepole.modeldef
 share/ember/media/shared/modeldefinitions/fencesection.modeldef
@@ -1114,7 +1096,6 @@ share/ember/media/shared/modeldefinitions/market_tent.modeldef
 share/ember/media/shared/modeldefinitions/marketstall_canvasA.modeldef
 share/ember/media/shared/modeldefinitions/marketstall_canvasB.modeldef
 share/ember/media/shared/modeldefinitions/marketstall_canvasC.modeldef
-share/ember/media/shared/modeldefinitions/modelmappings.modelmap.xml
 share/ember/media/shared/modeldefinitions/monster_skeleton.modeldef
 share/ember/media/shared/modeldefinitions/moraf.terrain
 share/ember/media/shared/modeldefinitions/morafboulder.modeldef
@@ -1124,6 +1105,7 @@ share/ember/media/shared/modeldefinitions/oakC.modeldef
 share/ember/media/shared/modeldefinitions/oak_mk1.modeldef
 share/ember/media/shared/modeldefinitions/oak_sapling.modeldef
 share/ember/media/shared/modeldefinitions/oak_young.modeldef
+share/ember/media/shared/modeldefinitions/ocean.modeldef
 share/ember/media/shared/modeldefinitions/open_crate.modeldef
 share/ember/media/shared/modeldefinitions/outerwall.modeldef
 share/ember/media/shared/modeldefinitions/painting.modeldef
@@ -1136,8 +1118,10 @@ share/ember/media/shared/modeldefinitions/placeholder.modeldef.xml
 share/ember/media/shared/modeldefinitions/primitives.modeldef
 share/ember/media/shared/modeldefinitions/roots.modeldef
 share/ember/media/shared/modeldefinitions/scythe.modeldef
+share/ember/media/shared/modeldefinitions/shrubA.modeldef
 share/ember/media/shared/modeldefinitions/shrubB.modeldef
 share/ember/media/shared/modeldefinitions/shutters.modeldef
+share/ember/media/shared/modeldefinitions/silkfoot.modeldef
 share/ember/media/shared/modeldefinitions/spade.modeldef
 share/ember/media/shared/modeldefinitions/spanish_moss.modeldef
 share/ember/media/shared/modeldefinitions/spider.modeldef
@@ -1183,19 +1167,17 @@ share/ember/media/shared/scripting/lua/Performance.lua
 share/ember/media/shared/scripting/lua/PickingInfo.lua
 share/ember/media/shared/scripting/lua/ScriptEdit.lua
 share/ember/media/shared/scripting/lua/ServerBrowser.lua
+share/ember/media/shared/scripting/lua/ServerLogger.lua
 share/ember/media/shared/scripting/lua/Status.lua
 share/ember/media/shared/scripting/lua/Tasks.lua
 share/ember/media/shared/scripting/lua/TerrainEditor.lua
+share/ember/media/user/COPYING.txt
+share/ember/media/user/LICENSING.txt
+share/ember/media/user/README
 share/icons/worldforge/ember.png
 @dirrm etc/ember
 @dirrmtry share/applications
 @dirrm %%PORTDOCS%%%%DOCSDIR%%
-@dirrm share/ember/carpenter/blockspec
-@dirrm share/ember/carpenter/blueprints
-@dirrm share/ember/carpenter/modelblockspecs
-@dirrm share/ember/carpenter
-@dirrm share/ember/jesus/modelmappings
-@dirrm share/ember/jesus
 @dirrm share/ember/media/shared/common/3d_objects/environment/models/boulder
 @dirrm share/ember/media/shared/common/3d_objects/environment/models/cave
 @dirrm share/ember/media/shared/common/3d_objects/environment/models/monster_skeleton
@@ -1249,19 +1231,6 @@ share/icons/worldforge/ember.png
 @dirrm share/ember/media/shared/common/3d_objects/environment/textures/water
 @dirrm share/ember/media/shared/common/3d_objects/environment/textures
 @dirrm share/ember/media/shared/common/3d_objects/environment
-@dirrm share/ember/media/shared/common/3d_objects/items/building_element/models/columns
-@dirrm share/ember/media/shared/common/3d_objects/items/building_element/models/door_element
-@dirrm share/ember/media/shared/common/3d_objects/items/building_element/models/gallows
-@dirrm share/ember/media/shared/common/3d_objects/items/building_element/models/normal_slope_roof
-@dirrm share/ember/media/shared/common/3d_objects/items/building_element/models/normal_slope_wall
-@dirrm share/ember/media/shared/common/3d_objects/items/building_element/models/standard_wall
-@dirrm share/ember/media/shared/common/3d_objects/items/building_element/models/wall_blocks
-@dirrm share/ember/media/shared/common/3d_objects/items/building_element/models
-@dirrm share/ember/media/shared/common/3d_objects/items/building_element
-@dirrm share/ember/media/shared/common/3d_objects/items/building_primitives/models/columns
-@dirrm share/ember/media/shared/common/3d_objects/items/building_primitives/models/jetty
-@dirrm share/ember/media/shared/common/3d_objects/items/building_primitives/models
-@dirrm share/ember/media/shared/common/3d_objects/items/building_primitives
 @dirrm share/ember/media/shared/common/3d_objects/items/containers/models/barrel
 @dirrm share/ember/media/shared/common/3d_objects/items/containers/models/bottle
 @dirrm share/ember/media/shared/common/3d_objects/items/containers/models/bottlejug
@@ -1396,10 +1365,13 @@ share/icons/worldforge/ember.png
 @dirrm share/ember/media/shared/common/3d_objects/plants/mushrooms/textures/galerina
 @dirrm share/ember/media/shared/common/3d_objects/plants/mushrooms/textures/silkfoot
 @dirrm share/ember/media/shared/common/3d_objects/plants/mushrooms/textures
+@dirrm share/ember/media/shared/common/3d_objects/plants/mushrooms/models/silkfoot
+@dirrm share/ember/media/shared/common/3d_objects/plants/mushrooms/models
 @dirrm share/ember/media/shared/common/3d_objects/plants/mushrooms
 @dirrm share/ember/media/shared/common/3d_objects/plants/shrubs/models/bush
 @dirrm share/ember/media/shared/common/3d_objects/plants/shrubs/models/fern
 @dirrm share/ember/media/shared/common/3d_objects/plants/shrubs/models/leaf
+@dirrm share/ember/media/shared/common/3d_objects/plants/shrubs/models/shrub_A
 @dirrm share/ember/media/shared/common/3d_objects/plants/shrubs/models/shrub_B
 @dirrm share/ember/media/shared/common/3d_objects/plants/shrubs/models
 @dirrm share/ember/media/shared/common/3d_objects/plants/shrubs/textures/bush_gnarly_brown
@@ -1453,6 +1425,7 @@ share/icons/worldforge/ember.png
 @dirrm share/ember/media/shared/common/3d_objects/structures/models/concrete_stairs
 @dirrm share/ember/media/shared/common/3d_objects/structures/models/fire_place_A
 @dirrm share/ember/media/shared/common/3d_objects/structures/models/ground_pallisade
+@dirrm share/ember/media/shared/common/3d_objects/structures/models/jetty
 @dirrm share/ember/media/shared/common/3d_objects/structures/models/log
 @dirrm share/ember/media/shared/common/3d_objects/structures/models/market_tent
 @dirrm share/ember/media/shared/common/3d_objects/structures/models/marketstall
@@ -1645,6 +1618,8 @@ share/icons/worldforge/ember.png
 @dirrm share/ember/media/shared/common/3d_skeletons/creatures/quadruped_v2/textures/pink_pig
 @dirrm share/ember/media/shared/common/3d_skeletons/creatures/quadruped_v2/textures
 @dirrm share/ember/media/shared/common/3d_skeletons/creatures/quadruped_v2
+@dirrm share/ember/media/shared/common/3d_skeletons/creatures/tubular/models/bluegill/animation
+@dirrm share/ember/media/shared/common/3d_skeletons/creatures/tubular/models/bluegill
 @dirrm share/ember/media/shared/common/3d_skeletons/creatures/tubular/models/fish_01
 @dirrm share/ember/media/shared/common/3d_skeletons/creatures/tubular/models
 @dirrm share/ember/media/shared/common/3d_skeletons/creatures/tubular/textures/scaly_brown_white
@@ -1674,6 +1649,7 @@ share/icons/worldforge/ember.png
 @dirrm share/ember/media/shared/common/resources/ogre/scripts/materials
 @dirrm share/ember/media/shared/common/resources/ogre/scripts/overlays
 @dirrm share/ember/media/shared/common/resources/ogre/scripts/particle
+@dirrm share/ember/media/shared/common/resources/ogre/scripts/programs/old
 @dirrm share/ember/media/shared/common/resources/ogre/scripts/programs
 @dirrm share/ember/media/shared/common/resources/ogre/scripts
 @dirrm share/ember/media/shared/common/resources/ogre/textures