6 files changed, 568 insertions, 156 deletions

diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile
index 576209db922e..651946a65ff0 100644
--- a/games/freeorion/Makefile
+++ b/games/freeorion/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	freeorion
-PORTVERSION=	0.3.1.20071206
-PORTREVISION=	3
+PORTVERSION=	0.3.12.3007
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.alepulver.com.ar/distfiles/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	oliver
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Open-source, platform independent galactic conquest game
 
 LIB_DEPENDS=	GiGi.0:${PORTSDIR}/x11-toolkits/gigi \
@@ -19,7 +19,10 @@ LIB_DEPENDS=	GiGi.0:${PORTSDIR}/x11-toolkits/gigi \
 		graph:${PORTSDIR}/graphics/graphviz \
 		log4cpp.4:${PORTSDIR}/devel/log4cpp \
 		vorbisfile.5:${PORTSDIR}/audio/libvorbis
+RUN_DEPENDS=	${LOCALBASE}/lib/libbulletmath.a:${PORTSDIR}/devel/bullet
+BUILD_DEPENDS=	${LOCALBASE}/lib/libbulletmath.a:${PORTSDIR}/devel/bullet
 
+USE_GCC=	4.3
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_SCONS=	yes
@@ -28,14 +31,16 @@ SCONS_BUILDENV=	PYTHON_LIB=${PYTHON_VERSION}
 USE_SDL=	sdl net
 WRKSRC=		${WRKDIR}/${PORTNAME}/FreeOrion
 
-BROKEN=		does not compile with new graphviz
-
 .if defined(WITH_DEBUG)
 SCONS_ARGS+=	debug=1
 .else
 SCONS_ARGS+=	release=yes
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|ND_coord_i|ND_coord|g' \
+		${WRKSRC}/UI/TechTreeWnd.cpp
+
 maint-gen-distfile:
 	@if [ -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
 		${ECHO_CMD} "ERROR: the distfile already exists."; \
diff --git a/games/freeorion/distinfo b/games/freeorion/distinfo
index a2fd64fcfdfd..fe7a8840ea43 100644
--- a/games/freeorion/distinfo
+++ b/games/freeorion/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeorion-0.3.1.20071206.tar.bz2) = 437e3ae627c35974f20eed469afe2000
-SHA256 (freeorion-0.3.1.20071206.tar.bz2) = ae81dfd940536831cf7aa7d3a7f13e3d32f49c547f76769ec4a053206701a73f
-SIZE (freeorion-0.3.1.20071206.tar.bz2) = 51208732
+MD5 (freeorion-0.3.12.3007.tar.bz2) = c84609330a840c5bfb12ea5d94150fd4
+SHA256 (freeorion-0.3.12.3007.tar.bz2) = dd34d218676c0f84de61db4f6ae27a8587418beb0667bc5e959a312579e7baa0
+SIZE (freeorion-0.3.12.3007.tar.bz2) = 131989761
diff --git a/games/freeorion/files/patch-SConstruct b/games/freeorion/files/patch-SConstruct
index 73077b0e0d7e..2635afaaa950 100644
--- a/games/freeorion/files/patch-SConstruct
+++ b/games/freeorion/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- ./SConstruct.orig	Sat Jul 21 15:53:06 2007
-+++ ./SConstruct	Wed Aug  1 08:00:59 2007
-@@ -188,6 +188,15 @@
+--- SConstruct.orig	2009-03-16 18:14:04.000000000 +0100
++++ SConstruct	2009-03-16 20:03:14.000000000 +0100
+@@ -197,6 +197,15 @@
          else:
              print 'Configuring unknown system (assuming the system is POSIX-like) ...'
  
@@ -16,7 +16,7 @@
          # Python
          import distutils.sysconfig
          if str(Platform()) == 'win32':
-@@ -207,6 +216,8 @@
+@@ -216,6 +225,8 @@
              matches = regex.findall(distutils.sysconfig.get_config_var('LDLIBRARY'))
              if len(matches):
                  python_libname = matches[0]
@@ -25,19 +25,19 @@
              else:
                  print 'Unable to determine the name of the Python runtime library.  Terminating....'
                  Exit(1)
-@@ -253,15 +264,6 @@
-                 env.AppendUnique(LIBS = [
+@@ -265,15 +276,6 @@
                      BoostLibWin32Name('python', env)
                      ])
--
+ 
 -            # pthreads
 -            if str(Platform()) == 'posix':
 -                if env['multithreaded']:
 -                    if conf.CheckCHeader('pthread.h') and conf.CheckLib('pthread', 'pthread_create', autoadd = 0):
--                        env.AppendUnique(CCFLAGS = ' -pthread')
--                        env.AppendUnique(LINKFLAGS = ' -pthread')
+-                        env.AppendUnique(CCFLAGS = '-pthread')
+-                        env.AppendUnique(LINKFLAGS = '-pthread')
 -                    else:
 -                        Exit(1)
- 
+-
              # GL and GLU
              if str(Platform()) == 'win32':
+                 env.AppendUnique(LIBS = [
diff --git a/games/freeorion/files/patch-python-PythonEnumWrapper.cpp b/games/freeorion/files/patch-python-PythonEnumWrapper.cpp
new file mode 100644
index 000000000000..7b48ec0cb26e
--- /dev/null
+++ b/games/freeorion/files/patch-python-PythonEnumWrapper.cpp
@@ -0,0 +1,7 @@
+--- python/PythonEnumWrapper.cpp.orig	2009-04-09 08:40:02.000000000 +0200
++++ python/PythonEnumWrapper.cpp	2009-04-09 08:40:06.000000000 +0200
+@@ -1,3 +1,4 @@
++#include <ostream>
+ #include "../universe/Enums.h"
+ 
+ #include <boost/python.hpp>
diff --git a/games/freeorion/files/patch-util-Serialize.c b/games/freeorion/files/patch-util-Serialize.c
new file mode 100644
index 000000000000..d3e80162d9a2
--- /dev/null
+++ b/games/freeorion/files/patch-util-Serialize.c
@@ -0,0 +1,11 @@
+--- util/Serialize.cpp.orig	2009-04-13 08:56:38.000000000 +0200
++++ util/Serialize.cpp	2009-04-13 08:56:56.000000000 +0200
+@@ -65,7 +65,7 @@
+ // some endianness and size checks to ensure portability of binary save files; of one or more of these fails, it means
+ // that FreeOrion is not supported on your platform/compiler pair, and must be modified to provide data of the
+ // appropriate size(s).
+-#ifndef BOOST_LITTLE_ENDIAN
++#if (_BYTE_ORDER != _LITTLE_ENDIAN)
+ #  error "Incompatible endianness for binary serialization."
+ #endif
+ BOOST_STATIC_ASSERT(sizeof(char) == 1);
diff --git a/games/freeorion/pkg-plist b/games/freeorion/pkg-plist
index c572894fc9ef..cd13f2a062f8 100644
--- a/games/freeorion/pkg-plist
+++ b/games/freeorion/pkg-plist
@@ -1,16 +1,217 @@
 bin/freeorion
 bin/freeorionca
 bin/freeoriond
-%%DATADIR%%/DejaVuSans-Bold.ttf
-%%DATADIR%%/DejaVuSans-BoldOblique.ttf
-%%DATADIR%%/DejaVuSans-Oblique.ttf
-%%DATADIR%%/DejaVuSans.ttf
+%%DATADIR%%/default/AI/AIFleetMission.py
+%%DATADIR%%/default/AI/AIFleetOrder.py
+%%DATADIR%%/default/AI/AITarget.py
+%%DATADIR%%/default/AI/AIstate.py
+%%DATADIR%%/default/AI/ColonisationAI.py
+%%DATADIR%%/default/AI/EnumsAI.py
+%%DATADIR%%/default/AI/ExplorationAI.py
+%%DATADIR%%/default/AI/FleetUtilsAI.py
 %%DATADIR%%/default/AI/FreeOrionAI.py
+%%DATADIR%%/default/AI/MoveUtilsAI.py
+%%DATADIR%%/default/AI/PriorityAI.py
 %%DATADIR%%/default/COPYING
+%%DATADIR%%/default/DejaVuSans-Bold.ttf
+%%DATADIR%%/default/DejaVuSans-BoldOblique.ttf
+%%DATADIR%%/default/DejaVuSans-Oblique.ttf
+%%DATADIR%%/default/DejaVuSans.ttf
+%%DATADIR%%/default/LICENSE.DejaVu
 %%DATADIR%%/default/buildings.txt
 %%DATADIR%%/default/credits.xml
 %%DATADIR%%/default/data/art/arrows.png
-%%DATADIR%%/default/data/art/building_icons/Generic_Building.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blackhole01back.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blackhole01big_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blackhole01core.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blackhole01horizontal_flare.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blackhole01rainbow.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blackhole01rays.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blackhole01small_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blue01back.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blue01big_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blue01core.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blue01horizontal_flare.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blue01rainbow.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blue01rays.png
+%%DATADIR%%/default/data/art/combat/backgrounds/blue01small_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/neutron01back.png
+%%DATADIR%%/default/data/art/combat/backgrounds/neutron01big_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/neutron01core.png
+%%DATADIR%%/default/data/art/combat/backgrounds/neutron01horizontal_flare.png
+%%DATADIR%%/default/data/art/combat/backgrounds/neutron01rainbow.png
+%%DATADIR%%/default/data/art/combat/backgrounds/neutron01rays.png
+%%DATADIR%%/default/data/art/combat/backgrounds/neutron01small_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/orange01back.png
+%%DATADIR%%/default/data/art/combat/backgrounds/orange01big_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/orange01core.png
+%%DATADIR%%/default/data/art/combat/backgrounds/orange01horizontal_flare.png
+%%DATADIR%%/default/data/art/combat/backgrounds/orange01rainbow.png
+%%DATADIR%%/default/data/art/combat/backgrounds/orange01rays.png
+%%DATADIR%%/default/data/art/combat/backgrounds/orange01small_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/red01back.png
+%%DATADIR%%/default/data/art/combat/backgrounds/red01big_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/red01core.png
+%%DATADIR%%/default/data/art/combat/backgrounds/red01horizontal_flare.png
+%%DATADIR%%/default/data/art/combat/backgrounds/red01rainbow.png
+%%DATADIR%%/default/data/art/combat/backgrounds/red01rays.png
+%%DATADIR%%/default/data/art/combat/backgrounds/red01small_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/sky_box_1.material
+%%DATADIR%%/default/data/art/combat/backgrounds/sky_box_1_bk.png
+%%DATADIR%%/default/data/art/combat/backgrounds/sky_box_1_dn.png
+%%DATADIR%%/default/data/art/combat/backgrounds/sky_box_1_fr.png
+%%DATADIR%%/default/data/art/combat/backgrounds/sky_box_1_lf.png
+%%DATADIR%%/default/data/art/combat/backgrounds/sky_box_1_rt.png
+%%DATADIR%%/default/data/art/combat/backgrounds/sky_box_1_up.png
+%%DATADIR%%/default/data/art/combat/backgrounds/star.material
+%%DATADIR%%/default/data/art/combat/backgrounds/white01back.png
+%%DATADIR%%/default/data/art/combat/backgrounds/white01big_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/white01core.png
+%%DATADIR%%/default/data/art/combat/backgrounds/white01horizontal_flare.png
+%%DATADIR%%/default/data/art/combat/backgrounds/white01rainbow.png
+%%DATADIR%%/default/data/art/combat/backgrounds/white01rays.png
+%%DATADIR%%/default/data/art/combat/backgrounds/white01small_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/yellow01back.png
+%%DATADIR%%/default/data/art/combat/backgrounds/yellow01big_spark.png
+%%DATADIR%%/default/data/art/combat/backgrounds/yellow01core.png
+%%DATADIR%%/default/data/art/combat/backgrounds/yellow01horizontal_flare.png
+%%DATADIR%%/default/data/art/combat/backgrounds/yellow01rainbow.png
+%%DATADIR%%/default/data/art/combat/backgrounds/yellow01rays.png
+%%DATADIR%%/default/data/art/combat/backgrounds/yellow01small_spark.png
+%%DATADIR%%/default/data/art/combat/effects/combine_passes.frag
+%%DATADIR%%/default/data/art/combat/effects/combine_scene_and_glow.frag
+%%DATADIR%%/default/data/art/combat/effects/final_copy.frag
+%%DATADIR%%/default/data/art/combat/effects/fullscreen_quad.vert
+%%DATADIR%%/default/data/art/combat/effects/glow.compositor
+%%DATADIR%%/default/data/art/combat/effects/glow.material
+%%DATADIR%%/default/data/art/combat/effects/horizontal_pass_1.frag
+%%DATADIR%%/default/data/art/combat/effects/horizontal_pass_4.frag
+%%DATADIR%%/default/data/art/combat/effects/selection_hiliting.frag
+%%DATADIR%%/default/data/art/combat/effects/selection_hiliting.material
+%%DATADIR%%/default/data/art/combat/effects/selection_hiliting.vert
+%%DATADIR%%/default/data/art/combat/effects/vertical_pass_1.frag
+%%DATADIR%%/default/data/art/combat/effects/vertical_pass_4.frag
+%%DATADIR%%/default/data/art/combat/meshes/durgha.material
+%%DATADIR%%/default/data/art/combat/meshes/durgha.mesh
+%%DATADIR%%/default/data/art/combat/meshes/durgha_c.png
+%%DATADIR%%/default/data/art/combat/meshes/durgha_i.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Asteroid01.mesh
+%%DATADIR%%/default/data/art/combat/meshes/planets/Asteroid01Color.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Asteroid01Normal.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Asteroid02.mesh
+%%DATADIR%%/default/data/art/combat/meshes/planets/Asteroid02Color.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Asteroid02Normal.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Asteroid03.mesh
+%%DATADIR%%/default/data/art/combat/meshes/planets/Asteroid03Color.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Asteroid03Normal.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Barren01Day.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Barren01LightsA.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Barren01LightsB.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Barren01Night.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Barren01Normal.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Desert01CloudGloss.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Desert01Day.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Desert01Night.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/GasGiant01.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Inferno01CloudGloss.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Inferno01Day.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Inferno01Night.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Ocean01CloudGloss.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Ocean01Day.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Ocean01Night.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Radiated01Day.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Radiated01LightsA.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Radiated01LightsB.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Radiated01Night.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Radiated01Normal.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Swamp01CloudGloss.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Swamp01Day.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Swamp01Night.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Terran01CloudGloss.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Terran01Day.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Terran01Night.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Toxic01CloudGloss.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Toxic01Day.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Toxic01Night.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Tundra01CloudGloss.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Tundra01Day.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/Tundra01Night.png
+%%DATADIR%%/default/data/art/combat/meshes/planets/asteroid.frag
+%%DATADIR%%/default/data/art/combat/meshes/planets/asteroid.vert
+%%DATADIR%%/default/data/art/combat/meshes/planets/atmosphereless_planet.frag
+%%DATADIR%%/default/data/art/combat/meshes/planets/atmosphereless_planet.vert
+%%DATADIR%%/default/data/art/combat/meshes/planets/gas_giant.frag
+%%DATADIR%%/default/data/art/combat/meshes/planets/gas_giant.vert
+%%DATADIR%%/default/data/art/combat/meshes/planets/planet.frag
+%%DATADIR%%/default/data/art/combat/meshes/planets/planet.material
+%%DATADIR%%/default/data/art/combat/meshes/planets/planet.vert
+%%DATADIR%%/default/data/art/combat/meshes/planets/planet_atmosphere.frag
+%%DATADIR%%/default/data/art/combat/meshes/planets/planet_atmosphere.vert
+%%DATADIR%%/default/data/art/combat/meshes/seed.mesh
+%%DATADIR%%/default/data/art/combat/meshes/seed_Color.png
+%%DATADIR%%/default/data/art/combat/meshes/seed_Glow.png
+%%DATADIR%%/default/data/art/combat/meshes/seed_Normal.png
+%%DATADIR%%/default/data/art/combat/meshes/seed_Specular.png
+%%DATADIR%%/default/data/art/combat/meshes/ship.frag
+%%DATADIR%%/default/data/art/combat/meshes/ship.material
+%%DATADIR%%/default/data/art/combat/meshes/ship.vert
+%%DATADIR%%/default/data/art/combat/meshes/sphere.mesh
+%%DATADIR%%/default/data/art/combat/meshes/starlane_entry.mesh
+%%DATADIR%%/default/data/art/combat/meshes/starlane_entry.png
+%%DATADIR%%/default/data/art/combat/resources.cfg
+%%DATADIR%%/default/data/art/cursors/default_cursor.png
+%%DATADIR%%/default/data/art/cursors/grabable.png
+%%DATADIR%%/default/data/art/cursors/grabbing.png
+%%DATADIR%%/default/data/art/cursors/horizontal-resize.png
+%%DATADIR%%/default/data/art/cursors/wait.png
+%%DATADIR%%/default/data/art/galaxy_decoration/blue_set/gaseous01.png
+%%DATADIR%%/default/data/art/galaxy_decoration/blue_set/gaseous02.png
+%%DATADIR%%/default/data/art/galaxy_decoration/blue_set/gaseous03.png
+%%DATADIR%%/default/data/art/galaxy_decoration/blue_set/gaseous04.png
+%%DATADIR%%/default/data/art/galaxy_decoration/gaseous01.png
+%%DATADIR%%/default/data/art/galaxy_decoration/gaseous02.png
+%%DATADIR%%/default/data/art/galaxy_decoration/gaseous03.png
+%%DATADIR%%/default/data/art/galaxy_decoration/gaseous04.png
+%%DATADIR%%/default/data/art/galaxy_decoration/gaseous05.png
+%%DATADIR%%/default/data/art/galaxy_decoration/gaseous10.png
+%%DATADIR%%/default/data/art/galaxy_decoration/gaseous13.png
+%%DATADIR%%/default/data/art/galaxy_decoration/gaseous14.png
+%%DATADIR%%/default/data/art/galaxy_decoration/gaseous15.png
+%%DATADIR%%/default/data/art/galaxy_decoration/gaseous16.png
+%%DATADIR%%/default/data/art/galaxy_decoration/grey_set/gaseous01.png
+%%DATADIR%%/default/data/art/galaxy_decoration/grey_set/gaseous02.png
+%%DATADIR%%/default/data/art/galaxy_decoration/grey_set/gaseous03.png
+%%DATADIR%%/default/data/art/galaxy_decoration/grey_set/gaseous04.png
+%%DATADIR%%/default/data/art/galaxy_decoration/haze_set/gaseous01.png
+%%DATADIR%%/default/data/art/galaxy_decoration/haze_set/gaseous03.png
+%%DATADIR%%/default/data/art/galaxy_decoration/haze_set/gaseous04.png
+%%DATADIR%%/default/data/art/galaxy_decoration/haze_set/gaseous09.png
+%%DATADIR%%/default/data/art/galaxy_decoration/haze_set/gaseous10.png
+%%DATADIR%%/default/data/art/galaxy_decoration/haze_set/gaseous12.png
+%%DATADIR%%/default/data/art/galaxy_decoration/haze_set/gaseous13.png
+%%DATADIR%%/default/data/art/galaxy_decoration/haze_set/gaseous16.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous01.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous02.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous03.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous04.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous05.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous06.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous07.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous08.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous09.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous10.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous11.png
+%%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set/gaseous12.png
+%%DATADIR%%/default/data/art/galaxy_decoration/red_set/gaseous01.png
+%%DATADIR%%/default/data/art/galaxy_decoration/red_set/gaseous02.png
+%%DATADIR%%/default/data/art/galaxy_decoration/red_set/gaseous03.png
+%%DATADIR%%/default/data/art/galaxy_decoration/red_set/gaseous04.png
+%%DATADIR%%/default/data/art/galaxy_decoration/rust_set/gaseous01.png
+%%DATADIR%%/default/data/art/galaxy_decoration/rust_set/gaseous02.png
+%%DATADIR%%/default/data/art/galaxy_decoration/rust_set/gaseous07.png
+%%DATADIR%%/default/data/art/galaxy_decoration/rust_set/gaseous08.png
+%%DATADIR%%/default/data/art/galaxy_decoration/rust_set/gaseous09.png
+%%DATADIR%%/default/data/art/galaxy_decoration/rust_set/gaseous10.png
 %%DATADIR%%/default/data/art/gp_cluster.png
 %%DATADIR%%/default/data/art/gp_elliptical.png
 %%DATADIR%%/default/data/art/gp_irregular.png
@@ -18,6 +219,7 @@ bin/freeoriond
 %%DATADIR%%/default/data/art/gp_spiral2.png
 %%DATADIR%%/default/data/art/gp_spiral3.png
 %%DATADIR%%/default/data/art/gp_spiral4.png
+%%DATADIR%%/default/data/art/hulls_design/generic_hull.png
 %%DATADIR%%/default/data/art/icons/2shipfleet.png
 %%DATADIR%%/default/data/art/icons/3shipfleet.png
 %%DATADIR%%/default/data/art/icons/4shipfleet.png
@@ -29,36 +231,135 @@ bin/freeoriond
 %%DATADIR%%/default/data/art/icons/Mark_III.png
 %%DATADIR%%/default/data/art/icons/Mark_IV.png
 %%DATADIR%%/default/data/art/icons/Scout.png
-%%DATADIR%%/default/data/art/icons/balanced.png
+%%DATADIR%%/default/data/art/icons/building/autofactory_control_centre.png
+%%DATADIR%%/default/data/art/icons/building/autolab_control_centre.png
+%%DATADIR%%/default/data/art/icons/building/bioterror_lab.png
+%%DATADIR%%/default/data/art/icons/building/bioterror_projector.png
+%%DATADIR%%/default/data/art/icons/building/economic_sinkhole.png
+%%DATADIR%%/default/data/art/icons/building/generic_building.png
+%%DATADIR%%/default/data/art/icons/building/heavy_mining_processor.png
+%%DATADIR%%/default/data/art/icons/building/megalith.png
+%%DATADIR%%/default/data/art/icons/building/miniature_sun.png
+%%DATADIR%%/default/data/art/icons/building/monument_to_exodus.png
+%%DATADIR%%/default/data/art/icons/building/the_caducean_institute.png
 %%DATADIR%%/default/data/art/icons/colonymarker.png
 %%DATADIR%%/default/data/art/icons/combatstrength.png
-%%DATADIR%%/default/data/art/icons/construction.png
 %%DATADIR%%/default/data/art/icons/damagemarker.png
 %%DATADIR%%/default/data/art/icons/defensebase.png
 %%DATADIR%%/default/data/art/icons/downarrowclicked.png
 %%DATADIR%%/default/data/art/icons/downarrowmouseover.png
 %%DATADIR%%/default/data/art/icons/downarrownormal.png
-%%DATADIR%%/default/data/art/icons/farming.png
 %%DATADIR%%/default/data/art/icons/farming_mono.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/5_star.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/9_star.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/bend.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/blam.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/bolt.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/detection.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/double_round.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/eye.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/fess.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/flag1.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/flag2.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/gear.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/ginkgo.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/leaf.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/mask.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/pile.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/rotator.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/saltire.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/skull.png
+%%DATADIR%%/default/data/art/icons/flags/emblem/tree.png
+%%DATADIR%%/default/data/art/icons/flags/field/curved_square.png
+%%DATADIR%%/default/data/art/icons/flags/field/round.png
+%%DATADIR%%/default/data/art/icons/flags/field/scalloped.png
+%%DATADIR%%/default/data/art/icons/flags/field/shield.png
+%%DATADIR%%/default/data/art/icons/flags/field/square.png
+%%DATADIR%%/default/data/art/icons/fleet/big-head-colony.png
+%%DATADIR%%/default/data/art/icons/fleet/big-head-monster.png
+%%DATADIR%%/default/data/art/icons/fleet/big-head-scout.png
+%%DATADIR%%/default/data/art/icons/fleet/big-head-warship.png
+%%DATADIR%%/default/data/art/icons/fleet/big-tail-0.png
+%%DATADIR%%/default/data/art/icons/fleet/big-tail-1.png
+%%DATADIR%%/default/data/art/icons/fleet/big-tail-2.png
+%%DATADIR%%/default/data/art/icons/fleet/big-tail-3.png
+%%DATADIR%%/default/data/art/icons/fleet/big-tail-4.png
+%%DATADIR%%/default/data/art/icons/fleet/big-tail-5.png
+%%DATADIR%%/default/data/art/icons/fleet/big-tail-6.png
+%%DATADIR%%/default/data/art/icons/fleet/big-tail-7.png
+%%DATADIR%%/default/data/art/icons/fleet/fleet_selection.png
+%%DATADIR%%/default/data/art/icons/fleet/med-head-colony.png
+%%DATADIR%%/default/data/art/icons/fleet/med-head-monster.png
+%%DATADIR%%/default/data/art/icons/fleet/med-head-scout.png
+%%DATADIR%%/default/data/art/icons/fleet/med-head-warship.png
+%%DATADIR%%/default/data/art/icons/fleet/med-tail-0.png
+%%DATADIR%%/default/data/art/icons/fleet/med-tail-1.png
+%%DATADIR%%/default/data/art/icons/fleet/med-tail-2.png
+%%DATADIR%%/default/data/art/icons/fleet/med-tail-3.png
+%%DATADIR%%/default/data/art/icons/fleet/med-tail-4.png
+%%DATADIR%%/default/data/art/icons/fleet/med-tail-5.png
+%%DATADIR%%/default/data/art/icons/fleet/med-tail-6.png
+%%DATADIR%%/default/data/art/icons/fleet/med-tail-7.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-head-colony.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-head-monster.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-head-scout.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-head-warship.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-tail-0.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-tail-1.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-tail-2.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-tail-3.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-tail-4.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-tail-5.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-tail-6.png
+%%DATADIR%%/default/data/art/icons/fleet/sml-tail-7.png
+%%DATADIR%%/default/data/art/icons/fleet/tiny-fleet-multi.png
+%%DATADIR%%/default/data/art/icons/fleet/tiny-fleet.png
 %%DATADIR%%/default/data/art/icons/focusbuttoncrossicon.png
 %%DATADIR%%/default/data/art/icons/fullscreenbutton.png
-%%DATADIR%%/default/data/art/icons/health.png
-%%DATADIR%%/default/data/art/icons/industry.png
 %%DATADIR%%/default/data/art/icons/industry_mono.png
 %%DATADIR%%/default/data/art/icons/leftarrowclicked.png
 %%DATADIR%%/default/data/art/icons/leftarrowmouseover.png
 %%DATADIR%%/default/data/art/icons/leftarrownormal.png
-%%DATADIR%%/default/data/art/icons/mining.png
+%%DATADIR%%/default/data/art/icons/meter/ammo.png
+%%DATADIR%%/default/data/art/icons/meter/balanced.png
+%%DATADIR%%/default/data/art/icons/meter/construction.png
+%%DATADIR%%/default/data/art/icons/meter/defense.png
+%%DATADIR%%/default/data/art/icons/meter/detection.png
+%%DATADIR%%/default/data/art/icons/meter/farming.png
+%%DATADIR%%/default/data/art/icons/meter/fuel.png
+%%DATADIR%%/default/data/art/icons/meter/health.png
+%%DATADIR%%/default/data/art/icons/meter/industry.png
+%%DATADIR%%/default/data/art/icons/meter/mining.png
+%%DATADIR%%/default/data/art/icons/meter/pop.png
+%%DATADIR%%/default/data/art/icons/meter/research.png
+%%DATADIR%%/default/data/art/icons/meter/shield.png
+%%DATADIR%%/default/data/art/icons/meter/stealth.png
+%%DATADIR%%/default/data/art/icons/meter/supply.png
+%%DATADIR%%/default/data/art/icons/meter/trade.png
+%%DATADIR%%/default/data/art/icons/meter/troops.png
 %%DATADIR%%/default/data/art/icons/mining_mono.png
 %%DATADIR%%/default/data/art/icons/newfleet.png
-%%DATADIR%%/default/data/art/icons/pop.png
-%%DATADIR%%/default/data/art/icons/research.png
 %%DATADIR%%/default/data/art/icons/research_mono.png
 %%DATADIR%%/default/data/art/icons/rightarrowclicked.png
 %%DATADIR%%/default/data/art/icons/rightarrowmouseover.png
 %%DATADIR%%/default/data/art/icons/rightarrownormal.png
+%%DATADIR%%/default/data/art/icons/ship_parts/active_radar.png
+%%DATADIR%%/default/data/art/icons/ship_parts/antimatter_tank.png
+%%DATADIR%%/default/data/art/icons/ship_parts/colony_pod.png
+%%DATADIR%%/default/data/art/icons/ship_parts/cryonic_colony_pod.png
+%%DATADIR%%/default/data/art/icons/ship_parts/defense_grid.png
+%%DATADIR%%/default/data/art/icons/ship_parts/deflector_shield.png
+%%DATADIR%%/default/data/art/icons/ship_parts/deuterium_tank.png
+%%DATADIR%%/default/data/art/icons/ship_parts/electromagnetic_damper.png
+%%DATADIR%%/default/data/art/icons/ship_parts/generic_part.png
+%%DATADIR%%/default/data/art/icons/ship_parts/ion_cannon.png
+%%DATADIR%%/default/data/art/icons/ship_parts/laser.png
+%%DATADIR%%/default/data/art/icons/ship_parts/lead_armor_plating.png
+%%DATADIR%%/default/data/art/icons/ship_parts/mass_driver.png
+%%DATADIR%%/default/data/art/icons/ship_parts/nuclear_missile.png
 %%DATADIR%%/default/data/art/icons/specials_huge/ancient_ruins.png
 %%DATADIR%%/default/data/art/icons/specials_huge/eccentric_orbit.png
+%%DATADIR%%/default/data/art/icons/specials_huge/gaia.png
 %%DATADIR%%/default/data/art/icons/specials_huge/high_axial_tilt.png
 %%DATADIR%%/default/data/art/icons/specials_huge/homeworld.png
 %%DATADIR%%/default/data/art/icons/specials_huge/minerals.png
@@ -70,6 +371,7 @@ bin/freeoriond
 %%DATADIR%%/default/data/art/icons/specials_huge/tunnels.png
 %%DATADIR%%/default/data/art/icons/specials_large/ancient_ruins.png
 %%DATADIR%%/default/data/art/icons/specials_large/eccentric_orbit.png
+%%DATADIR%%/default/data/art/icons/specials_large/gaia.png
 %%DATADIR%%/default/data/art/icons/specials_large/high_axial_tilt.png
 %%DATADIR%%/default/data/art/icons/specials_large/homeworld.png
 %%DATADIR%%/default/data/art/icons/specials_large/minerals.png
@@ -81,6 +383,8 @@ bin/freeoriond
 %%DATADIR%%/default/data/art/icons/specials_large/tunnels.png
 %%DATADIR%%/default/data/art/icons/specials_tiny/ancient_ruins.png
 %%DATADIR%%/default/data/art/icons/specials_tiny/eccentric_orbit.png
+%%DATADIR%%/default/data/art/icons/specials_tiny/gaia.png
+%%DATADIR%%/default/data/art/icons/specials_tiny/generic_special.png
 %%DATADIR%%/default/data/art/icons/specials_tiny/high_axial_tilt.png
 %%DATADIR%%/default/data/art/icons/specials_tiny/homeworld.png
 %%DATADIR%%/default/data/art/icons/specials_tiny/minerals.png
@@ -96,31 +400,124 @@ bin/freeoriond
 %%DATADIR%%/default/data/art/icons/tech/artificial_black_hole.png
 %%DATADIR%%/default/data/art/icons/tech/artificial_heavenly_bodies.png
 %%DATADIR%%/default/data/art/icons/tech/artificial_minds.png
+%%DATADIR%%/default/data/art/icons/tech/asteroid_mining.png
+%%DATADIR%%/default/data/art/icons/tech/asteroid_mining_i.png
+%%DATADIR%%/default/data/art/icons/tech/asteroid_mining_ii.png
 %%DATADIR%%/default/data/art/icons/tech/asymptotic_materials.png
+%%DATADIR%%/default/data/art/icons/tech/automatic_theorem_prover.png
+%%DATADIR%%/default/data/art/icons/tech/basic_autofactories.png
+%%DATADIR%%/default/data/art/icons/tech/basic_autolabs.png
+%%DATADIR%%/default/data/art/icons/tech/bioterror_facilities.png
+%%DATADIR%%/default/data/art/icons/tech/categories/construction.png
+%%DATADIR%%/default/data/art/icons/tech/categories/economics.png
+%%DATADIR%%/default/data/art/icons/tech/categories/growth.png
+%%DATADIR%%/default/data/art/icons/tech/categories/learning.png
+%%DATADIR%%/default/data/art/icons/tech/categories/production.png
+%%DATADIR%%/default/data/art/icons/tech/categories/ships.png
+%%DATADIR%%/default/data/art/icons/tech/collective_thought_network.png
+%%DATADIR%%/default/data/art/icons/tech/commercial_uniion_of_the_colonies.png
+%%DATADIR%%/default/data/art/icons/tech/controlled_gravity_architecture.png
+%%DATADIR%%/default/data/art/icons/tech/controlled_gravity_wells.png
 %%DATADIR%%/default/data/art/icons/tech/deep_core_mining.png
+%%DATADIR%%/default/data/art/icons/tech/economic_etherealization.png
+%%DATADIR%%/default/data/art/icons/tech/economic_fluidity.png
+%%DATADIR%%/default/data/art/icons/tech/economic_hegemony.png
+%%DATADIR%%/default/data/art/icons/tech/economic_prescience.png
+%%DATADIR%%/default/data/art/icons/tech/economic_sinkholes.png
+%%DATADIR%%/default/data/art/icons/tech/economic_spectroscopy.png
+%%DATADIR%%/default/data/art/icons/tech/enclave_of_the_void.png
+%%DATADIR%%/default/data/art/icons/tech/enviromental_adaptation.png
+%%DATADIR%%/default/data/art/icons/tech/environmental_encapsulation.png
+%%DATADIR%%/default/data/art/icons/tech/environmentally_conscious_mining.png
+%%DATADIR%%/default/data/art/icons/tech/exobots.png
+%%DATADIR%%/default/data/art/icons/tech/externality_integration.png
+%%DATADIR%%/default/data/art/icons/tech/force-field_assembly.png
+%%DATADIR%%/default/data/art/icons/tech/force-field_harmonics.png
+%%DATADIR%%/default/data/art/icons/tech/force_energy_structures.png
 %%DATADIR%%/default/data/art/icons/tech/fusion_generation.png
+%%DATADIR%%/default/data/art/icons/tech/fusion_plants.png
+%%DATADIR%%/default/data/art/icons/tech/galactic_exploration.png
+%%DATADIR%%/default/data/art/icons/tech/galactic_monetary_policy.png
+%%DATADIR%%/default/data/art/icons/tech/genetic_engineering.png
+%%DATADIR%%/default/data/art/icons/tech/genetic_medicine.png
 %%DATADIR%%/default/data/art/icons/tech/genome_bank.png
 %%DATADIR%%/default/data/art/icons/tech/gravitonics.png
+%%DATADIR%%/default/data/art/icons/tech/habitation_domes.png
+%%DATADIR%%/default/data/art/icons/tech/heavy_mining_processors.png
+%%DATADIR%%/default/data/art/icons/tech/hyperspatial_dam.png
+%%DATADIR%%/default/data/art/icons/tech/industrial_centre_i.png
+%%DATADIR%%/default/data/art/icons/tech/industrial_centre_ii.png
+%%DATADIR%%/default/data/art/icons/tech/industrial_centre_iii.png
+%%DATADIR%%/default/data/art/icons/tech/industrial_cloning.png
+%%DATADIR%%/default/data/art/icons/tech/industrial_farming.png
 %%DATADIR%%/default/data/art/icons/tech/infrastructure_ecology.png
+%%DATADIR%%/default/data/art/icons/tech/interstellar_co-production.png
+%%DATADIR%%/default/data/art/icons/tech/interstellar_lighthouse.png
+%%DATADIR%%/default/data/art/icons/tech/interstellar_trade.png
 %%DATADIR%%/default/data/art/icons/tech/lifecycle_manipulation.png
+%%DATADIR%%/default/data/art/icons/tech/living_planet.png
+%%DATADIR%%/default/data/art/icons/tech/looking_glass.png
+%%DATADIR%%/default/data/art/icons/tech/market_economics.png
+%%DATADIR%%/default/data/art/icons/tech/matter-energy_conversion.png
+%%DATADIR%%/default/data/art/icons/tech/matter-energy_replication.png
 %%DATADIR%%/default/data/art/icons/tech/medical_pathology.png
+%%DATADIR%%/default/data/art/icons/tech/megalith_construction.png
 %%DATADIR%%/default/data/art/icons/tech/metroplex_infrastructure.png
+%%DATADIR%%/default/data/art/icons/tech/microgravity_manufacturing.png
 %%DATADIR%%/default/data/art/icons/tech/mind_of_the_void.png
 %%DATADIR%%/default/data/art/icons/tech/miniature_suns.png
+%%DATADIR%%/default/data/art/icons/tech/mining_engineering.png
 %%DATADIR%%/default/data/art/icons/tech/monument_to_exodus.png
+%%DATADIR%%/default/data/art/icons/tech/n-dimensional_assembly.png
+%%DATADIR%%/default/data/art/icons/tech/n-dimensional_structures.png
+%%DATADIR%%/default/data/art/icons/tech/n-dimensional_subspace.png
+%%DATADIR%%/default/data/art/icons/tech/nanotech_cybernetics.png
+%%DATADIR%%/default/data/art/icons/tech/nanotech_medicine.png
+%%DATADIR%%/default/data/art/icons/tech/nanotech_production.png
+%%DATADIR%%/default/data/art/icons/tech/orbital_construction.png
+%%DATADIR%%/default/data/art/icons/tech/orbital_factories.png
+%%DATADIR%%/default/data/art/icons/tech/orbital_farming.png
+%%DATADIR%%/default/data/art/icons/tech/orbital_gardens.png
+%%DATADIR%%/default/data/art/icons/tech/orbital_generation.png
+%%DATADIR%%/default/data/art/icons/tech/orbital_mining.png
+%%DATADIR%%/default/data/art/icons/tech/organic_structures.png
+%%DATADIR%%/default/data/art/icons/tech/paradise_planet.png
+%%DATADIR%%/default/data/art/icons/tech/planetary_colonialism.png
+%%DATADIR%%/default/data/art/icons/tech/planetary_ecology.png
+%%DATADIR%%/default/data/art/icons/tech/planetary_geology.png
+%%DATADIR%%/default/data/art/icons/tech/planetary_ring.png
+%%DATADIR%%/default/data/art/icons/tech/planned_economics.png
+%%DATADIR%%/default/data/art/icons/tech/psicorp.png
 %%DATADIR%%/default/data/art/icons/tech/psionics.png
 %%DATADIR%%/default/data/art/icons/tech/pure-energy_metabolism.png
 %%DATADIR%%/default/data/art/icons/tech/robotic_production.png
+%%DATADIR%%/default/data/art/icons/tech/self-gravitating_structures.png
+%%DATADIR%%/default/data/art/icons/tech/self-rotating_crops.png
 %%DATADIR%%/default/data/art/icons/tech/sentient_autofactories.png
+%%DATADIR%%/default/data/art/icons/tech/singularity_generation.png
+%%DATADIR%%/default/data/art/icons/tech/singularity_of_transcendence.png
+%%DATADIR%%/default/data/art/icons/tech/space_elevator.png
+%%DATADIR%%/default/data/art/icons/tech/stellar_navigation.png
 %%DATADIR%%/default/data/art/icons/tech/stellar_tomography.png
+%%DATADIR%%/default/data/art/icons/tech/structural_integrity_fields.png
+%%DATADIR%%/default/data/art/icons/tech/subterranean_construction.png
 %%DATADIR%%/default/data/art/icons/tech/symbiosis_biology.png
 %%DATADIR%%/default/data/art/icons/tech/temporal_mechanics.png
+%%DATADIR%%/default/data/art/icons/tech/terraform.png
+%%DATADIR%%/default/data/art/icons/tech/terraform_rapid.png
+%%DATADIR%%/default/data/art/icons/tech/the_caducean_institute.png
+%%DATADIR%%/default/data/art/icons/tech/the_living_planet.png
+%%DATADIR%%/default/data/art/icons/tech/the_physical_brain.png
+%%DATADIR%%/default/data/art/icons/tech/the_theory_of_everything.png
+%%DATADIR%%/default/data/art/icons/tech/transcendent_architecture.png
+%%DATADIR%%/default/data/art/icons/tech/transforming_structures.png
 %%DATADIR%%/default/data/art/icons/tech/translingustic_thought.png
 %%DATADIR%%/default/data/art/icons/tech/unified_conscious.png
 %%DATADIR%%/default/data/art/icons/tech/urban_farming.png
 %%DATADIR%%/default/data/art/icons/tech/xenoarchaeology.png
+%%DATADIR%%/default/data/art/icons/tech/xenological_genetics.png
+%%DATADIR%%/default/data/art/icons/tech/xenological_hybridization.png
 %%DATADIR%%/default/data/art/icons/tech/zero_point_energy.png
-%%DATADIR%%/default/data/art/icons/trade.png
 %%DATADIR%%/default/data/art/icons/trade_mono.png
 %%DATADIR%%/default/data/art/icons/uparrowclicked.png
 %%DATADIR%%/default/data/art/icons/uparrowmouseover.png
@@ -128,31 +525,39 @@ bin/freeoriond
 %%DATADIR%%/default/data/art/logo.png
 %%DATADIR%%/default/data/art/misc/base1.png
 %%DATADIR%%/default/data/art/misc/colony1.png
-%%DATADIR%%/default/data/art/misc/colonyicon.png
-%%DATADIR%%/default/data/art/misc/forkedarrow.png
+%%DATADIR%%/default/data/art/misc/dashed-line.png
 %%DATADIR%%/default/data/art/misc/mark1.png
 %%DATADIR%%/default/data/art/misc/mark2.png
-%%DATADIR%%/default/data/art/misc/mark2icon.png
 %%DATADIR%%/default/data/art/misc/mark3.png
 %%DATADIR%%/default/data/art/misc/mark4.png
 %%DATADIR%%/default/data/art/misc/meter_bar_shading.png
 %%DATADIR%%/default/data/art/misc/missing.png
+%%DATADIR%%/default/data/art/misc/move_line_dot.png
 %%DATADIR%%/default/data/art/misc/planet_selection.png
-%%DATADIR%%/default/data/art/misc/planetpanelpictures.png
 %%DATADIR%%/default/data/art/misc/scout1.png
 %%DATADIR%%/default/data/art/misc/system_mouseover.png
+%%DATADIR%%/default/data/art/misc/system_mouseover_invalid.png
 %%DATADIR%%/default/data/art/misc/system_selection.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula1.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula10.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula11.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula12.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula13.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula14.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula15.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula16.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula17.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula18.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula19.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula2.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula3.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula4.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula5.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula6.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula7.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula8.png
+%%DATADIR%%/default/data/art/nebula.bak/nebula9.png
 %%DATADIR%%/default/data/art/nebula1.png
-%%DATADIR%%/default/data/art/nebula10.png
-%%DATADIR%%/default/data/art/nebula11.png
-%%DATADIR%%/default/data/art/nebula2.png
-%%DATADIR%%/default/data/art/nebula3.png
-%%DATADIR%%/default/data/art/nebula4.png
-%%DATADIR%%/default/data/art/nebula5.png
-%%DATADIR%%/default/data/art/nebula6.png
-%%DATADIR%%/default/data/art/nebula7.png
-%%DATADIR%%/default/data/art/nebula8.png
-%%DATADIR%%/default/data/art/nebula9.png
 %%DATADIR%%/default/data/art/planets/Barren-bump01.png
 %%DATADIR%%/default/data/art/planets/Barren-bump02.png
 %%DATADIR%%/default/data/art/planets/Barren01.png
@@ -993,18 +1398,6 @@ bin/freeoriond
 %%DATADIR%%/default/data/art/planets/rings/rings05.png
 %%DATADIR%%/default/data/art/planets/rings/rings06.png
 %%DATADIR%%/default/data/art/planets/rings/rings07.png
-%%DATADIR%%/default/data/art/planets_bg/barren1.png
-%%DATADIR%%/default/data/art/planets_bg/desert1.png
-%%DATADIR%%/default/data/art/planets_bg/gasgiant1.png
-%%DATADIR%%/default/data/art/planets_bg/gasgiant2.png
-%%DATADIR%%/default/data/art/planets_bg/inferno1.png
-%%DATADIR%%/default/data/art/planets_bg/irradiated1.png
-%%DATADIR%%/default/data/art/planets_bg/ocean1.png
-%%DATADIR%%/default/data/art/planets_bg/swamp1.png
-%%DATADIR%%/default/data/art/planets_bg/terran1.png
-%%DATADIR%%/default/data/art/planets_bg/toxic1.png
-%%DATADIR%%/default/data/art/planets_bg/tundra1.png
-%%DATADIR%%/default/data/art/special_icons/Generic_Special.png
 %%DATADIR%%/default/data/art/splash.png
 %%DATADIR%%/default/data/art/starfield1.png
 %%DATADIR%%/default/data/art/starfield2.png
@@ -1015,34 +1408,58 @@ bin/freeoriond
 %%DATADIR%%/default/data/art/stars/blackhole4.png
 %%DATADIR%%/default/data/art/stars/blackhole5.png
 %%DATADIR%%/default/data/art/stars/blackhole6.png
-%%DATADIR%%/default/data/art/stars/blue1.png
-%%DATADIR%%/default/data/art/stars/blue2.png
-%%DATADIR%%/default/data/art/stars/blue3.png
-%%DATADIR%%/default/data/art/stars/neutron1.png
-%%DATADIR%%/default/data/art/stars/neutron2.png
-%%DATADIR%%/default/data/art/stars/orange1.png
-%%DATADIR%%/default/data/art/stars/orange2.png
-%%DATADIR%%/default/data/art/stars/orange3.png
-%%DATADIR%%/default/data/art/stars/orange4.png
-%%DATADIR%%/default/data/art/stars/orange5.png
-%%DATADIR%%/default/data/art/stars/purple1.png
-%%DATADIR%%/default/data/art/stars/purple2.png
-%%DATADIR%%/default/data/art/stars/purple3.png
-%%DATADIR%%/default/data/art/stars/purple4.png
-%%DATADIR%%/default/data/art/stars/purple5.png
-%%DATADIR%%/default/data/art/stars/red1.png
-%%DATADIR%%/default/data/art/stars/red2.png
-%%DATADIR%%/default/data/art/stars/red3.png
-%%DATADIR%%/default/data/art/stars/red4.png
-%%DATADIR%%/default/data/art/stars/red5.png
-%%DATADIR%%/default/data/art/stars/white1.png
-%%DATADIR%%/default/data/art/stars/white2.png
-%%DATADIR%%/default/data/art/stars/white3.png
-%%DATADIR%%/default/data/art/stars/yellow1.png
-%%DATADIR%%/default/data/art/stars/yellow2.png
-%%DATADIR%%/default/data/art/stars/yellow3.png
-%%DATADIR%%/default/data/art/stars/yellow4.png
-%%DATADIR%%/default/data/art/stars/yellow5.png
+%%DATADIR%%/default/data/art/stars/blue01.png
+%%DATADIR%%/default/data/art/stars/halo_blue01.png
+%%DATADIR%%/default/data/art/stars/halo_neutron01.png
+%%DATADIR%%/default/data/art/stars/halo_orange01.png
+%%DATADIR%%/default/data/art/stars/halo_red01.png
+%%DATADIR%%/default/data/art/stars/halo_white01.png
+%%DATADIR%%/default/data/art/stars/halo_yellow01.png
+%%DATADIR%%/default/data/art/stars/neutron01.png
+%%DATADIR%%/default/data/art/stars/old_stars/blue1.png
+%%DATADIR%%/default/data/art/stars/old_stars/blue2.png
+%%DATADIR%%/default/data/art/stars/old_stars/blue3.png
+%%DATADIR%%/default/data/art/stars/old_stars/neutron1.png
+%%DATADIR%%/default/data/art/stars/old_stars/neutron2.png
+%%DATADIR%%/default/data/art/stars/old_stars/orange1.png
+%%DATADIR%%/default/data/art/stars/old_stars/orange2.png
+%%DATADIR%%/default/data/art/stars/old_stars/orange3.png
+%%DATADIR%%/default/data/art/stars/old_stars/orange4.png
+%%DATADIR%%/default/data/art/stars/old_stars/orange5.png
+%%DATADIR%%/default/data/art/stars/old_stars/purple1.png
+%%DATADIR%%/default/data/art/stars/old_stars/purple2.png
+%%DATADIR%%/default/data/art/stars/old_stars/purple3.png
+%%DATADIR%%/default/data/art/stars/old_stars/purple4.png
+%%DATADIR%%/default/data/art/stars/old_stars/purple5.png
+%%DATADIR%%/default/data/art/stars/old_stars/red1.png
+%%DATADIR%%/default/data/art/stars/old_stars/red2.png
+%%DATADIR%%/default/data/art/stars/old_stars/red3.png
+%%DATADIR%%/default/data/art/stars/old_stars/red4.png
+%%DATADIR%%/default/data/art/stars/old_stars/red5.png
+%%DATADIR%%/default/data/art/stars/old_stars/white1.png
+%%DATADIR%%/default/data/art/stars/old_stars/white2.png
+%%DATADIR%%/default/data/art/stars/old_stars/white3.png
+%%DATADIR%%/default/data/art/stars/old_stars/yellow1.png
+%%DATADIR%%/default/data/art/stars/old_stars/yellow2.png
+%%DATADIR%%/default/data/art/stars/old_stars/yellow3.png
+%%DATADIR%%/default/data/art/stars/old_stars/yellow4.png
+%%DATADIR%%/default/data/art/stars/old_stars/yellow5.png
+%%DATADIR%%/default/data/art/stars/orange01.png
+%%DATADIR%%/default/data/art/stars/red01.png
+%%DATADIR%%/default/data/art/stars/tiny_blackhole.png
+%%DATADIR%%/default/data/art/stars/tiny_blue.png
+%%DATADIR%%/default/data/art/stars/tiny_neutron.png
+%%DATADIR%%/default/data/art/stars/tiny_orange.png
+%%DATADIR%%/default/data/art/stars/tiny_red.png
+%%DATADIR%%/default/data/art/stars/tiny_ring_1.png
+%%DATADIR%%/default/data/art/stars/tiny_ring_2.png
+%%DATADIR%%/default/data/art/stars/tiny_ring_3.png
+%%DATADIR%%/default/data/art/stars/tiny_ring_4.png
+%%DATADIR%%/default/data/art/stars/tiny_ring_5.png
+%%DATADIR%%/default/data/art/stars/tiny_white.png
+%%DATADIR%%/default/data/art/stars/tiny_yellow.png
+%%DATADIR%%/default/data/art/stars/white01.png
+%%DATADIR%%/default/data/art/stars/yellow01.png
 %%DATADIR%%/default/data/art/stars_sidepanel/blackhole00.png
 %%DATADIR%%/default/data/art/stars_sidepanel/blackhole01.png
 %%DATADIR%%/default/data/art/stars_sidepanel/blue00.png
@@ -1057,63 +1474,6 @@ bin/freeoriond
 %%DATADIR%%/default/data/art/stars_sidepanel/white01.png
 %%DATADIR%%/default/data/art/stars_sidepanel/yellow00.png
 %%DATADIR%%/default/data/art/stars_sidepanel/yellow01.png
-%%DATADIR%%/default/data/art/tech_icons/Asteroid_Mining.png
-%%DATADIR%%/default/data/art/tech_icons/Asteroid_Mining_I.png
-%%DATADIR%%/default/data/art/tech_icons/Asteroid_Mining_II.png
-%%DATADIR%%/default/data/art/tech_icons/Economic_Fluidity.png
-%%DATADIR%%/default/data/art/tech_icons/Economic_Hegemony.png
-%%DATADIR%%/default/data/art/tech_icons/Economic_Prescience.png
-%%DATADIR%%/default/data/art/tech_icons/Economic_Spectroscopy.png
-%%DATADIR%%/default/data/art/tech_icons/Enviromental_Adaptation.png
-%%DATADIR%%/default/data/art/tech_icons/Environmental_Encapsulation.png
-%%DATADIR%%/default/data/art/tech_icons/Force-Field_Assembly.png
-%%DATADIR%%/default/data/art/tech_icons/Force-Field_Harmonics.png
-%%DATADIR%%/default/data/art/tech_icons/Force_Energy_Structures.png
-%%DATADIR%%/default/data/art/tech_icons/Galactic_Exploration.png
-%%DATADIR%%/default/data/art/tech_icons/Galactic_Monetary_Policy.png
-%%DATADIR%%/default/data/art/tech_icons/Genetic_Engineering.png
-%%DATADIR%%/default/data/art/tech_icons/Genetic_Medicine.png
-%%DATADIR%%/default/data/art/tech_icons/Habitation_Domes.png
-%%DATADIR%%/default/data/art/tech_icons/Hyperspatial_Dam.png
-%%DATADIR%%/default/data/art/tech_icons/Industrial_Centre_I.png
-%%DATADIR%%/default/data/art/tech_icons/Industrial_Centre_II.png
-%%DATADIR%%/default/data/art/tech_icons/Industrial_Centre_III.png
-%%DATADIR%%/default/data/art/tech_icons/Industrial_Cloning.png
-%%DATADIR%%/default/data/art/tech_icons/Industrial_Farming.png
-%%DATADIR%%/default/data/art/tech_icons/Interstellar_Co-Production.png
-%%DATADIR%%/default/data/art/tech_icons/Interstellar_Trade.png
-%%DATADIR%%/default/data/art/tech_icons/Looking_Glass.png
-%%DATADIR%%/default/data/art/tech_icons/Market_Economics.png
-%%DATADIR%%/default/data/art/tech_icons/Matter-Energy_Conversion.png
-%%DATADIR%%/default/data/art/tech_icons/Matter-Energy_Replication.png
-%%DATADIR%%/default/data/art/tech_icons/Microgravity_Manufacturing.png
-%%DATADIR%%/default/data/art/tech_icons/N-Dimensional_Assembly.png
-%%DATADIR%%/default/data/art/tech_icons/N-Dimensional_Structures.png
-%%DATADIR%%/default/data/art/tech_icons/N-Dimensional_Subspace.png
-%%DATADIR%%/default/data/art/tech_icons/Nanotech_Cybernetics.png
-%%DATADIR%%/default/data/art/tech_icons/Nanotech_Medicine.png
-%%DATADIR%%/default/data/art/tech_icons/Nanotech_Production.png
-%%DATADIR%%/default/data/art/tech_icons/Orbital_Construction.png
-%%DATADIR%%/default/data/art/tech_icons/Orbital_Farming.png
-%%DATADIR%%/default/data/art/tech_icons/Orbital_Generation.png
-%%DATADIR%%/default/data/art/tech_icons/Orbital_Mining.png
-%%DATADIR%%/default/data/art/tech_icons/Planetary_Colonialism.png
-%%DATADIR%%/default/data/art/tech_icons/Planetary_Ecology.png
-%%DATADIR%%/default/data/art/tech_icons/Planetary_Geology.png
-%%DATADIR%%/default/data/art/tech_icons/Planned_Economics.png
-%%DATADIR%%/default/data/art/tech_icons/Singularity_Generation.png
-%%DATADIR%%/default/data/art/tech_icons/Singularity_of_Transcendence.png
-%%DATADIR%%/default/data/art/tech_icons/Stellar_Navigation.png
-%%DATADIR%%/default/data/art/tech_icons/The_Physical_Brain.png
-%%DATADIR%%/default/data/art/tech_icons/The_Theory_of_Everything.png
-%%DATADIR%%/default/data/art/tech_icons/Transcendent_Architecture.png
-%%DATADIR%%/default/data/art/tech_icons/Xenological_Genetics.png
-%%DATADIR%%/default/data/art/tech_icons/Xenological_Hybridization.png
-%%DATADIR%%/default/data/art/tech_icons/categories/construction.png
-%%DATADIR%%/default/data/art/tech_icons/categories/economics.png
-%%DATADIR%%/default/data/art/tech_icons/categories/growth.png
-%%DATADIR%%/default/data/art/tech_icons/categories/learning.png
-%%DATADIR%%/default/data/art/tech_icons/categories/production.png
 %%DATADIR%%/default/data/sound/alert.wav
 %%DATADIR%%/default/data/sound/artificial_intelligence_v3.ogg
 %%DATADIR%%/default/data/sound/balanced_select.wav
@@ -1138,40 +1498,69 @@ bin/freeoriond
 %%DATADIR%%/default/den_stringtable.txt
 %%DATADIR%%/default/dut_stringtable.txt
 %%DATADIR%%/default/empire_colors.xml
+%%DATADIR%%/default/empire_names.txt
 %%DATADIR%%/default/eng_stringtable.txt
 %%DATADIR%%/default/esp_stringtable.txt
+%%DATADIR%%/default/fr_stringtable.txt
 %%DATADIR%%/default/ger_stringtable.txt
+%%DATADIR%%/default/pl_stringtable.txt
 %%DATADIR%%/default/planet_specials.txt
 %%DATADIR%%/default/planet_tables.txt
 %%DATADIR%%/default/production_tables.txt
+%%DATADIR%%/default/rus_stringtable.txt
+%%DATADIR%%/default/shaders/scanlines.frag
+%%DATADIR%%/default/ship_hulls.txt
+%%DATADIR%%/default/ship_parts.txt
 %%DATADIR%%/default/shipnames.txt
 %%DATADIR%%/default/specials.txt
 %%DATADIR%%/default/starnames.txt
+%%DATADIR%%/default/swe_stringtable.txt
 %%DATADIR%%/default/techs.txt
 %%DATADIR%%/default/universe_tables.txt
-@dirrm %%DATADIR%%/default/data/sound
-@dirrm %%DATADIR%%/default/data/art/tech_icons/categories
-@dirrm %%DATADIR%%/default/data/art/tech_icons
+@dirrm %%DATADIR%%/default/AI
 @dirrm %%DATADIR%%/default/data/art/stars_sidepanel
+@dirrm %%DATADIR%%/default/data/art/hulls_design
+@dirrm %%DATADIR%%/default/data/art/misc
+@dirrm %%DATADIR%%/default/data/art/stars/old_stars
 @dirrm %%DATADIR%%/default/data/art/stars
-@dirrm %%DATADIR%%/default/data/art/special_icons
-@dirrm %%DATADIR%%/default/data/art/planets_bg
-@dirrm %%DATADIR%%/default/data/art/planets/rings
-@dirrm %%DATADIR%%/default/data/art/planets/damage
-@dirrm %%DATADIR%%/default/data/art/planets/clouds
+@dirrm %%DATADIR%%/default/data/art/galaxy_decoration/grey_set
+@dirrm %%DATADIR%%/default/data/art/galaxy_decoration/red_set
+@dirrm %%DATADIR%%/default/data/art/galaxy_decoration/ultramarine_set
+@dirrm %%DATADIR%%/default/data/art/galaxy_decoration/blue_set
+@dirrm %%DATADIR%%/default/data/art/galaxy_decoration/haze_set
+@dirrm %%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set
+@dirrm %%DATADIR%%/default/data/art/galaxy_decoration/rust_set
+@dirrm %%DATADIR%%/default/data/art/galaxy_decoration
+@dirrm %%DATADIR%%/default/data/art/cursors
+@dirrm %%DATADIR%%/default/data/art/nebula.bak
+@dirrm %%DATADIR%%/default/data/art/combat/effects
+@dirrm %%DATADIR%%/default/data/art/combat/backgrounds
+@dirrm %%DATADIR%%/default/data/art/combat/meshes/planets
+@dirrm %%DATADIR%%/default/data/art/combat/meshes
+@dirrm %%DATADIR%%/default/data/art/combat
 @dirrm %%DATADIR%%/default/data/art/planets/citylights
+@dirrm %%DATADIR%%/default/data/art/planets/clouds
 @dirrm %%DATADIR%%/default/data/art/planets/atmospheres
+@dirrm %%DATADIR%%/default/data/art/planets/damage
+@dirrm %%DATADIR%%/default/data/art/planets/rings
 @dirrm %%DATADIR%%/default/data/art/planets/asteroids
 @dirrm %%DATADIR%%/default/data/art/planets
-@dirrm %%DATADIR%%/default/data/art/misc
+@dirrm %%DATADIR%%/default/data/art/icons/tech/categories
 @dirrm %%DATADIR%%/default/data/art/icons/tech
 @dirrm %%DATADIR%%/default/data/art/icons/specials_tiny
-@dirrm %%DATADIR%%/default/data/art/icons/specials_large
 @dirrm %%DATADIR%%/default/data/art/icons/specials_huge
+@dirrm %%DATADIR%%/default/data/art/icons/meter
+@dirrm %%DATADIR%%/default/data/art/icons/flags/emblem
+@dirrm %%DATADIR%%/default/data/art/icons/flags/field
+@dirrm %%DATADIR%%/default/data/art/icons/flags
+@dirrm %%DATADIR%%/default/data/art/icons/building
+@dirrm %%DATADIR%%/default/data/art/icons/fleet
+@dirrm %%DATADIR%%/default/data/art/icons/ship_parts
+@dirrm %%DATADIR%%/default/data/art/icons/specials_large
 @dirrm %%DATADIR%%/default/data/art/icons
-@dirrm %%DATADIR%%/default/data/art/building_icons
 @dirrm %%DATADIR%%/default/data/art
+@dirrm %%DATADIR%%/default/data/sound
 @dirrm %%DATADIR%%/default/data
-@dirrm %%DATADIR%%/default/AI
+@dirrm %%DATADIR%%/default/shaders
 @dirrm %%DATADIR%%/default
 @dirrm %%DATADIR%%