update to 0.7.2

switch to CLang

6 files changed, 536 insertions, 495 deletions

diff --git a/games/ember/Makefile b/games/ember/Makefile
index c53f9a03c341..fb47d8f31f23 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ember
-PORTVERSION=	0.7.0
-PORTREVISION=	4
+PORTVERSION=	0.7.2
 CATEGORIES=	games
 MASTER_SITES=	SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \
 		http://amber.worldforge.org/ember/releases/stable/
@@ -13,15 +12,17 @@ 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.so.1.8.1:${PORTSDIR}/graphics/ogre3d
-RUN_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so.1.8.1:${PORTSDIR}/graphics/ogre3d
+LICENSE=	GPLv3
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d
+RUN_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d
 LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
 		liberis-1.3.so:${PORTSDIR}/devel/eris \
 		libvarconf-1.0.so:${PORTSDIR}/devel/varconf \
 		libmercator-0.3.so:${PORTSDIR}/devel/mercator \
 		libwfut-0.2.so:${PORTSDIR}/devel/libwfut \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libCEGUIBase-0.7.9.so:${PORTSDIR}/graphics/cegui
+		libCEGUIBase-0.so:${PORTSDIR}/graphics/cegui
 
 CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc \
 		--program-transform-name= --disable-cppunit --disable-debug \
@@ -31,16 +32,12 @@ CONFIGURE_ENV+=	LUA_LIBS="-L${LUA_LIBDIR} -llua" \
 		TOLUAXX="${TOLUAXX_CMD}"
 
 USE_SDL=	sdl
-GNU_CONFIGURE=	YES
-USE_LDCONFIG=	YES
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 USE_LUA=	5.1
 LUA_COMPS=	toluaxx
-USES=		openal:al,alut pathfix pkgconfig
+USES=		openal:al,alut pathfix pkgconfig compiler:c++11-lib
 USE_BZIP2=	YES
-CPPFLAGS+=	-DBR_NO_MACROS -std=c++11
-USE_GCC=	yes
-
-NO_STAGE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
@@ -51,28 +48,23 @@ post-patch:
 		s|-lGL|-L${LOCALBASE}/lib -lGL|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|	install-dist_docDATA |	|g'  ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|$$(sysconfdir)/ember/|$$(sysconfdir)/ember|g' \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/src/components/ogre/Makefile.in
 	@${REINPLACE_CMD} -e 's|#plugindir=.*|plugindir="${LOCALBASE}/lib/OGRE"|; \
 		s|,Plugin_CgProgramManager||g' \
 		${WRKSRC}/ember.conf
-	@${REINPLACE_CMD} -e 's|/bash|/sh|g' ${WRKSRC}/ember.in
-	@${REINPLACE_CMD} -e 's|BOOST_THREAD_LIB =|& -L${_GCC_RUNTIME} -lstdc++ |g' \
-		${WRKSRC}/src/main/Makefile.in
-	@${REINPLACE_CMD} -e 's|reset(0)|reset()|g' \
-		${WRKSRC}/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeData2D.cpp
+	@${REINPLACE_CMD} -e 's|std::lround|lround|g' \
+		${WRKSRC}/src/components/ogre/terrain/TerrainPageGeometry.cpp \
+		${WRKSRC}/src/components/ogre/terrain/HeightMap.cpp
 
 post-install:
 	(cd ${WRKDIR}/ember-media-${PORTVERSION}/media && ${FIND} . -type f -print | \
-		${CPIO} -pdmu -R${SHAREOWN}:${SHAREGRP} ${DATADIR}/media)
-	${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 0755
-	${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 0644
+		${CPIO} -pdmu -R${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/media)
+	${FIND} ${STAGEDIR}${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 0755
+	${FIND} ${STAGEDIR}${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 0644
 
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for docfile in README COPYING AUTHORS ChangeLog TODO
-	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for docfile in README.md COPYING AUTHORS ChangeLog
+	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/games/ember/distinfo b/games/ember/distinfo
index 9267c0d26f40..ffcb5bf48257 100644
--- a/games/ember/distinfo
+++ b/games/ember/distinfo
@@ -1,4 +1,4 @@
-SHA256 (ember-0.7.0.tar.bz2) = 2ded4df8e3b0ef33e2789fc1cfa8da794c43b26ae929506f655cc6e59394f77b
-SIZE (ember-0.7.0.tar.bz2) = 2195155
-SHA256 (ember-media-0.7.0.tar.bz2) = 240b963c1562bcbd282f075ba4e72f81ef16e3777dac659769f05ec54a014e45
-SIZE (ember-media-0.7.0.tar.bz2) = 281819258
+SHA256 (ember-0.7.2.tar.bz2) = 10b8ca796a680abd9c2cca2360f7bff0b3eb7ce938fa64d3aa30f9609ba8b2d8
+SIZE (ember-0.7.2.tar.bz2) = 2145050
+SHA256 (ember-media-0.7.2.tar.bz2) = 97f1c58fef7da7fb2cff06f2930f1170c390f7dd8937121066b4d5b75f0cb181
+SIZE (ember-media-0.7.2.tar.bz2) = 275810809
diff --git a/games/ember/files/patch-Atlas.cxx b/games/ember/files/patch-Atlas.cxx
new file mode 100644
index 000000000000..9a1e61cf8228
--- /dev/null
+++ b/games/ember/files/patch-Atlas.cxx
@@ -0,0 +1,11 @@
+--- src/framework/bindings/lua/atlas/Atlas.cxx.orig	2014-03-11 07:55:38.000000000 +0100
++++ src/framework/bindings/lua/atlas/Atlas.cxx	2014-03-11 07:55:51.000000000 +0100
+@@ -1908,7 +1908,7 @@
+   if (!self) tolua_error(tolua_S,"invalid 'self' in function 'operator=='", NULL);
+ #endif
+   {
+-   bool tolua_ret = (bool)  self->operator==(*value);
++   bool tolua_ret = (*self==*value);
+    tolua_pushboolean(tolua_S,(bool)tolua_ret);
+   }
+  }
diff --git a/games/ember/files/patch-EmberOgre.cxx b/games/ember/files/patch-EmberOgre.cxx
new file mode 100644
index 000000000000..7bf61ba06036
--- /dev/null
+++ b/games/ember/files/patch-EmberOgre.cxx
@@ -0,0 +1,20 @@
+--- src/components/ogre/scripting/bindings/lua/EmberOgre.cxx.orig	2014-03-11 22:11:48.000000000 +0100
++++ src/components/ogre/scripting/bindings/lua/EmberOgre.cxx	2014-03-11 22:12:58.000000000 +0100
+@@ -17592,7 +17592,7 @@
+   if (!self) tolua_error(tolua_S,"invalid 'self' in function 'operator=='", NULL);
+ #endif
+   {
+-   bool tolua_ret = (bool)  self->operator==(*value);
++   bool tolua_ret = (*self==*value);
+    tolua_pushboolean(tolua_S,(bool)tolua_ret);
+   }
+  }
+@@ -24412,7 +24412,7 @@
+   if (!self) tolua_error(tolua_S,"invalid 'self' in function 'operator=='", NULL);
+ #endif
+   {
+-   bool tolua_ret = (bool)  self->operator==(*value);
++   bool tolua_ret = (*self)==(*value);
+    tolua_pushboolean(tolua_S,(bool)tolua_ret);
+   }
+  }
diff --git a/games/ember/files/patch-Vegetation.h b/games/ember/files/patch-Vegetation.h
new file mode 100644
index 000000000000..820b2e5fcd39
--- /dev/null
+++ b/games/ember/files/patch-Vegetation.h
@@ -0,0 +1,10 @@
+--- src/components/ogre/terrain/foliage/Vegetation.h.orig	2014-03-11 22:15:45.000000000 +0100
++++ src/components/ogre/terrain/foliage/Vegetation.h	2014-03-11 22:16:03.000000000 +0100
+@@ -9,6 +9,7 @@
+ #define VEGETATION_H_
+ 
+ #include "components/ogre/terrain/Types.h"
++#include <cstdlib>
+ #include <map>
+ 
+ namespace Ember
diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist
index 88c8e3685520..1c5b0de4005c 100644
--- a/games/ember/pkg-plist
+++ b/games/ember/pkg-plist
@@ -1,460 +1,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 bin/ember
 bin/ember.bin
 etc/ember/ember.conf
 etc/ember/hydrax.cfg
 etc/ember/ogre.cfg
 etc/ember/resources.cfg
-etc/ember/terrain.cfg
 share/applications/ember.desktop
 share/icons/worldforge/ember.png
-share/ember/media/shared/data/acorn.modeldef
-share/ember/media/shared/data/amanita.modeldef
-share/ember/media/shared/data/anvil.modeldef
-share/ember/media/shared/data/apple.modeldef
-share/ember/media/shared/data/armory.modeldef
-share/ember/media/shared/data/arrow.modeldef
-share/ember/media/shared/data/axe.modeldef
-share/ember/media/shared/data/axe_head.modeldef
-share/ember/media/shared/data/bailey1.modeldef
-share/ember/media/shared/data/bailey2.modeldef
-share/ember/media/shared/data/barrel.modeldef
-share/ember/media/shared/data/bass_lm.modeldef
-share/ember/media/shared/data/bear.modeldef
-share/ember/media/shared/data/bed.modeldef
-share/ember/media/shared/data/birchA.modeldef
-share/ember/media/shared/data/birchB.modeldef
-share/ember/media/shared/data/birchC.modeldef
-share/ember/media/shared/data/birchD.modeldef
-share/ember/media/shared/data/bloomery.modeldef
-share/ember/media/shared/data/bluegill.modeldef
-share/ember/media/shared/data/board.modeldef
-share/ember/media/shared/data/boat.modeldef
-share/ember/media/shared/data/bottle.modeldef
-share/ember/media/shared/data/bowls.modeldef
-share/ember/media/shared/data/bucksaw.modeldef
-share/ember/media/shared/data/bush.modeldef
-share/ember/media/shared/data/butcher_house.modeldef
-share/ember/media/shared/data/camelia.modeldef
-share/ember/media/shared/data/campfire.modeldef
-share/ember/media/shared/data/carrot.modeldef
-share/ember/media/shared/data/cart.modeldef
-share/ember/media/shared/data/castle_outer_wall.modeldef
-share/ember/media/shared/data/cave.modeldef
-share/ember/media/shared/data/cg_curtainwall_corner.modeldef
-share/ember/media/shared/data/cg_curtainwall_run.modeldef
-share/ember/media/shared/data/cg_don_jon.modeldef
-share/ember/media/shared/data/cg_gateway.modeldef
-share/ember/media/shared/data/cg_house.modeldef
-share/ember/media/shared/data/cg_houseC.modeldef
-share/ember/media/shared/data/cg_house_A.modeldef
-share/ember/media/shared/data/cg_house_B.modeldef
-share/ember/media/shared/data/cg_house_D.modeldef
-share/ember/media/shared/data/cg_house_ruin.modeldef
-share/ember/media/shared/data/cg_inn.modeldef
-share/ember/media/shared/data/cg_outer_wall.modeldef
-share/ember/media/shared/data/cg_pedestal.modeldef
-share/ember/media/shared/data/cg_smithy.modeldef
-share/ember/media/shared/data/cg_statue.modeldef
-share/ember/media/shared/data/cg_wall_corner.modeldef
-share/ember/media/shared/data/cg_wall_gate.modeldef
-share/ember/media/shared/data/cg_wall_run.modeldef
-share/ember/media/shared/data/cg_wall_stairs.modeldef
-share/ember/media/shared/data/cg_well.modeldef
-share/ember/media/shared/data/characters.modeldef
-share/ember/media/shared/data/charcoal.modeldef
-share/ember/media/shared/data/chest.modeldef
-share/ember/media/shared/data/chicken.modeldef
-share/ember/media/shared/data/choppingblock.modeldef
-share/ember/media/shared/data/coin.modeldef
-share/ember/media/shared/data/concrete_stairs.modeldef
-share/ember/media/shared/data/cow.modeldef
-share/ember/media/shared/data/crate.modeldef
-share/ember/media/shared/data/crate_lid.modeldef
-share/ember/media/shared/data/creator.modeldef
-share/ember/media/shared/data/creatures.modeldef
-share/ember/media/shared/data/deed.modeldef
-share/ember/media/shared/data/deer.modeldef
-share/ember/media/shared/data/dog.modeldef
-share/ember/media/shared/data/don_jon.modeldef
-share/ember/media/shared/data/donkey.modeldef
-share/ember/media/shared/data/door.modeldef
-share/ember/media/shared/data/duck.modeldef
-share/ember/media/shared/data/edibles.modeldef
-share/ember/media/shared/data/entitymappings.entitymap.xml
-share/ember/media/shared/data/environment.modeldef
-share/ember/media/shared/data/farmers_cap.modeldef
-share/ember/media/shared/data/fencepole.modeldef
-share/ember/media/shared/data/fencesection.modeldef
-share/ember/media/shared/data/fern.modeldef
-share/ember/media/shared/data/fire_place_A.modeldef
-share/ember/media/shared/data/fishing_hook.modeldef
-share/ember/media/shared/data/fishing_lure.modeldef
-share/ember/media/shared/data/fishing_rod.modeldef
-share/ember/media/shared/data/flying_bird.modeldef
-share/ember/media/shared/data/furniture.modeldef
-share/ember/media/shared/data/galbor_heavy_infantry.modeldef
-share/ember/media/shared/data/galbor_legionnaire.modeldef
-share/ember/media/shared/data/galerina.modeldef
-share/ember/media/shared/data/gallows.modeldef
-share/ember/media/shared/data/gateway.modeldef
-share/ember/media/shared/data/goblin.modeldef
-share/ember/media/shared/data/graniteA.modeldef
-share/ember/media/shared/data/graniteB.modeldef
-share/ember/media/shared/data/graniteC.modeldef
-share/ember/media/shared/data/graniteD.modeldef
-share/ember/media/shared/data/grass.modeldef
-share/ember/media/shared/data/ham.modeldef
-share/ember/media/shared/data/hammer.modeldef
-share/ember/media/shared/data/hammer_head.modeldef
-share/ember/media/shared/data/hatchet.modeldef
-share/ember/media/shared/data/horse.modeldef
-share/ember/media/shared/data/house3.modeldef
-share/ember/media/shared/data/ice_chunk.modeldef
-share/ember/media/shared/data/ingot.modeldef
-share/ember/media/shared/data/iron_ore.modeldef
-share/ember/media/shared/data/iron_ore_node.modeldef
-share/ember/media/shared/data/items.modeldef
-share/ember/media/shared/data/jetty.modeldef
-share/ember/media/shared/data/jug.modeldef
-share/ember/media/shared/data/keep.modeldef
-share/ember/media/shared/data/knife.modeldef
-share/ember/media/shared/data/kobold.modeldef
-share/ember/media/shared/data/leaf.modeldef
-share/ember/media/shared/data/lumber.modeldef
-share/ember/media/shared/data/male.modeldef
-share/ember/media/shared/data/market_tent.modeldef
-share/ember/media/shared/data/marketstall_canvasA.modeldef
-share/ember/media/shared/data/marketstall_canvasB.modeldef
-share/ember/media/shared/data/marketstall_canvasC.modeldef
-share/ember/media/shared/data/monster_skeleton.modeldef
-share/ember/media/shared/data/moraf.terrain
-share/ember/media/shared/data/morafboulder.modeldef
-share/ember/media/shared/data/oak.modeldef
-share/ember/media/shared/data/oakB.modeldef
-share/ember/media/shared/data/oakC.modeldef
-share/ember/media/shared/data/oak_mk1.modeldef
-share/ember/media/shared/data/oak_sapling.modeldef
-share/ember/media/shared/data/oak_young.modeldef
-share/ember/media/shared/data/ocean.modeldef
-share/ember/media/shared/data/open_crate.modeldef
-share/ember/media/shared/data/outerwall.modeldef
-share/ember/media/shared/data/painting.modeldef
-share/ember/media/shared/data/paladin.modeldef
-share/ember/media/shared/data/palisade_circle.modeldef
-share/ember/media/shared/data/palisade_entry.modeldef
-share/ember/media/shared/data/palisade_unit.modeldef
-share/ember/media/shared/data/pickaxe.modeldef
-share/ember/media/shared/data/pickaxe_head.modeldef
-share/ember/media/shared/data/pickerel.modeldef
-share/ember/media/shared/data/pile.modeldef
-share/ember/media/shared/data/placeholder.modeldef
-share/ember/media/shared/data/primitives.modeldef
-share/ember/media/shared/data/rabbit.modeldef
-share/ember/media/shared/data/roots.modeldef
-share/ember/media/shared/data/saw_blade.modeldef
-share/ember/media/shared/data/scythe.modeldef
-share/ember/media/shared/data/scythe_head.modeldef
-share/ember/media/shared/data/shirt.modeldef
-share/ember/media/shared/data/shrubA.modeldef
-share/ember/media/shared/data/shrubB.modeldef
-share/ember/media/shared/data/shutters.modeldef
-share/ember/media/shared/data/sieve.modeldef
-share/ember/media/shared/data/signpost.modeldef
-share/ember/media/shared/data/signpost_left.modeldef
-share/ember/media/shared/data/signpost_right.modeldef
-share/ember/media/shared/data/spade.modeldef
-share/ember/media/shared/data/spanish_moss.modeldef
-share/ember/media/shared/data/spider.modeldef
-share/ember/media/shared/data/stake.modeldef
-share/ember/media/shared/data/stalactites.modeldef
-share/ember/media/shared/data/stone_palisade.modeldef
-share/ember/media/shared/data/sty.modeldef
-share/ember/media/shared/data/sword.modeldef
-share/ember/media/shared/data/temple.modeldef
-share/ember/media/shared/data/tent.modeldef
-share/ember/media/shared/data/tinderbox.modeldef
-share/ember/media/shared/data/tinderboxA.modeldef
-share/ember/media/shared/data/tinderboxB.modeldef
-share/ember/media/shared/data/tombstone.modeldef
-share/ember/media/shared/data/tongs.modeldef
-share/ember/media/shared/data/torch.modeldef
-share/ember/media/shared/data/tower.modeldef
-share/ember/media/shared/data/treeA.modeldef
-share/ember/media/shared/data/trees.modeldef
-share/ember/media/shared/data/trousers.modeldef
-share/ember/media/shared/data/trowel.modeldef
-share/ember/media/shared/data/trowel_head.modeldef
-share/ember/media/shared/data/tuna.modeldef
-share/ember/media/shared/data/turnip.modeldef
-share/ember/media/shared/data/twobyfour.modeldef
-share/ember/media/shared/data/waterwell.modeldef
-share/ember/media/shared/data/wood.modeldef
-share/ember/media/shared/data/wooden_fence.modeldef
-share/ember/media/shared/data/wooden_gate.modeldef
-share/ember/media/shared/entityrecipes/area.entityrecipe
-share/ember/media/shared/entityrecipes/barrel.entityrecipe
-share/ember/media/shared/entityrecipes/birch.entityrecipe
-share/ember/media/shared/entityrecipes/board.entityrecipe
-share/ember/media/shared/entityrecipes/boulder.entityrecipe
-share/ember/media/shared/entityrecipes/campfire.entityrecipe
-share/ember/media/shared/entityrecipes/castle_house.entityrecipe
-share/ember/media/shared/entityrecipes/castle_house_A.entityrecipe
-share/ember/media/shared/entityrecipes/castle_wall.entityrecipe
-share/ember/media/shared/entityrecipes/crates.entityrecipe
-share/ember/media/shared/entityrecipes/farmanimals.entityrecipe
-share/ember/media/shared/entityrecipes/feature.entityrecipe
-share/ember/media/shared/entityrecipes/fence.entityrecipe
-share/ember/media/shared/entityrecipes/fir.entityrecipe
-share/ember/media/shared/entityrecipes/fish.entityrecipe
-share/ember/media/shared/entityrecipes/fishingrod.entityrecipe
-share/ember/media/shared/entityrecipes/food.entityrecipe
-share/ember/media/shared/entityrecipes/gallows.entityrecipe
-share/ember/media/shared/entityrecipes/gravestone.entityrecipe
-share/ember/media/shared/entityrecipes/mushroom.entityrecipe
-share/ember/media/shared/entityrecipes/oak.entityrecipe
-share/ember/media/shared/entityrecipes/palisade.entityrecipe
-share/ember/media/shared/entityrecipes/shovel.entityrecipe
-share/ember/media/shared/entityrecipes/shrub.entityrecipe
-share/ember/media/shared/entityrecipes/sieve.entityrecipe
-share/ember/media/shared/entityrecipes/signpost.entityrecipe
-share/ember/media/shared/entityrecipes/stake.entityrecipe
-share/ember/media/shared/entityrecipes/stone_palissade.entityrecipe
-share/ember/media/shared/entityrecipes/test.entityrecipe
-share/ember/media/shared/entityrecipes/thing.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/entityrecipes/waterwell.entityrecipe
-share/ember/media/shared/entityrecipes/wildlife.entityrecipe
-share/ember/media/shared/gui/CEGUIConfig.xsd
-share/ember/media/shared/gui/Falagard.xsd
-share/ember/media/shared/gui/Font.xsd
-share/ember/media/shared/gui/GUILayout.xsd
-share/ember/media/shared/gui/GUIScheme.xsd
-share/ember/media/shared/gui/Imageset.xsd
-share/ember/media/shared/gui/cegui/datafiles/configs/cegui.config
-share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-10.xml
-share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-14.xml
-share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-6.xml
-share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-7.xml
-share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-8.xml
-share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-Bold-10.xml
-share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-Bold-8.xml
-share/ember/media/shared/gui/cegui/datafiles/imagesets/EmberLook.imageset
-share/ember/media/shared/gui/cegui/datafiles/imagesets/Imageset.xsd
-share/ember/media/shared/gui/cegui/datafiles/imagesets/compass.imageset
-share/ember/media/shared/gui/cegui/datafiles/imagesets/iconset_mason.imageset
-share/ember/media/shared/gui/cegui/datafiles/imagesets/iconset_standard.imageset
-share/ember/media/shared/gui/cegui/datafiles/imagesets/splash.imageset
-share/ember/media/shared/gui/cegui/datafiles/imagesets/status_main.imageset
-share/ember/media/shared/gui/cegui/datafiles/layouts/ActionBar.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/ActionBarCreator.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/AssetsManager.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/AutomaticGraphicsSettings.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/Compass.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/Console.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/Debug.layout
-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
-share/ember/media/shared/gui/cegui/datafiles/layouts/HelpWidget.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/HoverEntityOverlay.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/IndirectRenderingChecker.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/IngameChatWidgetAttached.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/IngameChatWidgetDetached.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/IngameMerchantTradeConfirmationDialog.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/IngameMerchantWidget.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/InspectWidget.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/Inventory.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/InventoryWidget.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/JesusEdit.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/JesusEditFile.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/JesusEditPreview.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/Label.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/MeshPreview.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/ModelEdit.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/OgreConfigurator.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/Performance.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/PickingInfo.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/QuickHelp.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/Settings.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/SettingsRestartDialog.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/SettingsUnappliedChangesDialog.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/Status.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/Tasks.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/TerrainEditor.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/TypeManager.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/AreaAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/ListAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/ListAdapterNewElement.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/MapAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/MapAdapterNewElement.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/NumberAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/OrientationAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/Position2DAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/PositionAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/SizeAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/StaticAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/StringAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/TerrainModAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ActionBar.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ActionBarCreator.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/AssetsManager.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/AutomaticGraphicsSettings.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/CheckboxRepresentation.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ComboboxRepresentation.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Compass.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Console.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Debug.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EditboxRepresentation.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EntityBrowser.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EntityCreator.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EntityEditor.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EntityPicker.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EntityPickerSelector.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Environment.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Give.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/HelpWidget.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/HoverEntityOverlay.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/IndirectRenderingChecker.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/IngameChatWidgetAttached.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/IngameChatWidgetDetached.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/IngameMerchantTradeConfirmationDialog.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/IngameMerchantWidget.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/InspectWidget.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Inventory.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/InventoryWidget.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/JesusEdit.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/JesusEditFile.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/JesusEditPreview.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Label.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/MeshPreview.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ModelEdit.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/OgreConfigurator.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Performance.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/PickingInfo.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/QuickHelp.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Quit.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ScriptEdit.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ServerBrowser.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ServerLogger.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ServerWidget.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Settings.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/SettingsRestartDialog.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/SettingsUnappliedChangesDialog.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/SliderRepresentation.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Status.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Tasks.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/TerrainEditor.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/TypeManager.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/AreaAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/ListAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/ListAdapterNewElement.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/MapAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/MapAdapterNewElement.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/NumberAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/OrientationAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/Position2DAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/PositionAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/SizeAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/StaticAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/StringAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/TerrainModAdapter.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/representations/CheckboxRepresentation.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/representations/ComboboxRepresentation.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/representations/EditboxRepresentation.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/representations/representations/SliderRepresentation.layout
-share/ember/media/shared/gui/cegui/datafiles/looknfeel/EmberLook.looknfeel
-share/ember/media/shared/gui/cegui/datafiles/schemes/EmberLookSkin.scheme
-share/ember/media/shared/gui/cegui/datafiles/schemes/EmberLookSkinMinimal.scheme
-share/ember/media/shared/gui/cegui/datafiles/schemes/GUIScheme.xsd
-share/ember/media/shared/scripting/lua/ActionBar.lua
-share/ember/media/shared/scripting/lua/ActionBarCreator.lua
-share/ember/media/shared/scripting/lua/ActionBarDefaultAction.lua
-share/ember/media/shared/scripting/lua/Admin.lua
-share/ember/media/shared/scripting/lua/AssetsManager.lua
-share/ember/media/shared/scripting/lua/Bootstrap.lua
-share/ember/media/shared/scripting/lua/Compass.lua
-share/ember/media/shared/scripting/lua/Console.lua
-share/ember/media/shared/scripting/lua/DefaultEntityActions.lua
-share/ember/media/shared/scripting/lua/EntityBrowser.lua
-share/ember/media/shared/scripting/lua/EntityCreator.lua
-share/ember/media/shared/scripting/lua/EntityEditor.lua
-share/ember/media/shared/scripting/lua/EntityPicker.lua
-share/ember/media/shared/scripting/lua/Environment.lua
-share/ember/media/shared/scripting/lua/Give.lua
-share/ember/media/shared/scripting/lua/HoverEntityOverlay.lua
-share/ember/media/shared/scripting/lua/IndirectRenderingChecker.lua
-share/ember/media/shared/scripting/lua/IngameMerchantWidget.lua
-share/ember/media/shared/scripting/lua/Inspect.lua
-share/ember/media/shared/scripting/lua/Inventory.lua
-share/ember/media/shared/scripting/lua/MainIconBar.lua
-share/ember/media/shared/scripting/lua/Math.lua
-share/ember/media/shared/scripting/lua/ModelEdit.lua
-share/ember/media/shared/scripting/lua/Mover.lua
-share/ember/media/shared/scripting/lua/Performance.lua
-share/ember/media/shared/scripting/lua/PickingInfo.lua
-share/ember/media/shared/scripting/lua/QuickHelp.lua
-share/ember/media/shared/scripting/lua/ScriptEdit.lua
-share/ember/media/shared/scripting/lua/Server.lua
-share/ember/media/shared/scripting/lua/ServerBrowser.lua
-share/ember/media/shared/scripting/lua/ServerLogger.lua
-share/ember/media/shared/scripting/lua/Settings.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/shared/scripting/lua/TypeManager.lua
-share/ember/media/shared/scripting/lua/representations/ActionBar.lua
-share/ember/media/shared/scripting/lua/representations/ActionBarCreator.lua
-share/ember/media/shared/scripting/lua/representations/ActionBarDefaultAction.lua
-share/ember/media/shared/scripting/lua/representations/Admin.lua
-share/ember/media/shared/scripting/lua/representations/AssetsManager.lua
-share/ember/media/shared/scripting/lua/representations/Bootstrap.lua
-share/ember/media/shared/scripting/lua/representations/Compass.lua
-share/ember/media/shared/scripting/lua/representations/Console.lua
-share/ember/media/shared/scripting/lua/representations/DefaultEntityActions.lua
-share/ember/media/shared/scripting/lua/representations/EntityBrowser.lua
-share/ember/media/shared/scripting/lua/representations/EntityCreator.lua
-share/ember/media/shared/scripting/lua/representations/EntityEditor.lua
-share/ember/media/shared/scripting/lua/representations/EntityPicker.lua
-share/ember/media/shared/scripting/lua/representations/Environment.lua
-share/ember/media/shared/scripting/lua/representations/Give.lua
-share/ember/media/shared/scripting/lua/representations/HoverEntityOverlay.lua
-share/ember/media/shared/scripting/lua/representations/IndirectRenderingChecker.lua
-share/ember/media/shared/scripting/lua/representations/IngameMerchantWidget.lua
-share/ember/media/shared/scripting/lua/representations/Inspect.lua
-share/ember/media/shared/scripting/lua/representations/Inventory.lua
-share/ember/media/shared/scripting/lua/representations/MainIconBar.lua
-share/ember/media/shared/scripting/lua/representations/Math.lua
-share/ember/media/shared/scripting/lua/representations/ModelEdit.lua
-share/ember/media/shared/scripting/lua/representations/Mover.lua
-share/ember/media/shared/scripting/lua/representations/Performance.lua
-share/ember/media/shared/scripting/lua/representations/PickingInfo.lua
-share/ember/media/shared/scripting/lua/representations/QuickHelp.lua
-share/ember/media/shared/scripting/lua/representations/ScriptEdit.lua
-share/ember/media/shared/scripting/lua/representations/Server.lua
-share/ember/media/shared/scripting/lua/representations/ServerBrowser.lua
-share/ember/media/shared/scripting/lua/representations/ServerLogger.lua
-share/ember/media/shared/scripting/lua/representations/Settings.lua
-share/ember/media/shared/scripting/lua/representations/Status.lua
-share/ember/media/shared/scripting/lua/representations/Tasks.lua
-share/ember/media/shared/scripting/lua/representations/TerrainEditor.lua
-share/ember/media/shared/scripting/lua/representations/TypeManager.lua
 share/ember/media/shared/COPYING.txt
 share/ember/media/shared/LICENSING.txt
 share/ember/media/shared/common/3d_objects/characters/malebuilder/male/animations/malebuilder.skeleton
@@ -794,6 +349,7 @@ share/ember/media/shared/common/3d_objects/environment/textures/stone_yellow/ogr
 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/environment/textures/water/ocean.material
 share/ember/media/shared/common/3d_objects/environment/textures/water/ogre.material
 share/ember/media/shared/common/3d_objects/items/building_element/models/board/board.mesh
 share/ember/media/shared/common/3d_objects/items/building_element/models/twobyfour/twobyfour.mesh
@@ -817,6 +373,7 @@ share/ember/media/shared/common/3d_objects/items/containers/textures/barrel/ogre
 share/ember/media/shared/common/3d_objects/items/containers/textures/bottle/D.png
 share/ember/media/shared/common/3d_objects/items/containers/textures/bottle/N.png
 share/ember/media/shared/common/3d_objects/items/containers/textures/bottle/S.png
+share/ember/media/shared/common/3d_objects/items/containers/textures/bottle/cork.material
 share/ember/media/shared/common/3d_objects/items/containers/textures/bottle/ogre.material
 share/ember/media/shared/common/3d_objects/items/containers/textures/bottlejug/D.png
 share/ember/media/shared/common/3d_objects/items/containers/textures/bottlejug/N.png
@@ -830,6 +387,7 @@ share/ember/media/shared/common/3d_objects/items/containers/textures/chest/D.png
 share/ember/media/shared/common/3d_objects/items/containers/textures/chest/N.png
 share/ember/media/shared/common/3d_objects/items/containers/textures/chest/S.png
 share/ember/media/shared/common/3d_objects/items/containers/textures/chest/ogre.material
+share/ember/media/shared/common/3d_objects/items/containers/textures/chest/wood.material
 share/ember/media/shared/common/3d_objects/items/containers/textures/crate_aged/D.png
 share/ember/media/shared/common/3d_objects/items/containers/textures/crate_aged/N.png
 share/ember/media/shared/common/3d_objects/items/containers/textures/crate_aged/S.png
@@ -1029,11 +587,13 @@ share/ember/media/shared/common/3d_objects/plants/fruit/textures/acorn/D.png
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/acorn/I.png
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/acorn/N.png
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/acorn/S.png
+share/ember/media/shared/common/3d_objects/plants/fruit/textures/acorn/leaf.material
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/acorn/ogre.material
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/apple/D.png
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/apple/I.png
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/apple/N.png
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/apple/S.png
+share/ember/media/shared/common/3d_objects/plants/fruit/textures/apple/leaf.material
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/apple/ogre.material
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/beet/D.png
 share/ember/media/shared/common/3d_objects/plants/fruit/textures/beet/I.png
@@ -1050,6 +610,7 @@ share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_bro
 share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_brown/N.png
 share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_brown/S.png
 share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_brown/ogre.material
+share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_brown/wave.material
 share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_green/D.png
 share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_green/N.png
 share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_green/S.png
@@ -1058,10 +619,12 @@ share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_yel
 share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_yellow/N.png
 share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_yellow/S.png
 share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_yellow/ogre.material
+share/ember/media/shared/common/3d_objects/plants/grass/textures/bittergrass_yellow/wave.material
 share/ember/media/shared/common/3d_objects/plants/grass/textures/ducktail_yellow/D.png
 share/ember/media/shared/common/3d_objects/plants/grass/textures/ducktail_yellow/N.png
 share/ember/media/shared/common/3d_objects/plants/grass/textures/ducktail_yellow/S.png
 share/ember/media/shared/common/3d_objects/plants/grass/textures/ducktail_yellow/ogre.material
+share/ember/media/shared/common/3d_objects/plants/grass/textures/ducktail_yellow/wave.material
 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/textures/amanita/D.png
@@ -1228,7 +791,8 @@ share/ember/media/shared/common/3d_objects/primitives/models/box.mesh
 share/ember/media/shared/common/3d_objects/primitives/models/sphere.mesh
 share/ember/media/shared/common/3d_objects/primitives/textures/axes/D.png
 share/ember/media/shared/common/3d_objects/primitives/textures/axes/ogre.material
-share/ember/media/shared/common/3d_objects/primitives/textures/placeholder/D.png
+share/ember/media/shared/common/3d_objects/primitives/textures/error/D.png
+share/ember/media/shared/common/3d_objects/primitives/textures/error/ogre.material
 share/ember/media/shared/common/3d_objects/primitives/textures/placeholder/ogre.material
 share/ember/media/shared/common/3d_objects/structures/models/bloomery/bloomery.mesh
 share/ember/media/shared/common/3d_objects/structures/models/butcher_house/butcher_house.mesh
@@ -1654,6 +1218,9 @@ share/ember/media/shared/common/3d_objects/structures/textures/wall_inner_luxuri
 share/ember/media/shared/common/3d_objects/structures/textures/wall_inner_luxurious/ogre.material
 share/ember/media/shared/common/3d_objects/structures/textures/wall_inner_stained/D.png
 share/ember/media/shared/common/3d_objects/structures/textures/wall_inner_stained/ogre.material
+share/ember/media/shared/common/3d_objects/structures/textures/wall_outer/D.png
+share/ember/media/shared/common/3d_objects/structures/textures/wall_outer/N.png
+share/ember/media/shared/common/3d_objects/structures/textures/wall_outer/S.png
 share/ember/media/shared/common/3d_objects/structures/textures/wall_outer/ogre.material
 share/ember/media/shared/common/3d_objects/structures/textures/weathered/D.png
 share/ember/media/shared/common/3d_objects/structures/textures/weathered/N.png
@@ -1867,7 +1434,6 @@ share/ember/media/shared/common/3d_skeletons/quadrapeds/rabbit/N.png
 share/ember/media/shared/common/3d_skeletons/quadrapeds/rabbit/S.png
 share/ember/media/shared/common/3d_skeletons/quadrapeds/rabbit/ogre.material
 share/ember/media/shared/common/3d_skeletons/quadrapeds/rabbit/rabbit.skeleton
-share/ember/media/shared/common/art/characters/male/accessories/basic_burlap/ogre.material
 share/ember/media/shared/common/junkyard/models/bbhouse/avalon_bed.mesh
 share/ember/media/shared/common/junkyard/models/broken_tower/Tower01.mesh
 share/ember/media/shared/common/junkyard/models/skeleton/arm.mesh
@@ -1876,6 +1442,8 @@ share/ember/media/shared/common/junkyard/models/skeleton/ribcage.mesh
 share/ember/media/shared/common/junkyard/models/skeleton/shin.mesh
 share/ember/media/shared/common/junkyard/models/skeleton/skull.mesh
 share/ember/media/shared/common/junkyard/models/skeleton/thigh.mesh
+share/ember/media/shared/common/junkyard/sear/3d_objects/structures/textures/respa_column/D.png
+share/ember/media/shared/common/junkyard/sear/3d_objects/structures/textures/respa_column/ogre.material
 share/ember/media/shared/common/resources/ogre/caelum/core/AtmosphereDepth.png
 share/ember/media/shared/common/resources/ogre/caelum/core/CaelumGroundFog.cg
 share/ember/media/shared/common/resources/ogre/caelum/core/CaelumLayeredClouds.cg
@@ -1972,6 +1540,7 @@ share/ember/media/shared/common/resources/ogre/textures/lod2.png
 share/ember/media/shared/common/resources/ogre/textures/lod3.png
 share/ember/media/shared/common/resources/ogre/textures/lod4.png
 share/ember/media/shared/common/resources/ogre/textures/terraindecal.png
+share/ember/media/shared/common/resources/wcg_base/base_prop.material
 share/ember/media/shared/common/soundfx/creatures/footsteps/Footsteps_on_grass_sasquatch.wav
 share/ember/media/shared/common/soundfx/creatures/pig/eating.wav
 share/ember/media/shared/common/soundfx/creatures/pig/snort1.wav
@@ -1980,17 +1549,12 @@ share/ember/media/shared/common/soundfx/creatures/pig/snort3.wav
 share/ember/media/shared/common/soundfx/creatures/pig/snort4.wav
 share/ember/media/shared/common/soundfx/creatures/pig/snort5.wav
 share/ember/media/shared/common/soundfx/items/saw/sawing2_11khz_mono_jo.wav
-share/ember/media/shared/common/themes/ember/gui/cegui/EmberLook.png
 share/ember/media/shared/common/themes/ember/gui/compass/arrow.png
 share/ember/media/shared/common/themes/ember/gui/compass/inner_alpha.png
-share/ember/media/shared/common/themes/ember/gui/compass/outer_ring.png
 share/ember/media/shared/common/themes/ember/gui/fonts/AUTHORS
 share/ember/media/shared/common/themes/ember/gui/fonts/DejaVuSans-Bold.ttf
 share/ember/media/shared/common/themes/ember/gui/fonts/DejaVuSans.ttf
 share/ember/media/shared/common/themes/ember/gui/fonts/LICENSE
-share/ember/media/shared/common/themes/ember/gui/icons/iconset_mason.png
-share/ember/media/shared/common/themes/ember/gui/icons/iconset_standard.png
-share/ember/media/shared/common/themes/ember/gui/status/main.png
 share/ember/media/shared/core/AUTHORS
 share/ember/media/shared/core/D.png
 share/ember/media/shared/core/DejaVuSans.ttf
@@ -2002,16 +1566,458 @@ share/ember/media/shared/core/axes.mesh
 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
-@dirrm share/ember/media/user
+share/ember/media/shared/data/acorn.modeldef
+share/ember/media/shared/data/amanita.modeldef
+share/ember/media/shared/data/anvil.modeldef
+share/ember/media/shared/data/apple.modeldef
+share/ember/media/shared/data/armory.modeldef
+share/ember/media/shared/data/arrow.modeldef
+share/ember/media/shared/data/axe.modeldef
+share/ember/media/shared/data/axe_head.modeldef
+share/ember/media/shared/data/bailey1.modeldef
+share/ember/media/shared/data/bailey2.modeldef
+share/ember/media/shared/data/barrel.modeldef
+share/ember/media/shared/data/bass_lm.modeldef
+share/ember/media/shared/data/bear.modeldef
+share/ember/media/shared/data/bed.modeldef
+share/ember/media/shared/data/birchA.modeldef
+share/ember/media/shared/data/birchB.modeldef
+share/ember/media/shared/data/birchC.modeldef
+share/ember/media/shared/data/birchD.modeldef
+share/ember/media/shared/data/bloomery.modeldef
+share/ember/media/shared/data/bluegill.modeldef
+share/ember/media/shared/data/board.modeldef
+share/ember/media/shared/data/boat.modeldef
+share/ember/media/shared/data/bottle.modeldef
+share/ember/media/shared/data/bowls.modeldef
+share/ember/media/shared/data/bucksaw.modeldef
+share/ember/media/shared/data/bush.modeldef
+share/ember/media/shared/data/butcher_house.modeldef
+share/ember/media/shared/data/camelia.modeldef
+share/ember/media/shared/data/campfire.modeldef
+share/ember/media/shared/data/carrot.modeldef
+share/ember/media/shared/data/cart.modeldef
+share/ember/media/shared/data/castle_outer_wall.modeldef
+share/ember/media/shared/data/cave.modeldef
+share/ember/media/shared/data/cg_curtainwall_corner.modeldef
+share/ember/media/shared/data/cg_curtainwall_run.modeldef
+share/ember/media/shared/data/cg_don_jon.modeldef
+share/ember/media/shared/data/cg_gateway.modeldef
+share/ember/media/shared/data/cg_house.modeldef
+share/ember/media/shared/data/cg_houseC.modeldef
+share/ember/media/shared/data/cg_house_A.modeldef
+share/ember/media/shared/data/cg_house_B.modeldef
+share/ember/media/shared/data/cg_house_D.modeldef
+share/ember/media/shared/data/cg_house_ruin.modeldef
+share/ember/media/shared/data/cg_inn.modeldef
+share/ember/media/shared/data/cg_outer_wall.modeldef
+share/ember/media/shared/data/cg_pedestal.modeldef
+share/ember/media/shared/data/cg_smithy.modeldef
+share/ember/media/shared/data/cg_statue.modeldef
+share/ember/media/shared/data/cg_wall_corner.modeldef
+share/ember/media/shared/data/cg_wall_gate.modeldef
+share/ember/media/shared/data/cg_wall_run.modeldef
+share/ember/media/shared/data/cg_wall_stairs.modeldef
+share/ember/media/shared/data/cg_well.modeldef
+share/ember/media/shared/data/characters.modeldef
+share/ember/media/shared/data/charcoal.modeldef
+share/ember/media/shared/data/chest.modeldef
+share/ember/media/shared/data/chicken.modeldef
+share/ember/media/shared/data/choppingblock.modeldef
+share/ember/media/shared/data/coin.modeldef
+share/ember/media/shared/data/concrete_stairs.modeldef
+share/ember/media/shared/data/cow.modeldef
+share/ember/media/shared/data/crate.modeldef
+share/ember/media/shared/data/crate_lid.modeldef
+share/ember/media/shared/data/creator.modeldef
+share/ember/media/shared/data/creatures.modeldef
+share/ember/media/shared/data/deed.modeldef
+share/ember/media/shared/data/deer.modeldef
+share/ember/media/shared/data/dog.modeldef
+share/ember/media/shared/data/don_jon.modeldef
+share/ember/media/shared/data/donkey.modeldef
+share/ember/media/shared/data/door.modeldef
+share/ember/media/shared/data/duck.modeldef
+share/ember/media/shared/data/edibles.modeldef
+share/ember/media/shared/data/entitymappings.entitymap.xml
+share/ember/media/shared/data/environment.modeldef
+share/ember/media/shared/data/farmers_cap.modeldef
+share/ember/media/shared/data/fencepole.modeldef
+share/ember/media/shared/data/fencesection.modeldef
+share/ember/media/shared/data/fern.modeldef
+share/ember/media/shared/data/fire_place_A.modeldef
+share/ember/media/shared/data/fishing_hook.modeldef
+share/ember/media/shared/data/fishing_lure.modeldef
+share/ember/media/shared/data/fishing_rod.modeldef
+share/ember/media/shared/data/flying_bird.modeldef
+share/ember/media/shared/data/furniture.modeldef
+share/ember/media/shared/data/galbor_heavy_infantry.modeldef
+share/ember/media/shared/data/galbor_legionnaire.modeldef
+share/ember/media/shared/data/galerina.modeldef
+share/ember/media/shared/data/gallows.modeldef
+share/ember/media/shared/data/gateway.modeldef
+share/ember/media/shared/data/goblin.modeldef
+share/ember/media/shared/data/graniteA.modeldef
+share/ember/media/shared/data/graniteB.modeldef
+share/ember/media/shared/data/graniteC.modeldef
+share/ember/media/shared/data/graniteD.modeldef
+share/ember/media/shared/data/grass.modeldef
+share/ember/media/shared/data/ham.modeldef
+share/ember/media/shared/data/hammer.modeldef
+share/ember/media/shared/data/hammer_head.modeldef
+share/ember/media/shared/data/hatchet.modeldef
+share/ember/media/shared/data/horse.modeldef
+share/ember/media/shared/data/house3.modeldef
+share/ember/media/shared/data/ice_chunk.modeldef
+share/ember/media/shared/data/ingot.modeldef
+share/ember/media/shared/data/iron_ore.modeldef
+share/ember/media/shared/data/iron_ore_node.modeldef
+share/ember/media/shared/data/items.modeldef
+share/ember/media/shared/data/jetty.modeldef
+share/ember/media/shared/data/jug.modeldef
+share/ember/media/shared/data/keep.modeldef
+share/ember/media/shared/data/knife.modeldef
+share/ember/media/shared/data/kobold.modeldef
+share/ember/media/shared/data/leaf.modeldef
+share/ember/media/shared/data/lumber.modeldef
+share/ember/media/shared/data/male.modeldef
+share/ember/media/shared/data/market_tent.modeldef
+share/ember/media/shared/data/marketstall_canvasA.modeldef
+share/ember/media/shared/data/marketstall_canvasB.modeldef
+share/ember/media/shared/data/marketstall_canvasC.modeldef
+share/ember/media/shared/data/monster_skeleton.modeldef
+share/ember/media/shared/data/moraf.terrain
+share/ember/media/shared/data/morafboulder.modeldef
+share/ember/media/shared/data/oak.modeldef
+share/ember/media/shared/data/oakB.modeldef
+share/ember/media/shared/data/oakC.modeldef
+share/ember/media/shared/data/oak_mk1.modeldef
+share/ember/media/shared/data/oak_sapling.modeldef
+share/ember/media/shared/data/oak_young.modeldef
+share/ember/media/shared/data/ocean.modeldef
+share/ember/media/shared/data/open_crate.modeldef
+share/ember/media/shared/data/outerwall.modeldef
+share/ember/media/shared/data/painting.modeldef
+share/ember/media/shared/data/paladin.modeldef
+share/ember/media/shared/data/palisade_circle.modeldef
+share/ember/media/shared/data/palisade_entry.modeldef
+share/ember/media/shared/data/palisade_unit.modeldef
+share/ember/media/shared/data/pickaxe.modeldef
+share/ember/media/shared/data/pickaxe_head.modeldef
+share/ember/media/shared/data/pickerel.modeldef
+share/ember/media/shared/data/pile.modeldef
+share/ember/media/shared/data/placeholder.modeldef
+share/ember/media/shared/data/primitives.modeldef
+share/ember/media/shared/data/rabbit.modeldef
+share/ember/media/shared/data/roots.modeldef
+share/ember/media/shared/data/saw_blade.modeldef
+share/ember/media/shared/data/scythe.modeldef
+share/ember/media/shared/data/scythe_head.modeldef
+share/ember/media/shared/data/shirt.modeldef
+share/ember/media/shared/data/shrubA.modeldef
+share/ember/media/shared/data/shrubB.modeldef
+share/ember/media/shared/data/shutters.modeldef
+share/ember/media/shared/data/sieve.modeldef
+share/ember/media/shared/data/signpost.modeldef
+share/ember/media/shared/data/signpost_left.modeldef
+share/ember/media/shared/data/signpost_right.modeldef
+share/ember/media/shared/data/spade.modeldef
+share/ember/media/shared/data/spanish_moss.modeldef
+share/ember/media/shared/data/spider.modeldef
+share/ember/media/shared/data/stake.modeldef
+share/ember/media/shared/data/stalactites.modeldef
+share/ember/media/shared/data/stone_palisade.modeldef
+share/ember/media/shared/data/sty.modeldef
+share/ember/media/shared/data/sword.modeldef
+share/ember/media/shared/data/temple.modeldef
+share/ember/media/shared/data/tent.modeldef
+share/ember/media/shared/data/tinderbox.modeldef
+share/ember/media/shared/data/tinderboxA.modeldef
+share/ember/media/shared/data/tinderboxB.modeldef
+share/ember/media/shared/data/tombstone.modeldef
+share/ember/media/shared/data/tongs.modeldef
+share/ember/media/shared/data/torch.modeldef
+share/ember/media/shared/data/tower.modeldef
+share/ember/media/shared/data/treeA.modeldef
+share/ember/media/shared/data/trees.modeldef
+share/ember/media/shared/data/trousers.modeldef
+share/ember/media/shared/data/trowel.modeldef
+share/ember/media/shared/data/trowel_head.modeldef
+share/ember/media/shared/data/tuna.modeldef
+share/ember/media/shared/data/turnip.modeldef
+share/ember/media/shared/data/twobyfour.modeldef
+share/ember/media/shared/data/waterwell.modeldef
+share/ember/media/shared/data/wood.modeldef
+share/ember/media/shared/data/wooden_fence.modeldef
+share/ember/media/shared/data/wooden_gate.modeldef
+share/ember/media/shared/entityrecipes/barrel.entityrecipe
+share/ember/media/shared/entityrecipes/birch.entityrecipe
+share/ember/media/shared/entityrecipes/board.entityrecipe
+share/ember/media/shared/entityrecipes/boulder.entityrecipe
+share/ember/media/shared/entityrecipes/campfire.entityrecipe
+share/ember/media/shared/entityrecipes/castle_house.entityrecipe
+share/ember/media/shared/entityrecipes/castle_house_A.entityrecipe
+share/ember/media/shared/entityrecipes/castle_wall.entityrecipe
+share/ember/media/shared/entityrecipes/crates.entityrecipe
+share/ember/media/shared/entityrecipes/demo_thing.entityrecipe
+share/ember/media/shared/entityrecipes/farmanimals.entityrecipe
+share/ember/media/shared/entityrecipes/feature.entityrecipe
+share/ember/media/shared/entityrecipes/fence.entityrecipe
+share/ember/media/shared/entityrecipes/fir.entityrecipe
+share/ember/media/shared/entityrecipes/fish.entityrecipe
+share/ember/media/shared/entityrecipes/fishingrod.entityrecipe
+share/ember/media/shared/entityrecipes/food.entityrecipe
+share/ember/media/shared/entityrecipes/gallows.entityrecipe
+share/ember/media/shared/entityrecipes/gravestone.entityrecipe
+share/ember/media/shared/entityrecipes/mushroom.entityrecipe
+share/ember/media/shared/entityrecipes/oak.entityrecipe
+share/ember/media/shared/entityrecipes/palisade.entityrecipe
+share/ember/media/shared/entityrecipes/region.entityrecipe
+share/ember/media/shared/entityrecipes/shovel.entityrecipe
+share/ember/media/shared/entityrecipes/shrub.entityrecipe
+share/ember/media/shared/entityrecipes/sieve.entityrecipe
+share/ember/media/shared/entityrecipes/signpost.entityrecipe
+share/ember/media/shared/entityrecipes/stake.entityrecipe
+share/ember/media/shared/entityrecipes/stone_palisade.entityrecipe
+share/ember/media/shared/entityrecipes/test.entityrecipe
+share/ember/media/shared/entityrecipes/thing.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/entityrecipes/waterwell.entityrecipe
+share/ember/media/shared/entityrecipes/wildlife.entityrecipe
+share/ember/media/shared/gui/CEGUIConfig.xsd
+share/ember/media/shared/gui/Falagard.xsd
+share/ember/media/shared/gui/Font.xsd
+share/ember/media/shared/gui/GUILayout.xsd
+share/ember/media/shared/gui/GUIScheme.xsd
+share/ember/media/shared/gui/Imageset.xsd
+share/ember/media/shared/gui/cegui/datafiles/configs/cegui.config
+share/ember/media/shared/gui/cegui/datafiles/configs/ceguiMinimal.config
+share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-10.xml
+share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-14.xml
+share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-6.xml
+share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-7.xml
+share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-8.xml
+share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-Bold-10.xml
+share/ember/media/shared/gui/cegui/datafiles/fonts/DejaVuSans-Bold-8.xml
+share/ember/media/shared/gui/cegui/datafiles/imagesets/EmberLook.imageset
+share/ember/media/shared/gui/cegui/datafiles/imagesets/Imageset.xsd
+share/ember/media/shared/gui/cegui/datafiles/imagesets/compass.imageset
+share/ember/media/shared/gui/cegui/datafiles/imagesets/iconset_mason.imageset
+share/ember/media/shared/gui/cegui/datafiles/imagesets/iconset_standard.imageset
+share/ember/media/shared/gui/cegui/datafiles/imagesets/splash.imageset
+share/ember/media/shared/gui/cegui/datafiles/imagesets/status_main.imageset
+share/ember/media/shared/gui/cegui/datafiles/layouts/ActionBar.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/ActionBarCreator.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/AssetsManager.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/AutomaticGraphicsSettings.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Compass.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Console.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Debug.layout
+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
+share/ember/media/shared/gui/cegui/datafiles/layouts/HelpWidget.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/HoverEntityOverlay.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/IndirectRenderingChecker.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/IngameChatWidgetAttached.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/IngameChatWidgetDetached.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/IngameMerchantTradeConfirmationDialog.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/IngameMerchantWidget.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/InspectWidget.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Inventory.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/InventoryWidget.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/JesusEdit.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/JesusEditFile.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/JesusEditPreview.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Label.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/MeshPreview.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/ModelEdit.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/OgreConfigurator.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Performance.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/PickingInfo.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/QuickHelp.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Quit.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/RuleManager.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/ServerSocketDetected.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/ServerWidget.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Settings.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/SettingsRestartDialog.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/SettingsUnappliedChangesDialog.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Status.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Tasks.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/TerrainEditor.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/WorldLoadingScreen.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/AreaAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/ListAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/ListAdapterNewElement.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/MapAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/MapAdapterNewElement.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/NumberAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/OrientationAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/Position2DAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/PositionAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/SizeAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/StaticAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/StringAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/adapters/atlas/TerrainModAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ActionBar.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ActionBarCreator.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/AssetsManager.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/AutomaticGraphicsSettings.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/CheckboxRepresentation.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ComboboxRepresentation.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Compass.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Console.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Debug.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EditboxRepresentation.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EntityBrowser.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EntityCreator.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EntityEditor.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EntityPicker.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/EntityPickerSelector.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Environment.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Give.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/HelpWidget.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/HoverEntityOverlay.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/IndirectRenderingChecker.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/IngameChatWidgetAttached.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/IngameChatWidgetDetached.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/IngameMerchantTradeConfirmationDialog.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/IngameMerchantWidget.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/InspectWidget.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Inventory.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/InventoryWidget.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/JesusEdit.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/JesusEditFile.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/JesusEditPreview.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Label.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/MeshPreview.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ModelEdit.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/OgreConfigurator.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Performance.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/PickingInfo.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/QuickHelp.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Quit.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/RuleManager.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ScriptEdit.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ServerBrowser.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ServerLogger.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ServerSocketDetected.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/ServerWidget.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Settings.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/SettingsRestartDialog.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/SettingsUnappliedChangesDialog.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/SliderRepresentation.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Status.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/Tasks.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/TerrainEditor.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/WorldLoadingScreen.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/AreaAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/ListAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/ListAdapterNewElement.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/MapAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/MapAdapterNewElement.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/NumberAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/OrientationAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/Position2DAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/PositionAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/SizeAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/StaticAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/StringAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/adapters/atlas/TerrainModAdapter.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/representations/CheckboxRepresentation.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/representations/ComboboxRepresentation.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/representations/EditboxRepresentation.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/representations/representations/SliderRepresentation.layout
+share/ember/media/shared/gui/cegui/datafiles/looknfeel/EmberLook.looknfeel
+share/ember/media/shared/gui/cegui/datafiles/schemes/EmberLookSkin.scheme
+share/ember/media/shared/gui/cegui/datafiles/schemes/EmberLookSkinMinimal.scheme
+share/ember/media/shared/gui/cegui/datafiles/schemes/GUIScheme.xsd
+share/ember/media/shared/scripting/lua/ActionBar.lua
+share/ember/media/shared/scripting/lua/ActionBarCreator.lua
+share/ember/media/shared/scripting/lua/ActionBarDefaultAction.lua
+share/ember/media/shared/scripting/lua/Admin.lua
+share/ember/media/shared/scripting/lua/AssetsManager.lua
+share/ember/media/shared/scripting/lua/Bootstrap.lua
+share/ember/media/shared/scripting/lua/Compass.lua
+share/ember/media/shared/scripting/lua/Console.lua
+share/ember/media/shared/scripting/lua/DefaultEntityActions.lua
+share/ember/media/shared/scripting/lua/EntityBrowser.lua
+share/ember/media/shared/scripting/lua/EntityCreator.lua
+share/ember/media/shared/scripting/lua/EntityEditor.lua
+share/ember/media/shared/scripting/lua/EntityPicker.lua
+share/ember/media/shared/scripting/lua/Environment.lua
+share/ember/media/shared/scripting/lua/Give.lua
+share/ember/media/shared/scripting/lua/HoverEntityOverlay.lua
+share/ember/media/shared/scripting/lua/IndirectRenderingChecker.lua
+share/ember/media/shared/scripting/lua/IngameMerchantWidget.lua
+share/ember/media/shared/scripting/lua/Inspect.lua
+share/ember/media/shared/scripting/lua/Inventory.lua
+share/ember/media/shared/scripting/lua/MainIconBar.lua
+share/ember/media/shared/scripting/lua/Math.lua
+share/ember/media/shared/scripting/lua/ModelEdit.lua
+share/ember/media/shared/scripting/lua/Mover.lua
+share/ember/media/shared/scripting/lua/Performance.lua
+share/ember/media/shared/scripting/lua/PickingInfo.lua
+share/ember/media/shared/scripting/lua/QuickHelp.lua
+share/ember/media/shared/scripting/lua/RuleManager.lua
+share/ember/media/shared/scripting/lua/ScriptEdit.lua
+share/ember/media/shared/scripting/lua/Server.lua
+share/ember/media/shared/scripting/lua/ServerBrowser.lua
+share/ember/media/shared/scripting/lua/ServerLogger.lua
+share/ember/media/shared/scripting/lua/Settings.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/shared/scripting/lua/representations/ActionBar.lua
+share/ember/media/shared/scripting/lua/representations/ActionBarCreator.lua
+share/ember/media/shared/scripting/lua/representations/ActionBarDefaultAction.lua
+share/ember/media/shared/scripting/lua/representations/Admin.lua
+share/ember/media/shared/scripting/lua/representations/AssetsManager.lua
+share/ember/media/shared/scripting/lua/representations/Bootstrap.lua
+share/ember/media/shared/scripting/lua/representations/Compass.lua
+share/ember/media/shared/scripting/lua/representations/Console.lua
+share/ember/media/shared/scripting/lua/representations/DefaultEntityActions.lua
+share/ember/media/shared/scripting/lua/representations/EntityBrowser.lua
+share/ember/media/shared/scripting/lua/representations/EntityCreator.lua
+share/ember/media/shared/scripting/lua/representations/EntityEditor.lua
+share/ember/media/shared/scripting/lua/representations/EntityPicker.lua
+share/ember/media/shared/scripting/lua/representations/Environment.lua
+share/ember/media/shared/scripting/lua/representations/Give.lua
+share/ember/media/shared/scripting/lua/representations/HoverEntityOverlay.lua
+share/ember/media/shared/scripting/lua/representations/IndirectRenderingChecker.lua
+share/ember/media/shared/scripting/lua/representations/IngameMerchantWidget.lua
+share/ember/media/shared/scripting/lua/representations/Inspect.lua
+share/ember/media/shared/scripting/lua/representations/Inventory.lua
+share/ember/media/shared/scripting/lua/representations/MainIconBar.lua
+share/ember/media/shared/scripting/lua/representations/Math.lua
+share/ember/media/shared/scripting/lua/representations/ModelEdit.lua
+share/ember/media/shared/scripting/lua/representations/Mover.lua
+share/ember/media/shared/scripting/lua/representations/Performance.lua
+share/ember/media/shared/scripting/lua/representations/PickingInfo.lua
+share/ember/media/shared/scripting/lua/representations/QuickHelp.lua
+share/ember/media/shared/scripting/lua/representations/RuleManager.lua
+share/ember/media/shared/scripting/lua/representations/ScriptEdit.lua
+share/ember/media/shared/scripting/lua/representations/Server.lua
+share/ember/media/shared/scripting/lua/representations/ServerBrowser.lua
+share/ember/media/shared/scripting/lua/representations/ServerLogger.lua
+share/ember/media/shared/scripting/lua/representations/Settings.lua
+share/ember/media/shared/scripting/lua/representations/Status.lua
+share/ember/media/shared/scripting/lua/representations/Tasks.lua
+share/ember/media/shared/scripting/lua/representations/TerrainEditor.lua
 @dirrm share/ember/media/shared/core
-@dirrm share/ember/media/shared/common/themes/ember/gui/cegui
 @dirrm share/ember/media/shared/common/themes/ember/gui/compass
-@dirrm share/ember/media/shared/common/themes/ember/gui/icons
 @dirrm share/ember/media/shared/common/themes/ember/gui/fonts
-@dirrm share/ember/media/shared/common/themes/ember/gui/status
 @dirrm share/ember/media/shared/common/themes/ember/gui
 @dirrm share/ember/media/shared/common/themes/ember
 @dirrm share/ember/media/shared/common/themes
@@ -2027,6 +2033,7 @@ share/ember/media/user/README
 @dirrm share/ember/media/shared/common/resources/ogre/caelum/core
 @dirrm share/ember/media/shared/common/resources/ogre/caelum
 @dirrm share/ember/media/shared/common/resources/ogre
+@dirrm share/ember/media/shared/common/resources/wcg_base
 @dirrm share/ember/media/shared/common/resources
 @dirrm share/ember/media/shared/common/3d_objects/creatures/goblin/animations
 @dirrm share/ember/media/shared/common/3d_objects/creatures/goblin/textures/green
@@ -2353,6 +2360,7 @@ share/ember/media/user/README
 @dirrm share/ember/media/shared/common/3d_objects/characters
 @dirrm share/ember/media/shared/common/3d_objects/primitives/models
 @dirrm share/ember/media/shared/common/3d_objects/primitives/textures/axes
+@dirrm share/ember/media/shared/common/3d_objects/primitives/textures/error
 @dirrm share/ember/media/shared/common/3d_objects/primitives/textures/placeholder
 @dirrm share/ember/media/shared/common/3d_objects/primitives/textures
 @dirrm share/ember/media/shared/common/3d_objects/primitives
@@ -2570,12 +2578,12 @@ share/ember/media/user/README
 @dirrm share/ember/media/shared/common/junkyard/models/bbhouse
 @dirrm share/ember/media/shared/common/junkyard/models/skeleton
 @dirrm share/ember/media/shared/common/junkyard/models
+@dirrm share/ember/media/shared/common/junkyard/sear/3d_objects/structures/textures/respa_column
+@dirrm share/ember/media/shared/common/junkyard/sear/3d_objects/structures/textures
+@dirrm share/ember/media/shared/common/junkyard/sear/3d_objects/structures
+@dirrm share/ember/media/shared/common/junkyard/sear/3d_objects
+@dirrm share/ember/media/shared/common/junkyard/sear
 @dirrm share/ember/media/shared/common/junkyard
-@dirrm share/ember/media/shared/common/art/characters/male/accessories/basic_burlap
-@dirrm share/ember/media/shared/common/art/characters/male/accessories
-@dirrm share/ember/media/shared/common/art/characters/male
-@dirrm share/ember/media/shared/common/art/characters
-@dirrm share/ember/media/shared/common/art
 @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/bluegill