CVS commit: pkgsrc/games/wesnoth

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jun 24 16:02:50 UTC 2018

Modified Files:
        pkgsrc/games/wesnoth: Makefile PLIST distinfo
        pkgsrc/games/wesnoth/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/games/wesnoth/patches: patch-src_CMakeLists.txt
            patch-src_wesnoth.cpp
Removed Files:
        pkgsrc/games/wesnoth/patches: patch-ae patch-af patch-ah
            patch-data_tools_addon__manager_html_py
            patch-data_tools_castle-clutter_mk_all-castles_sh
            patch-data_tools_unit__tree_helpers_py
            patch-data_tools_wesnoth_campaignserver__client_py

Log Message:
wesnoth: updated to 1.14.3

Version 1.14.3
 AI
  * Fixed crash in presence of units with negative hitpoints (issue 3042).
  * Efficiency improvements to filter evaluations in the Goto Micro AI and some
    AI helper functions
 Campaigns
  * Dead Water:
    * Fix possibility of villagers blocking pickup of sword in S10 The Flaming
      Sword (issue 3207).
  * Descent Into Darkness:
    * New Parthyn map in S1 and S6.
  * Northern Rebirth:
    * Reduced starting gold and income in scenarios 10 to 13
  * Secrets of the Ancients:
    * Fix S09 Training Session not ending when all dark adepts die (issue 3192)
  * Tutorial:
    * S2: made enemy starting gold equal to that of the player.
  * Under the Burning Suns:
    * Added portrait and updated sprite for Giant Ant.
 Language and i18n
  * Updated translations: British English, Chinese (Traditional), Czech, French,
    Italian, Japanese, Scottish Gaelic, Spanish
 Multiplayer server
  * Fixed lan_server option not causing the server to exit once vacated, e.g.
    when using the Host Networked Game option from the Multiplayer menu in the
    game (issue 3206).
 Music and sound effects
  * The music now changes immediately when you load a save file (issue 2602).
  * Fixed Lua errors when setting a music track that cannot be found when the
    playlist is already empty, e.g. if there's no music installed for the
    game (issue 3194).
 WML engine
  * Removed validation to ensure units cannot have negative hitpoints. We
    learned that the ability to create such units is documented, and thus
    disallowing it was an API change. Since API changes aren't allowed in
    the stable branch, we have reverted it.
 Miscellaneous and bug fixes
  * Fixed an occasional crash at the loading screen related to multi-thread
    access of the image cache.
  * [kill] animate=yes no longer scrolls to units through fog or shroud, thus
    matching 1.12's behavior again.
  * [message] displays the unit type name when a nameless unit speaks and no
    custom caption= is specified (issue 3211).
  * do_not_list=yes units are no longer excluded from the debug mode-only
    Create Unit dialog.
  * Fixed a rare issue where disabled attacks could cause the wrong attack to
    be initially selected in the Unit Attack dialog. This bug also had the
    potential to cause units to the wrong attack when  engaging or viewing
    damage calculations.
  * Fixed [scenario] map_file= being unusable in most circumstances.

Version 1.14.2
 Campaigns
  * Northern Rebirth:
    * S02.1 Infested Caves: keep side 8 AI leader from wandering off too far
      and ending up on a keep with only one hex for recruiting.
    * S02.1 Infested Caves: AIs are less likely to kill each other in early
      game, which would make it harder for the player otherwise.
    * S02.1 Infested Caves: Dwarvish allies are also less likely to die.
    * S02.1 Infested Caves: minor map tweaks and improvements.
    * S05 The Pursuit: removed a bottleneck and tweaked Rod of Justice.
  * Sceptre of Fire:
    * In 'Caverns of Flame', fixed various issues with the volcano eruption.
  * Under the Burning Suns:
    * Various Quenoth unit graphics updates.
  * Descent into Darkness:
    * In 'A small Favor', disabled a not intended way to win the scenario.
  * Secrets of the Ancients:
    * Bats are transformed to normal ones already after S5
 Graphics
  * Fixed a minor team coloring mistake in the north-facing Revenant standing
    animation.
 Language and i18n
  * Updated translations: British English, Chinese (Simplified), Czech, French,
    Galician, German, Italian, Japanese, Scottish Gaelic, Spanish, Ukrainian
 User interface
  * List boxes (MP lobby game list in particular) now keep the scroll position
    when they change, instead of keeping the selected item visible (issue 3016).
  * Fixed MP lobby player list scrolling to top when it changes
  * Fixed the first unit sometimes not being selected when opening the Recall
    dialog.
  * Fixed a crash when using very large portraits in [message] (issue 2912)
  * Added a button to access the version info dialog to Preferences.
  * Removed player list sorting options in the MP lobby. The list is now
    automatically sorted alphabetically, friends first.
  * Rearranged campaign difficulty menu layout
 Terrains
  * Removed hidden terrains that were not supposed to make it to 1.14: ^Prg,
    ^Prgo, ^Pwd, ^Pwdo
 Miscellaneous and bug fixes
  * Fixed memory leak in terrain filter code. In a huge map with Silver Mages,
    it could leak several gigabytes of memory in a long session.
  * Fixed: unit halo remained after undoing a recall (issue 3065)
  * Fixed: unit halo intensity doubled during AMLA animation
  * [change_theme] no longer causes a Lua error when theme= is not specified
    instead of explicitly set to an empty string.
  * [change_theme] no longer requires running a separate action to update the
    UI afterwards (e.g. [redraw]) and the status panels are updated immediately.
    as well.
  * Lua random map generator: fixed error when flipping map; specifically this
    also fixes an assert at the start of HttT S7 (Sceptre of Fire) that had a
    50% chance of being triggered
  * Experimental AI: fixed recruiting not working on maps without enemies, such
    as the first two turns of Dark Forecast
  * Experimental AI: fixed recruiting evaluations sometimes not being updated
  * Replaced deprecated Lua code and all remaining uses of FOREACH and MESSAGE
    macros
  * Fixed [color_adjust] interacting poorly with time of day color shifts and
    values outside the [-255, 255] range (issue 3144).
  * Fixed a regression from 1.13.10 where modification option values couldn't
    be properly saved in arrays.
  * Added stricter validation to ensure units cannot have negative hitpoints,
    except during specific attack-related events.
  * Added deprecation notices for several macros that had them missing before.
  * [message] no longer scrolls to units through fog or shroud so it matches
    1.12's behavior.
  * Fixed animation-wide text_color and blend_color keys being overwritten. This
    fixes level-in and level-out animations sometimes fading to black instead of
    white.
  * Fixed [animate_unit] freezing the game when observing MP games (2970).
  * Fixed carryover behaving differently when loading a start-of-scenario save
    (issue 3152).
  * Fixed turn replay function in MP.
  * Fixed savegames being created even when not needed (issue 3150).
  * Fixed handling of extra_recruit in planning mode (issue 3100).
  * Fixed handling of skirmisher in planning mode.
  * Fixed handling of filter_recall in planning mode.
  * Fixed possible segfault at game end.
  * Fixed require_resource in [resource].
  * Fixed require_scenario=yes not working with map_generation (issue 3105).

Version 1.14.1
 Campaigns
  * Eastern Invasion:
    * In 'Captured', fixed units incorrectly costing upkeep after leveling up.
  * Secrets of the Ancients
    * Fixed minor unit naming inconsistencies (issues 2844 and 2846).
  * Under the Burning Suns
    * Added custom graphics for the broken tree in S1.
    * Various sprite and image updates.
    * Fixed a bug in the formation ability causing defense bonuses not being
      received in some cases.
 Language and i18n
  * Updated translations: British English, Chinese (Simplified), Czech, French,
    Galician, German, Italian, Japanese, Scottish Gaelic, Slovak, Spanish
  * Fixed Logging Options tooltips not being translatable (issue 2837).
  * Add command-line argument to disable the filtering of incomplete translations
    in the language selection list.
 Multiplayer server
  * Added support for matching user, IP, and email bans from a forums board
    when the forum_user_handler is enabled and active. (IP and email bans with
    wildcards are not supported yet.)
  * Fixed various instances of the server crashing under certain conditions.
 Performance
  * Added an option to disable the FPS limiter for a slight performance boost.
 Units
  * Changed the plural name for the merfolk race from Mermen to Merfolk (issue 2940)
    and replaced a few instances in core unit or terrain descriptions accordingly.
 User interface
  * Removed individual Join/Observe buttons for each game in the MP Lobby.
  * Highlight the titles of MP games with vacant slots.
  * Improved MP Lobby layout on low resolutions.
  * Improved reporting of network errors in the MP lobby (issue 3005).
  * Ensure the chat widget remains the correct size even after a window resize.
  * Custom MP game names are now capped at 50 characters.
  * Restored Era info to main MP game display.
  * Improved the resolution selection criteria for the MP Lobby.
  * Fixed inactive weapon specials being displayed in the Unit Attack dialog
    unlike in 1.12 (issue 3033).
 Miscellaneous and bug fixes
  * Removed misleading tooltip text stating registered nicknames are optional for
    the official MP server.
  * Attempting to save a screenshot with an unsupported format now shows an error
    message, instead of saving the screenshot as BMP with the requested extension.
  * It is now possible to disable logdomains in the Logging Options dialog.
  * Fixed the wesnoth(6) manpage claiming the default log level is 'error' when it
    has been 'warning' since version 1.9.0.
  * Document --log-none in the wesnoth(6) manpage.
  * Avoid trying to load invalid base64-encoded data URIs.
  * wesnoth_addon_manager and the addons.wesnoth.org web index can now use data URIs.
  * Fixed a crash when using certain invalid color= values.
  * Implemented a workaround for an unhandled std::bad_cast from string comparison
    functions that caused a crash-to-desktop when opening Preferences among others
    (issue 3050).
  * Fixed many crashes and out-of-sync errors when using the planning mode.

Version 1.14.0
 Campaigns
  * Under the Burning Suns
    * New set of Quenoth faction and character portraits by LordBob.
    * Updated sprites for several Quenoth units.
    * Fixed "Invalid WML found" error that can be caused by the Quenoth Youth
      support ability.
 Help browser
  * Temporarily hidden Editor section as it is mostly incomplete and of little
    use right now (issue 2963).
 Language and i18n
  * Fixed Version label on the title screen not being translatable (issue 2914).
  * Updated translations: Czech, French, Galician, German, Japanese, Polish,
    Scottish Gaelic, Slovak, Spanish
 Multiplayer
  * Fixed regression causing a crash-to-desktop when trying to log into the
    server using a registered and active account without specifying a
    password.
  * Fixed an infinite loading screen if the server shut down or restarted
    mid-login.
  * Fixed an infinite loading screen when attempting to login with an
    unregistered nickname followed by a registered one.
  * Dark Forecast: Fixed possible Lua error when the weather changes.
 User Interface
  * Implemented MP chat message history saving (issue 1194, issue 2802).
  * Fixed context menus not dismissing on right click.
 Miscellaneous and bug fixes
  * Fixed an AI assertion when a unit with one disabled attack attacked a unit
    with no attacks or a single disabled attack.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/games/wesnoth/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/games/wesnoth/PLIST
cvs rdiff -u -r1.58 -r1.59 pkgsrc/games/wesnoth/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.7 -r0 pkgsrc/games/wesnoth/patches/patch-ae \
    pkgsrc/games/wesnoth/patches/patch-af
cvs rdiff -u -r1.3 -r0 pkgsrc/games/wesnoth/patches/patch-ah
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/games/wesnoth/patches/patch-data_tools_addon__manager_html_py \
    pkgsrc/games/wesnoth/patches/patch-data_tools_castle-clutter_mk_all-castles_sh \
    pkgsrc/games/wesnoth/patches/patch-data_tools_unit__tree_helpers_py \
    pkgsrc/games/wesnoth/patches/patch-data_tools_wesnoth_campaignserver__client_py
cvs rdiff -u -r0 -r1.1 pkgsrc/games/wesnoth/patches/patch-src_CMakeLists.txt \
    pkgsrc/games/wesnoth/patches/patch-src_wesnoth.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/wesnoth/Makefile
diff -u pkgsrc/games/wesnoth/Makefile:1.133 pkgsrc/games/wesnoth/Makefile:1.134
--- pkgsrc/games/wesnoth/Makefile:1.133 Sun Apr 29 21:31:42 2018
+++ pkgsrc/games/wesnoth/Makefile       Sun Jun 24 16:02:50 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.133 2018/04/29 21:31:42 adam Exp $
+# $NetBSD: Makefile,v 1.134 2018/06/24 16:02:50 adam Exp $
 
-DISTNAME=      wesnoth-1.12.6
-PKGREVISION=   11
+DISTNAME=      wesnoth-1.14.3
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 EXTRACT_SUFX=  .tar.bz2
@@ -14,49 +13,34 @@ LICENSE=    gnu-gpl-v2
 BUILD_DEPENDS+=        libxslt-[0-9]*:../../textproc/libxslt
 
 USE_CMAKE=             yes
-USE_LIBTOOL=           yes
 USE_LANGUAGES=         c c++11
-USE_TOOLS+=            pkg-config
-USE_TOOLS+=            perl:run msgfmt
-USE_TOOLS+=            bash
+USE_LIBTOOL=           yes
+USE_TOOLS+=            bash msgfmt perl:run pkg-config
+# detects history.h, but does not link against libhistory
+CMAKE_ARGS+=           -DENABLE_HISTORY=OFF
 
 UNLIMIT_RESOURCES+=    datasize
 UNLIMIT_RESOURCES+=    stacksize
 
-REPLACE_PERL+=         utils/wesnothd.pl
-
-SUBST_CLASSES+=                prefix
-SUBST_STAGE.prefix=    pre-configure
-SUBST_FILES.prefix=    cmake/FindFriBiDi.cmake
-SUBST_MESSAGE.prefix=  Fixing search path.
-SUBST_SED.prefix=      -e 's,/usr/local,${PREFIX},'
-
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 1.10.6
-REPLACE_PYTHON+=               data/tools/GUI.pyw
-REPLACE_PYTHON+=               data/tools/*.py
-REPLACE_PYTHON+=               data/tools/wesnoth/*.py
-REPLACE_PYTHON+=               data/tools/wml*
-REPLACE_PYTHON+=               data/tools/about_cfg_to_wiki
-REPLACE_PYTHON+=               data/tools/addon_manager/html.py
-REPLACE_PYTHON+=               data/tools/extractbindings
-REPLACE_PYTHON+=               data/tools/imgcheck
-REPLACE_PYTHON+=               data/tools/journeylifter
-REPLACE_PYTHON+=               data/tools/rmtrans/rmtrans.py
-REPLACE_PYTHON+=               data/tools/trackplacer
-REPLACE_PYTHON+=               data/tools/unit_tree/helpers.py
-REPLACE_PYTHON+=               data/tools/wesnoth_addon_manager
-REPLACE_PYTHON+=               data/tools/wesnoth_addon_manager/html.py
-REPLACE_PYTHON+=               data/tools/wesnoth/campaignserver_client.py
-REPLACE_PYTHON+=               data/tools/unit_tree/TeamColorizer
-REPLACE_PYTHON+=               data/tools/unit_tree/overview.py
-REPLACE_PYTHON+=               utils/ai_test/*.py
-REPLACE_PYTHON+=               utils/*.py
-
-REPLACE_BASH+=         data/tools/castle-cutter/mk-all-castles.sh
-REPLACE_BASH+=         data/tools/castle-cutter/mk-castle.sh
 REPLACE_BASH+=         data/tools/unit_tree/update-wmlunits
 
-BUILDLINK_TRANSFORM+=  rm:-Werror
+REPLACE_PYTHON+=       data/tools/GUI.pyw
+REPLACE_PYTHON+=       data/tools/*.py
+REPLACE_PYTHON+=       data/tools/wesnoth/*.py
+REPLACE_PYTHON+=       data/tools/wml*
+REPLACE_PYTHON+=       data/tools/about_cfg_to_wiki
+REPLACE_PYTHON+=       data/tools/addon_manager/html.py
+REPLACE_PYTHON+=       data/tools/extractbindings
+REPLACE_PYTHON+=       data/tools/imgcheck
+REPLACE_PYTHON+=       data/tools/journeylifter
+REPLACE_PYTHON+=       data/tools/rmtrans/rmtrans.py
+REPLACE_PYTHON+=       data/tools/trackplacer
+REPLACE_PYTHON+=       data/tools/unit_tree/helpers.py
+REPLACE_PYTHON+=       data/tools/unit_tree/TeamColorizer
+REPLACE_PYTHON+=       data/tools/unit_tree/overview.py
+REPLACE_PYTHON+=       data/tools/wesnoth_addon_manager
+REPLACE_PYTHON+=       utils/ai_test/*.py
+REPLACE_PYTHON+=       utils/*.py
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M4.*)
@@ -71,34 +55,23 @@ PLIST.icons=                yes
 
 LDFLAGS.SunOS+=                -lintl -lsocket
 
-# To avoid *.orig files (after patch) installed
-post-patch:
-       (cd ${WRKSRC}; \
-       ${RM} data/tools/addon_manager/html.py.orig; \
-       ${RM} data/tools/castle-cutter/mk-all-castles.sh.orig; \
-       ${RM} data/tools/unit_tree/helpers.py.orig; \
-       ${RM} data/tools/wesnoth/campaignserver_client.py.orig;\
-       )
-
-BUILDLINK_API_DEPENDS.SDL_mixer+=      SDL_mixer>=1.2.5nb3
-.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
-BUILDLINK_API_DEPENDS.SDL+=            SDL>=1.2.7
-.include "../../devel/SDL/buildlink3.mk"
-BUILDLINK_API_DEPENDS.SDL_ttf+=                SDL_ttf>=2.0.8
-.include "../../devel/SDL_ttf/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=  pango>=1.14.8
 .include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../fonts/SDL2_ttf/buildlink3.mk"
+.include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../net/SDL_net/buildlink3.mk"
+.include "../../net/SDL2_net/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/wesnoth/PLIST
diff -u pkgsrc/games/wesnoth/PLIST:1.44 pkgsrc/games/wesnoth/PLIST:1.45
--- pkgsrc/games/wesnoth/PLIST:1.44     Sat Nov 21 16:13:39 2015
+++ pkgsrc/games/wesnoth/PLIST  Sun Jun 24 16:02:50 2018
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.44 2015/11/21 16:13:39 leot Exp $
+@comment $NetBSD: PLIST,v 1.45 2018/06/24 16:02:50 adam Exp $
 bin/wesnoth
 bin/wesnothd
-man/cs/man6/wesnoth.6
 man/cs/man6/wesnothd.6
 man/de/man6/wesnoth.6
 man/de/man6/wesnothd.6
@@ -9,140 +8,124 @@ man/en_GB/man6/wesnoth.6
 man/en_GB/man6/wesnothd.6
 man/es/man6/wesnoth.6
 man/es/man6/wesnothd.6
-man/et/man6/wesnoth.6
 man/et/man6/wesnothd.6
-man/fi/man6/wesnoth.6
 man/fi/man6/wesnothd.6
-man/fr/man6/wesnoth.6
 man/fr/man6/wesnothd.6
 man/gl/man6/wesnoth.6
 man/gl/man6/wesnothd.6
-man/hu/man6/wesnoth.6
 man/hu/man6/wesnothd.6
-man/id/man6/wesnoth.6
 man/id/man6/wesnothd.6
 man/it/man6/wesnoth.6
 man/it/man6/wesnothd.6
+man/ja/man6/wesnoth.6
 man/ja/man6/wesnothd.6
-man/lt/man6/wesnoth.6
 man/lt/man6/wesnothd.6
 man/man6/wesnoth.6
 man/man6/wesnothd.6
-man/pl/man6/wesnoth.6
 man/pl/man6/wesnothd.6
-man/pt/man6/wesnoth.6
 man/pt/man6/wesnothd.6
 man/pt_BR/man6/wesnothd.6
-man/ru/man6/wesnoth.6
 man/ru/man6/wesnothd.6
-man/sk/man6/wesnoth.6
 man/sk/man6/wesnothd.6
-man/sr/man6/wesnoth.6
 man/sr/man6/wesnothd.6
-man/sr@ijekavian/man6/wesnoth.6
 man/sr@ijekavian/man6/wesnothd.6
-man/sr@ijekavianlatin/man6/wesnoth.6
 man/sr@ijekavianlatin/man6/wesnothd.6
-man/sr@latin/man6/wesnoth.6
 man/sr@latin/man6/wesnothd.6
-man/tr/man6/wesnothd.6
-man/uk/man6/wesnoth.6
 man/uk/man6/wesnothd.6
-man/vi/man6/wesnoth.6
 man/vi/man6/wesnothd.6
 man/zh_CN/man6/wesnoth.6
 man/zh_CN/man6/wesnothd.6
 man/zh_TW/man6/wesnothd.6
 ${PLIST.icons}share/applications/wesnoth.desktop
-${PLIST.icons}share/applications/wesnoth_editor.desktop
-share/doc/wesnoth/images/README.txt
-share/doc/wesnoth/images/fr/game-screen-1.11.11.jpg
-share/doc/wesnoth/images/fr/main-menu-1.11.11.jpg
-share/doc/wesnoth/images/fr/multiplayer-1.11.11.jpg
-share/doc/wesnoth/images/fr/recruit-1.11.11.jpg
-share/doc/wesnoth/images/fr/right_pane-1.11.11.jpg
-share/doc/wesnoth/images/fr/top_pane-1.11.11.jpg
-share/doc/wesnoth/images/game-screen-1.11.9.jpg
-share/doc/wesnoth/images/gl/game-screen-1.11.9.jpg
-share/doc/wesnoth/images/gl/main-menu-1.11.9.jpg
-share/doc/wesnoth/images/gl/multiplayer-1.11.9.jpg
-share/doc/wesnoth/images/gl/recruit-1.11.9.jpg
-share/doc/wesnoth/images/gl/right_pane-1.11.9.jpg
-share/doc/wesnoth/images/gl/top_pane-1.11.9.jpg
-share/doc/wesnoth/images/it/game-screen-1.12.4.jpg
-share/doc/wesnoth/images/it/main-menu-1.12.4.jpg
-share/doc/wesnoth/images/it/multiplayer-1.12.4.jpg
-share/doc/wesnoth/images/it/recruit-1.12.4.jpg
-share/doc/wesnoth/images/it/right_pane-1.12.4.jpg
-share/doc/wesnoth/images/it/top_pane-1.12.4.jpg
-share/doc/wesnoth/images/main-menu-1.11.9.jpg
-share/doc/wesnoth/images/multiplayer-1.11.9.jpg
-share/doc/wesnoth/images/orb-black.jpg
-share/doc/wesnoth/images/orb-blue.jpg
-share/doc/wesnoth/images/orb-green.jpg
-share/doc/wesnoth/images/orb-red.jpg
-share/doc/wesnoth/images/orb-yellow.jpg
-share/doc/wesnoth/images/pt/game-screen-1.11.19.jpg
-share/doc/wesnoth/images/pt/main-menu-1.11.19.jpg
-share/doc/wesnoth/images/pt/multiplayer-1.11.19.jpg
-share/doc/wesnoth/images/pt/recruit-1.11.19.jpg
-share/doc/wesnoth/images/pt/right_pane-1.11.19.jpg
-share/doc/wesnoth/images/pt/top_pane-1.11.19.jpg
-share/doc/wesnoth/images/recruit-1.11.9.jpg
-share/doc/wesnoth/images/right_pane-1.11.9.jpg
-share/doc/wesnoth/images/schedule-afternoon.png
-share/doc/wesnoth/images/schedule-dawn.png
-share/doc/wesnoth/images/schedule-dusk.png
-share/doc/wesnoth/images/schedule-firstwatch.png
-share/doc/wesnoth/images/schedule-morning.png
-share/doc/wesnoth/images/schedule-secondwatch.png
-share/doc/wesnoth/images/schedule-underground.png
-share/doc/wesnoth/images/top_pane-1.11.9.jpg
-share/doc/wesnoth/manual.cs.html
-share/doc/wesnoth/manual.de.html
-share/doc/wesnoth/manual.en.html
-share/doc/wesnoth/manual.en_GB.html
-share/doc/wesnoth/manual.es.html
-share/doc/wesnoth/manual.et.html
-share/doc/wesnoth/manual.fi.html
-share/doc/wesnoth/manual.fr.html
-share/doc/wesnoth/manual.gl.html
-share/doc/wesnoth/manual.hu.html
-share/doc/wesnoth/manual.id.html
-share/doc/wesnoth/manual.it.html
-share/doc/wesnoth/manual.ja.html
-share/doc/wesnoth/manual.pl.html
-share/doc/wesnoth/manual.pt.html
-share/doc/wesnoth/manual.pt_BR.html
-share/doc/wesnoth/manual.ru.html
-share/doc/wesnoth/manual.sk.html
-share/doc/wesnoth/manual.sr.html
-share/doc/wesnoth/manual.sr%ijekavian.html@localhost
-share/doc/wesnoth/manual.sr%ijekavianlatin.html@localhost
-share/doc/wesnoth/manual.sr%latin.html@localhost
-share/doc/wesnoth/manual.uk.html
-share/doc/wesnoth/manual.vi.html
-share/doc/wesnoth/manual.zh_CN.html
-share/doc/wesnoth/manual.zh_TW.html
-share/doc/wesnoth/styles/manual.css
-${PLIST.icons}share/pixmaps/wesnoth-icon.png
-${PLIST.icons}share/pixmaps/wesnoth_editor-icon.png
+share/doc/wesnoth/html/images/README.md
+share/doc/wesnoth/html/images/fr/game-screen-1.11.11.jpg
+share/doc/wesnoth/html/images/fr/main-menu-1.11.11.jpg
+share/doc/wesnoth/html/images/fr/multiplayer-1.11.11.jpg
+share/doc/wesnoth/html/images/fr/recruit-1.11.11.jpg
+share/doc/wesnoth/html/images/fr/right_pane-1.11.11.jpg
+share/doc/wesnoth/html/images/fr/top_pane-1.11.11.jpg
+share/doc/wesnoth/html/images/game-screen-1.13.11+dev.jpg
+share/doc/wesnoth/html/images/gl/game-screen-1.13.13+dev.jpg
+share/doc/wesnoth/html/images/gl/main-menu-1.13.13+dev.jpg
+share/doc/wesnoth/html/images/gl/multiplayer-1.13.13+dev.jpg
+share/doc/wesnoth/html/images/gl/recruit-1.13.13+dev.jpg
+share/doc/wesnoth/html/images/gl/right_pane-1.13.13+dev.jpg
+share/doc/wesnoth/html/images/gl/top_pane-1.13.13+dev.jpg
+share/doc/wesnoth/html/images/it/game-screen-1.12.4.jpg
+share/doc/wesnoth/html/images/it/main-menu-1.12.4.jpg
+share/doc/wesnoth/html/images/it/multiplayer-1.12.4.jpg
+share/doc/wesnoth/html/images/it/recruit-1.12.4.jpg
+share/doc/wesnoth/html/images/it/right_pane-1.12.4.jpg
+share/doc/wesnoth/html/images/it/top_pane-1.12.4.jpg
+share/doc/wesnoth/html/images/main-menu-1.13.11+dev.jpg
+share/doc/wesnoth/html/images/multiplayer-1.13.11+dev.png
+share/doc/wesnoth/html/images/orb-blue.jpg
+share/doc/wesnoth/html/images/orb-green.jpg
+share/doc/wesnoth/html/images/orb-none.jpg
+share/doc/wesnoth/html/images/orb-red.jpg
+share/doc/wesnoth/html/images/orb-yellow.jpg
+share/doc/wesnoth/html/images/pt/game-screen-1.11.19.jpg
+share/doc/wesnoth/html/images/pt/main-menu-1.11.19.jpg
+share/doc/wesnoth/html/images/pt/multiplayer-1.11.19.jpg
+share/doc/wesnoth/html/images/pt/recruit-1.11.19.jpg
+share/doc/wesnoth/html/images/pt/right_pane-1.11.19.jpg
+share/doc/wesnoth/html/images/pt/top_pane-1.11.19.jpg
+share/doc/wesnoth/html/images/recruit-1.13.11+dev.png
+share/doc/wesnoth/html/images/right_pane-1.13.11+dev.png
+share/doc/wesnoth/html/images/schedule-afternoon.png
+share/doc/wesnoth/html/images/schedule-dawn.png
+share/doc/wesnoth/html/images/schedule-dusk.png
+share/doc/wesnoth/html/images/schedule-firstwatch.png
+share/doc/wesnoth/html/images/schedule-morning.png
+share/doc/wesnoth/html/images/schedule-secondwatch.png
+share/doc/wesnoth/html/images/schedule-underground.png
+share/doc/wesnoth/html/images/top_pane-1.13.11+dev.png
+share/doc/wesnoth/html/manual.cs.html
+share/doc/wesnoth/html/manual.de.html
+share/doc/wesnoth/html/manual.en.html
+share/doc/wesnoth/html/manual.en_GB.html
+share/doc/wesnoth/html/manual.es.html
+share/doc/wesnoth/html/manual.et.html
+share/doc/wesnoth/html/manual.fi.html
+share/doc/wesnoth/html/manual.fr.html
+share/doc/wesnoth/html/manual.gl.html
+share/doc/wesnoth/html/manual.hu.html
+share/doc/wesnoth/html/manual.id.html
+share/doc/wesnoth/html/manual.it.html
+share/doc/wesnoth/html/manual.ja.html
+share/doc/wesnoth/html/manual.pl.html
+share/doc/wesnoth/html/manual.pt.html
+share/doc/wesnoth/html/manual.pt_BR.html
+share/doc/wesnoth/html/manual.ru.html
+share/doc/wesnoth/html/manual.sk.html
+share/doc/wesnoth/html/manual.sr.html
+share/doc/wesnoth/html/manual.sr%ijekavian.html@localhost
+share/doc/wesnoth/html/manual.sr%ijekavianlatin.html@localhost
+share/doc/wesnoth/html/manual.sr%latin.html@localhost
+share/doc/wesnoth/html/manual.uk.html
+share/doc/wesnoth/html/manual.vi.html
+share/doc/wesnoth/html/manual.zh_CN.html
+share/doc/wesnoth/html/manual.zh_TW.html
+share/doc/wesnoth/html/styles/manual.css
+${PLIST.icons}share/icons/hicolor/128x128/apps/wesnoth-icon.png
+${PLIST.icons}share/icons/hicolor/16x16/apps/wesnoth-icon.png
+${PLIST.icons}share/icons/hicolor/256x256/apps/wesnoth-icon.png
+${PLIST.icons}share/icons/hicolor/32x32/apps/wesnoth-icon.png
+${PLIST.icons}share/icons/hicolor/512x512/apps/wesnoth-icon.png
+${PLIST.icons}share/icons/hicolor/64x64/apps/wesnoth-icon.png
 share/wesnoth/data/COPYING.txt
 share/wesnoth/data/_main.cfg
 share/wesnoth/data/advanced_preferences.cfg
 share/wesnoth/data/ai/ais/ai_default_rca.cfg
-share/wesnoth/data/ai/ais/ai_default_rca_strong.cfg
 share/wesnoth/data/ai/ais/ai_generic_rush.cfg
+share/wesnoth/data/ai/ais/idle_ai.cfg
 share/wesnoth/data/ai/aliases/dev_multiplayer.cfg
 share/wesnoth/data/ai/aliases/dev_singleplayer.cfg
 share/wesnoth/data/ai/aliases/idle.cfg
 share/wesnoth/data/ai/aliases/stable_singleplayer.cfg
-share/wesnoth/data/ai/dev/ai_old_recruitment.cfg
-share/wesnoth/data/ai/dev/akihara_recruitment.cfg
+share/wesnoth/data/ai/dev/ai_default_rca_alternate_recruiting.cfg
 share/wesnoth/data/ai/dev/formula_ai.cfg
 share/wesnoth/data/ai/dev/formula_ai_poisoning.cfg
-share/wesnoth/data/ai/dev/idle_ai.cfg
-share/wesnoth/data/ai/dev/testing_recruiting.cfg
 share/wesnoth/data/ai/formula/level_up_attack_eval.fai
 share/wesnoth/data/ai/formula/level_up_attack_move.fai
 share/wesnoth/data/ai/formula/lib/map_evaluation.fai
@@ -158,6 +141,7 @@ share/wesnoth/data/ai/formula/scouting_e
 share/wesnoth/data/ai/formula/scouting_move.fai
 share/wesnoth/data/ai/lua/ai_helper.lua
 share/wesnoth/data/ai/lua/battle_calcs.lua
+share/wesnoth/data/ai/lua/ca_high_xp_attack.lua
 share/wesnoth/data/ai/lua/cache.lua
 share/wesnoth/data/ai/lua/debug.lua
 share/wesnoth/data/ai/lua/dummy_engine_lua.lua
@@ -169,11 +153,15 @@ share/wesnoth/data/ai/lua/patrol.lua
 share/wesnoth/data/ai/lua/retreat.lua
 share/wesnoth/data/ai/lua/stdlib.lua
 share/wesnoth/data/ai/maps/scenario-AI_Arena_small.map
-share/wesnoth/data/ai/maps/scenario-test_move_to_targets.map
+share/wesnoth/data/ai/micro_ais/cas/ca_assassin_move.lua
 share/wesnoth/data/ai/micro_ais/cas/ca_big_animals.lua
 share/wesnoth/data/ai/micro_ais/cas/ca_bottleneck_attack.lua
 share/wesnoth/data/ai/micro_ais/cas/ca_bottleneck_move.lua
 share/wesnoth/data/ai/micro_ais/cas/ca_coward.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_fast_attack_utils.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_fast_combat.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_fast_combat_leader.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_fast_move.lua
 share/wesnoth/data/ai/micro_ais/cas/ca_forest_animals_move.lua
 share/wesnoth/data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua
 share/wesnoth/data/ai/micro_ais/cas/ca_forest_animals_tusker_attack.lua
@@ -217,6 +205,16 @@ share/wesnoth/data/ai/micro_ais/cas/ca_z
 share/wesnoth/data/ai/micro_ais/engines/lurker_moves.fai
 share/wesnoth/data/ai/micro_ais/engines/priority_target_engine.lua
 share/wesnoth/data/ai/micro_ais/engines/urudin_engine.lua
+share/wesnoth/data/ai/micro_ais/mai-defs/animals.lua
+share/wesnoth/data/ai/micro_ais/mai-defs/bottleneck.lua
+share/wesnoth/data/ai/micro_ais/mai-defs/escort.lua
+share/wesnoth/data/ai/micro_ais/mai-defs/fast.lua
+share/wesnoth/data/ai/micro_ais/mai-defs/guardian.lua
+share/wesnoth/data/ai/micro_ais/mai-defs/healers.lua
+share/wesnoth/data/ai/micro_ais/mai-defs/misc.lua
+share/wesnoth/data/ai/micro_ais/mai-defs/patrol.lua
+share/wesnoth/data/ai/micro_ais/mai-defs/protect.lua
+share/wesnoth/data/ai/micro_ais/mai-defs/recruiting.lua
 share/wesnoth/data/ai/micro_ais/maps/animals.map
 share/wesnoth/data/ai/micro_ais/maps/bottleneck_defense.map
 share/wesnoth/data/ai/micro_ais/maps/goto.map
@@ -226,11 +224,11 @@ share/wesnoth/data/ai/micro_ais/maps/pro
 share/wesnoth/data/ai/micro_ais/micro_ai_helper.lua
 share/wesnoth/data/ai/micro_ais/micro_ai_self_data.lua
 share/wesnoth/data/ai/micro_ais/micro_ai_unit_variables.lua
-share/wesnoth/data/ai/micro_ais/micro_ai_wml_tag.lua
 share/wesnoth/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
 share/wesnoth/data/ai/micro_ais/scenarios/animals.cfg
 share/wesnoth/data/ai/micro_ais/scenarios/bottleneck_defense.cfg
 share/wesnoth/data/ai/micro_ais/scenarios/dragon.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/fast.cfg
 share/wesnoth/data/ai/micro_ais/scenarios/goto.cfg
 share/wesnoth/data/ai/micro_ais/scenarios/guardians.cfg
 share/wesnoth/data/ai/micro_ais/scenarios/hang_out.cfg
@@ -248,11 +246,13 @@ share/wesnoth/data/ai/scenarios/ai_arena
 share/wesnoth/data/ai/scenarios/ai_arena_small/0002-poisoning.cfg
 share/wesnoth/data/ai/scenarios/ai_arena_small/0003-simple_combat.cfg
 share/wesnoth/data/ai/scenarios/ai_arena_small/0004-filtered_combat.cfg
-share/wesnoth/data/ai/scenarios/ai_arena_small/0005-recruitment_test.cfg
 share/wesnoth/data/ai/scenarios/scenario-AI_Arena_small.cfg
-share/wesnoth/data/ai/scenarios/scenario-lua-ai.cfg
-share/wesnoth/data/ai/scenarios/scenario-no_engine.cfg
-share/wesnoth/data/ai/scenarios/scenario-test_move_to_targets.cfg
+share/wesnoth/data/ai/scenarios/scenario-formula-recruitment.cfg
+share/wesnoth/data/ai/scenarios/scenario-formula.cfg
+share/wesnoth/data/ai/scenarios/scenario-high_xp_attack.cfg
+share/wesnoth/data/ai/scenarios/scenario-lua_ai.cfg
+share/wesnoth/data/ai/scenarios/scenario-lua_ai_old_syntax.cfg
+share/wesnoth/data/ai/scenarios/scenario-poisoning.cfg
 share/wesnoth/data/ai/utils/default_config.cfg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/_main.cfg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/campaign_image.png
@@ -260,11 +260,13 @@ share/wesnoth/data/campaigns/An_Orcish_I
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/maps/l10n/de/aoi--overlay.png
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/maps/l10n/gd/aoi--overlay.png
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/maps/l10n/gl/aoi--overlay.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/maps/l10n/it/aoi--overlay.png
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/maps/l10n/lt/aoi--overlay.png
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/maps/l10n/pt/aoi--overlay.png
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/portraits/erlornas.png
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/portraits/linaera.png
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/portraits/lomarfel.png
+share/wesnoth/data/campaigns/An_Orcish_Incursion/images/story.jpg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/maps/01_Defend_the_Forest.map
 share/wesnoth/data/campaigns/An_Orcish_Incursion/maps/02_Assassins.map
 share/wesnoth/data/campaigns/An_Orcish_Incursion/maps/03_Wasteland.map
@@ -280,7 +282,9 @@ share/wesnoth/data/campaigns/An_Orcish_I
 share/wesnoth/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/utils/bigmap.cfg
+share/wesnoth/data/campaigns/An_Orcish_Incursion/utils/characters.cfg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/utils/deaths.cfg
+share/wesnoth/data/campaigns/An_Orcish_Incursion/utils/macros.cfg
 share/wesnoth/data/campaigns/Dead_Water/HISTORY
 share/wesnoth/data/campaigns/Dead_Water/_main.cfg
 share/wesnoth/data/campaigns/Dead_Water/images/attacks/fist-merman.png
@@ -294,6 +298,7 @@ share/wesnoth/data/campaigns/Dead_Water/
 share/wesnoth/data/campaigns/Dead_Water/images/maps/dw.png
 share/wesnoth/data/campaigns/Dead_Water/images/maps/l10n/de/dw--overlay.png
 share/wesnoth/data/campaigns/Dead_Water/images/maps/l10n/gl/dw--overlay.png
+share/wesnoth/data/campaigns/Dead_Water/images/maps/l10n/it/dw--overlay.png
 share/wesnoth/data/campaigns/Dead_Water/images/maps/l10n/pt/dw--overlay.png
 share/wesnoth/data/campaigns/Dead_Water/images/misc/stunned-status-icon.png
 share/wesnoth/data/campaigns/Dead_Water/images/overlays/arcane-icon.png
@@ -301,14 +306,11 @@ share/wesnoth/data/campaigns/Dead_Water/
 share/wesnoth/data/campaigns/Dead_Water/images/overlays/silver-ring-icon.png
 share/wesnoth/data/campaigns/Dead_Water/images/overlays/storm-trident-icon.png
 share/wesnoth/data/campaigns/Dead_Water/images/portraits/brawler.png
+share/wesnoth/data/campaigns/Dead_Water/images/portraits/caladon.png
+share/wesnoth/data/campaigns/Dead_Water/images/portraits/cylanna.png
+share/wesnoth/data/campaigns/Dead_Water/images/portraits/gwabbo.png
 share/wesnoth/data/campaigns/Dead_Water/images/portraits/kai_krellis.png
 share/wesnoth/data/campaigns/Dead_Water/images/portraits/kai_krellis2.png
-share/wesnoth/data/campaigns/Dead_Water/images/portraits/transparent/brawler.png
-share/wesnoth/data/campaigns/Dead_Water/images/portraits/transparent/caladon.png
-share/wesnoth/data/campaigns/Dead_Water/images/portraits/transparent/cylanna.png
-share/wesnoth/data/campaigns/Dead_Water/images/portraits/transparent/gwabbo.png
-share/wesnoth/data/campaigns/Dead_Water/images/portraits/transparent/kai_krellis.png
-share/wesnoth/data/campaigns/Dead_Water/images/portraits/transparent/kai_krellis2.png
 share/wesnoth/data/campaigns/Dead_Water/images/units/merfolk/brawler-defend.png
 share/wesnoth/data/campaigns/Dead_Water/images/units/merfolk/brawler-fist-1.png
 share/wesnoth/data/campaigns/Dead_Water/images/units/merfolk/brawler-fist-2.png
@@ -416,8 +418,6 @@ share/wesnoth/data/campaigns/Dead_Water/
 share/wesnoth/data/campaigns/Dead_Water/utils/items.cfg
 share/wesnoth/data/campaigns/Dead_Water/utils/specials.cfg
 share/wesnoth/data/campaigns/Delfadors_Memoirs/HISTORY
-share/wesnoth/data/campaigns/Delfadors_Memoirs/TODO
-share/wesnoth/data/campaigns/Delfadors_Memoirs/WALKTHROUGH
 share/wesnoth/data/campaigns/Delfadors_Memoirs/_main.cfg
 share/wesnoth/data/campaigns/Delfadors_Memoirs/images/campaign_image.png
 share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-ranged-halo1.png
@@ -432,9 +432,8 @@ share/wesnoth/data/campaigns/Delfadors_M
 share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo6.png
 share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo7.png
 share/wesnoth/data/campaigns/Delfadors_Memoirs/images/halo/wose-stationary-halo8.png
-share/wesnoth/data/campaigns/Delfadors_Memoirs/images/items/ward-circle.png
 share/wesnoth/data/campaigns/Delfadors_Memoirs/images/land-of-the-dead.png
-share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/README
+share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/README.md
 share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/chantal-druid.png
 share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/chantal-shyde.png
 share/wesnoth/data/campaigns/Delfadors_Memoirs/images/portraits/eldred.png
@@ -503,8 +502,6 @@ share/wesnoth/data/campaigns/Delfadors_M
 share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
 share/wesnoth/data/campaigns/Delfadors_Memoirs/scenarios/23_Epilogue.cfg
 share/wesnoth/data/campaigns/Delfadors_Memoirs/sounds/rumble.wav
-share/wesnoth/data/campaigns/Delfadors_Memoirs/terrain-graphics/_final.cfg
-share/wesnoth/data/campaigns/Delfadors_Memoirs/terrain.cfg
 share/wesnoth/data/campaigns/Delfadors_Memoirs/timeline.txt
 share/wesnoth/data/campaigns/Delfadors_Memoirs/units/Journeyman_Mage.cfg
 share/wesnoth/data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg
@@ -526,6 +523,7 @@ share/wesnoth/data/campaigns/Descent_Int
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/maps/did.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/maps/l10n/de/did--overlay.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/maps/l10n/gl/did--overlay.png
+share/wesnoth/data/campaigns/Descent_Into_Darkness/images/maps/l10n/it/did--overlay.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/maps/l10n/lt/did--overlay.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/maps/l10n/pt/did--overlay.png
 share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/book-icon.png
@@ -597,15 +595,14 @@ share/wesnoth/data/campaigns/Descent_Int
 share/wesnoth/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
 share/wesnoth/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
 share/wesnoth/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
-share/wesnoth/data/campaigns/Descent_Into_Darkness/units/apprentice-mage.cfg
-share/wesnoth/data/campaigns/Descent_Into_Darkness/units/apprentice-necromancer.cfg
-share/wesnoth/data/campaigns/Descent_Into_Darkness/units/dark-adept.cfg
-share/wesnoth/data/campaigns/Descent_Into_Darkness/units/dark-mage.cfg
-share/wesnoth/data/campaigns/Descent_Into_Darkness/units/dark-sorcerer.cfg
-share/wesnoth/data/campaigns/Descent_Into_Darkness/units/frontier-baroness.cfg
-share/wesnoth/data/campaigns/Descent_Into_Darkness/units/iceball.cfg
-share/wesnoth/data/campaigns/Descent_Into_Darkness/units/lich.cfg
+share/wesnoth/data/campaigns/Descent_Into_Darkness/units/Apprentice_Mage.cfg
+share/wesnoth/data/campaigns/Descent_Into_Darkness/units/Apprentice_Necromancer.cfg
+share/wesnoth/data/campaigns/Descent_Into_Darkness/units/Dark_Adept.cfg
+share/wesnoth/data/campaigns/Descent_Into_Darkness/units/Dark_Mage.cfg
+share/wesnoth/data/campaigns/Descent_Into_Darkness/units/Dark_Sorcerer.cfg
+share/wesnoth/data/campaigns/Descent_Into_Darkness/units/Frontier_Baroness.cfg
 share/wesnoth/data/campaigns/Descent_Into_Darkness/utils/bigmap.cfg
+share/wesnoth/data/campaigns/Descent_Into_Darkness/utils/characters.cfg
 share/wesnoth/data/campaigns/Descent_Into_Darkness/utils/deaths.cfg
 share/wesnoth/data/campaigns/Descent_Into_Darkness/utils/macros.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/_main.cfg
@@ -616,7 +613,9 @@ share/wesnoth/data/campaigns/Eastern_Inv
 share/wesnoth/data/campaigns/Eastern_Invasion/images/items/horse-cage.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/maps/ei.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/maps/l10n/de/ei--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/maps/l10n/it/ei--overlay.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/maps/l10n/pt/ei--overlay.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/misc/arcane-icon.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/portraits/dacyn.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/portraits/disguise.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/portraits/gweddry.png
@@ -627,6 +626,13 @@ share/wesnoth/data/campaigns/Eastern_Inv
 share/wesnoth/data/campaigns/Eastern_Invasion/images/units/owaec-fighter.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/units/owaec-lord.png
 share/wesnoth/data/campaigns/Eastern_Invasion/images/units/owaec-warrior.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/units/ravanal.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/units/undead-skeletal/boneknight.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/units/undead-skeletal/rider-attack.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/units/undead-skeletal/rider-defend.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/units/undead-skeletal/rider-moving.png
+share/wesnoth/data/campaigns/Eastern_Invasion/images/units/undead-skeletal/rider.png
+share/wesnoth/data/campaigns/Eastern_Invasion/lua/bandits.lua
 share/wesnoth/data/campaigns/Eastern_Invasion/maps/01_The_Outpost.map
 share/wesnoth/data/campaigns/Eastern_Invasion/maps/02_The_Escape_Tunnel.map
 share/wesnoth/data/campaigns/Eastern_Invasion/maps/03_An_Unexpected_Appearance.map
@@ -670,15 +676,21 @@ share/wesnoth/data/campaigns/Eastern_Inv
 share/wesnoth/data/campaigns/Eastern_Invasion/scenarios/17a_The_Duel.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/scenarios/17b_Weldyn_Besieged.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/scenarios/18_Epilogue.cfg
+share/wesnoth/data/campaigns/Eastern_Invasion/units/Bone_Knight.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/units/Lich_Lord.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg
+share/wesnoth/data/campaigns/Eastern_Invasion/units/Skeleton_Rider.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/utils/abilities.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/utils/animations.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/utils/bigmap.cfg
+share/wesnoth/data/campaigns/Eastern_Invasion/utils/character-definitions.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/utils/deaths.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/utils/final_battle.cfg
+share/wesnoth/data/campaigns/Eastern_Invasion/utils/macros.cfg
+share/wesnoth/data/campaigns/Eastern_Invasion/utils/schedule.cfg
+share/wesnoth/data/campaigns/Eastern_Invasion/utils/sound_sources.cfg
 share/wesnoth/data/campaigns/Eastern_Invasion/utils/throneroom.cfg
 share/wesnoth/data/campaigns/Heir_To_The_Throne/_main.cfg
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/campaign_image.png
@@ -687,8 +699,10 @@ share/wesnoth/data/campaigns/Heir_To_The
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/maps/l10n/de/httt--overlay.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/maps/l10n/gd/httt--overlay.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/maps/l10n/gl/httt--overlay.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/maps/l10n/it/httt--overlay.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/maps/l10n/lt/httt--overlay.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/maps/l10n/pt/httt--overlay.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/maps/l10n/zh_CN/httt--overlay.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/portraits/asheviere-defeated.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/portraits/asheviere-mad.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/portraits/asheviere.png
@@ -724,43 +738,65 @@ share/wesnoth/data/campaigns/Heir_To_The
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/story/httt_story6.jpg
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/story/httt_story7.jpg
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/story/httt_story8.jpg
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/story/story6.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/story/story7.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/story/story9.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/gryphon-sleeping.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-attack-1.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-attack-2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-attack-3.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-attack-4.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-attack-5.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-attack-6.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-attack-7.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-attack-8.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-attack-9.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-defend-1.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-defend-2.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-leading.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-scepter-attack-1.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-scepter-attack-2.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-scepter-defend-1.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-scepter-defend-2.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-scepter-leading.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-scepter.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-dodge-1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-dodge-2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-leading-1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-leading-2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess-resting.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-battleprincess.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-attack-1.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-attack-2.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-attack-3.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-attack-4.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-defend.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-1.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-2.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-3.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-4.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-5.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-6.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-leading.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-scepter-defend.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-scepter-leading.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-scepter.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-attack-5.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-attack-6.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-defend-1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-defend-2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-leading-1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess-leading-2.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-princess.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-defend.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-staff-1.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-staff-2.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-staff-3.png
-share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-staff-4.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-attack.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-defend1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-defend2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-10.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-11.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-12.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-13.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-14.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-15.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-16.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-3.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-4.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-5.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-6.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-7.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-8.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-die-9.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-hat-1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-hat-2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-hat-3.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-hat-4.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-hat-5.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-hat-6.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-hat-7.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-hat-8.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-magic-1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-magic-2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen-swoosh.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/human-queen.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/konrad-commander-attack-1.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/konrad-commander-attack-2.png
@@ -807,6 +843,9 @@ share/wesnoth/data/campaigns/Heir_To_The
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/konrad-lord.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/sea-orc-attack.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/sea-orc-defend.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/sea-orc-swim1.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/sea-orc-swim2.png
+share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/sea-orc-swoosh.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/images/units/sea-orc.png
 share/wesnoth/data/campaigns/Heir_To_The_Throne/maps/01_The_Elves_Besieged.map
 share/wesnoth/data/campaigns/Heir_To_The_Throne/maps/02_Blackwater_Port.map
@@ -835,6 +874,7 @@ share/wesnoth/data/campaigns/Heir_To_The
 share/wesnoth/data/campaigns/Heir_To_The_Throne/maps/22_Return_to_Wesnoth.map
 share/wesnoth/data/campaigns/Heir_To_The_Throne/maps/23_Test_of_the_Clans.map
 share/wesnoth/data/campaigns/Heir_To_The_Throne/maps/24_Battle_for_Wesnoth.map
+share/wesnoth/data/campaigns/Heir_To_The_Throne/masks/17_Scepter_of_Fire.mask
 share/wesnoth/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
 share/wesnoth/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
 share/wesnoth/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
@@ -880,10 +920,10 @@ share/wesnoth/data/campaigns/Heir_To_The
 share/wesnoth/data/campaigns/Heir_To_The_Throne/utils/intro.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/HISTORY
 share/wesnoth/data/campaigns/Legend_of_Wesmere/_main.cfg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/ai/patrol.fai
 share/wesnoth/data/campaigns/Legend_of_Wesmere/chapters.txt
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/campaign_image.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/de/low-map--overlay.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/it/low-map--overlay.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/pt/low-map--overlay.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/low-map.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/aldar.png
@@ -908,8 +948,9 @@ share/wesnoth/data/campaigns/Legend_of_W
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/characters/lord.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/characters/olurf.png
 share/wesnoth/data/campaigns/Legend_of_Wesmere/images/story/characters/uradredia.png
-share/wesnoth/data/campaigns/Legend_of_Wesmere/lua/label.lua
-share/wesnoth/data/campaigns/Legend_of_Wesmere/lua/replace_map.lua
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/units/monsters/great-ogre.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/images/units/ogres/great-ogre.png
+share/wesnoth/data/campaigns/Legend_of_Wesmere/lua/wml_tags.lua
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/02_Hostile_Mountains.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/04_The_Elvish_Treasury.map
 share/wesnoth/data/campaigns/Legend_of_Wesmere/maps/06_Acquaintance_in_Need.map
@@ -932,8 +973,6 @@ share/wesnoth/data/campaigns/Legend_of_W
 share/wesnoth/data/campaigns/Legend_of_Wesmere/masks/19_Costly_Revenge.mask
 share/wesnoth/data/campaigns/Legend_of_Wesmere/masks/21_Elvish_Assassins.mask
 share/wesnoth/data/campaigns/Legend_of_Wesmere/masks/22_Northern_Battle.mask
-share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/North_elves_utils.cfg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/_main.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
@@ -941,7 +980,6 @@ share/wesnoth/data/campaigns/Legend_of_W
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand_utils.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
@@ -951,7 +989,6 @@ share/wesnoth/data/campaigns/Legend_of_W
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/15_The_Treaty.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die_utils.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/18_Hour_of_Glory.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
@@ -960,13 +997,11 @@ share/wesnoth/data/campaigns/Legend_of_W
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/24_Epilogue.cfg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/units/Horse_Archer.cfg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/_main.cfg
+share/wesnoth/data/campaigns/Legend_of_Wesmere/units/ogres/Great_Ogre.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/abilities.cfg
+share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/bigmap.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/characters.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/deaths.cfg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/debug.cfg
-share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/journey.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
 share/wesnoth/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg
 share/wesnoth/data/campaigns/Liberty/_main.cfg
@@ -984,7 +1019,9 @@ share/wesnoth/data/campaigns/Liberty/ima
 share/wesnoth/data/campaigns/Liberty/images/halo/shadow-mage-halo9.png
 share/wesnoth/data/campaigns/Liberty/images/maps/l10n/de/liberty--overlay.png
 share/wesnoth/data/campaigns/Liberty/images/maps/l10n/gl/liberty--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/it/liberty--overlay.png
 share/wesnoth/data/campaigns/Liberty/images/maps/l10n/pt/liberty--overlay.png
+share/wesnoth/data/campaigns/Liberty/images/maps/l10n/zh_CN/liberty--overlay.png
 share/wesnoth/data/campaigns/Liberty/images/maps/liberty.png
 share/wesnoth/data/campaigns/Liberty/images/portraits/baldras.png
 share/wesnoth/data/campaigns/Liberty/images/portraits/dommel.png
@@ -1003,6 +1040,12 @@ share/wesnoth/data/campaigns/Liberty/ima
 share/wesnoth/data/campaigns/Liberty/images/story/frontier.jpg
 share/wesnoth/data/campaigns/Liberty/images/story/island.jpg
 share/wesnoth/data/campaigns/Liberty/images/story/return_to_Dallben_and_Delwyn.jpg
+share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/rogue-mage-defend1.png
+share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/rogue-mage-defend2.png
+share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/rogue-mage-melee1.png
+share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/rogue-mage-melee2.png
+share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/rogue-mage-melee3.png
+share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/rogue-mage-melee4.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/rogue-mage.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-lord-1.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-lord-2.png
@@ -1011,12 +1054,16 @@ share/wesnoth/data/campaigns/Liberty/ima
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-lord-5.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-lord-6.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-lord-7.png
+share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-lord-defend1.png
+share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-lord-defend2.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-lord.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-mage-1.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-mage-2.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-mage-3.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-mage-4.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-mage-5.png
+share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-mage-defend1.png
+share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-mage-defend2.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-outlaws/shadow-mage.png
 share/wesnoth/data/campaigns/Liberty/images/units/human-peasants/female+senior-village-elder.png
 share/wesnoth/data/campaigns/Liberty/images/units/undead-skeletal/boneknight.png
@@ -1058,11 +1105,16 @@ share/wesnoth/data/campaigns/Liberty/uti
 share/wesnoth/data/campaigns/Liberty/utils/utils.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/_main.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/images/campaign_image.jpg
+share/wesnoth/data/campaigns/Northern_Rebirth/images/ellipse/unprivileged-leader-bottom.png
+share/wesnoth/data/campaigns/Northern_Rebirth/images/ellipse/unprivileged-leader-selected-bottom.png
+share/wesnoth/data/campaigns/Northern_Rebirth/images/ellipse/unprivileged-leader-selected-top.png
+share/wesnoth/data/campaigns/Northern_Rebirth/images/ellipse/unprivileged-leader-top.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/floor-corpse.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/hatchling.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/maps/l10n/de/nr--overlay.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/maps/l10n/gd/nr--overlay.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/maps/l10n/gl/nr--overlay.png
+share/wesnoth/data/campaigns/Northern_Rebirth/images/maps/l10n/it/nr--overlay.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/maps/l10n/lt/nr--overlay.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/maps/l10n/pt/nr--overlay.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/maps/nr.png
@@ -1081,11 +1133,14 @@ share/wesnoth/data/campaigns/Northern_Re
 share/wesnoth/data/campaigns/Northern_Rebirth/images/portraits/Stalrag.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/portraits/Tallin-Evil.png
 share/wesnoth/data/campaigns/Northern_Rebirth/images/portraits/Tallin.png
+share/wesnoth/data/campaigns/Northern_Rebirth/lua/respawn_utils.lua
 share/wesnoth/data/campaigns/Northern_Rebirth/maps/01_Breaking_the_Chains.map
-share/wesnoth/data/campaigns/Northern_Rebirth/maps/02_Infested_Caves.map
+share/wesnoth/data/campaigns/Northern_Rebirth/maps/02_01_Infested_Caves.map
+share/wesnoth/data/campaigns/Northern_Rebirth/maps/02_02_Meeting_With_Dwarves.map
 share/wesnoth/data/campaigns/Northern_Rebirth/maps/03_To_the_Mines.map
 share/wesnoth/data/campaigns/Northern_Rebirth/maps/04_Clearing_the_Mines.map
-share/wesnoth/data/campaigns/Northern_Rebirth/maps/05a_The_Pursuit.map
+share/wesnoth/data/campaigns/Northern_Rebirth/maps/05a_01_The_Pursuit.map
+share/wesnoth/data/campaigns/Northern_Rebirth/maps/05a_02_Dealings.map
 share/wesnoth/data/campaigns/Northern_Rebirth/maps/05b_Compelled.map
 share/wesnoth/data/campaigns/Northern_Rebirth/maps/06a_Old_Friend.map
 share/wesnoth/data/campaigns/Northern_Rebirth/maps/06b_Slave_of_the_Undead.map
@@ -1101,10 +1156,12 @@ share/wesnoth/data/campaigns/Northern_Re
 share/wesnoth/data/campaigns/Northern_Rebirth/maps/13a_Showdown.map
 share/wesnoth/data/campaigns/Northern_Rebirth/maps/14a_Epilogue.map
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
-share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
+share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
+share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/02_02_Meeting_With_Dwarves.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
-share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
+share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
+share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/06b_Slave_of_the_Undead.cfg
@@ -1119,8 +1176,10 @@ share/wesnoth/data/campaigns/Northern_Re
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
+share/wesnoth/data/campaigns/Northern_Rebirth/sounds/gate-fall.ogg
 share/wesnoth/data/campaigns/Northern_Rebirth/units/Cave_Serpent.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/utils/bigmap.cfg
+share/wesnoth/data/campaigns/Northern_Rebirth/utils/characters.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
 share/wesnoth/data/campaigns/Northern_Rebirth/utils/utils.cfg
 share/wesnoth/data/campaigns/Sceptre_of_Fire/_main.cfg
@@ -1129,6 +1188,7 @@ share/wesnoth/data/campaigns/Sceptre_of_
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/items/gold.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/maps/l10n/de/sof--overlay.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/maps/l10n/gl/sof--overlay.png
+share/wesnoth/data/campaigns/Sceptre_of_Fire/images/maps/l10n/it/sof--overlay.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/maps/l10n/pt/sof--overlay.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/maps/sof.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/misc/coal-icon.png
@@ -1163,6 +1223,14 @@ share/wesnoth/data/campaigns/Sceptre_of_
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/terrain/gate-right-rising-3.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/terrain/gate-right-up.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/caravan.png
+share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-1.png
+share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-2.png
+share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-3.png
+share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-4.png
+share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-5.png
+share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-6.png
+share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-1.png
+share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-2.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-laden.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner.png
 share/wesnoth/data/campaigns/Sceptre_of_Fire/images/units/heroes/haldric-ii-defend.png
@@ -1212,6 +1280,263 @@ share/wesnoth/data/campaigns/Sceptre_of_
 share/wesnoth/data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg
 share/wesnoth/data/campaigns/Sceptre_of_Fire/utils/bigmap.cfg
 share/wesnoth/data/campaigns/Sceptre_of_Fire/utils/utils.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/_main.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/altar-sacrifice.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/bird-bones.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/boat.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/coal.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/coffin-dwarf-back.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/coffin-dwarf.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/debris1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/debris2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/debris3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/dirt.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/dirt1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/door-open-bottom.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/door-open-top.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/gold-coins-message.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/gold-coins.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/gold.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/gravestone1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/gravestone2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/gravestone3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/trap-doors-closed.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/items/trap-doors-open.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/logo.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/map-border.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/ardonna-lich.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/ardonna.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/bone-captain1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/bone-captain2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/campaign-image.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/captain.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/crelanu.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/orcish-shaman.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/shynal-adept.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/shynal-outlaw.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/portraits/zombie-farmer.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/alduin-dock.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/battle.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/becalmed.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/black-background.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/blackwater.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/book.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/cave-glow.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/cemetery.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/elf-road.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/ford-of-abez-1.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/ford-of-abez-2.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/mountain-pass.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/room1.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/room2.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/room3.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/room4.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/story/trackless-wilds.jpg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-a1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-a2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-a3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-a4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-b1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-b2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-b3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-b4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-blank.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-c1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-c2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-c3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-c4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-d1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-d2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-d3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-d4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-e1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-e2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-e3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-e4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-f1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-f2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-f3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-f4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-g1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-g2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-g3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-g4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/crystal-caves/glint-tile.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/fence-bottom.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/fence-tile.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/fence-top.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/gate-closed.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/gate-open.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/gate-tile.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/grave-overlay-editor.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/grave-tile.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/not-here-tile-editor.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/not-here-tile.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/passageway-north.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/passageway-south.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/README.md
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/bits-and-pieces.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/editor_tiles/forecastle-deck.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/editor_tiles/hull.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/editor_tiles/lower-deck-edge.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/editor_tiles/lower-deck.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/editor_tiles/main-deck.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/editor_tiles/pieces.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/editor_tiles/poop-deck.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/editor_tiles/railing.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/editor_tiles/rigging-and-sails.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/forecastle.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/hull.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/lower-deck-edge.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/lower-deck.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/main-deck.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/poop-deck.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/railing-piece.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/railing.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/rigging-and-sails.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/tile--deck.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/ship/tile--transparent.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web-tile.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web1-bottom.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web2-bottom.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web5.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web6-bottom.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web6.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web7-bottom.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web7.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/spiderweb/web8.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/void-full.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/terrain/void-half.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/ancient-lich/ancient-lich-defend.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/ancient-lich/ancient-lich-magic.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/ancient-lich/ancient-lich-melee.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/ancient-lich/ancient-lich.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/bone-bird.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/bone-captain.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-attack-1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-attack-2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-attack-3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-attack-4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-attack-5.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-attack-6.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-attack-7.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-attack-8.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-attack-9.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-defend-1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-defend-2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-ranged-1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent-ranged-2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/delinquent.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/zombie-shynal-attack-n.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/zombie-shynal-attack-s.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/zombie-shynal-attack.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/zombie-shynal-defend.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/zombie-shynal-die-1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/zombie-shynal-die-2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/zombie-shynal-die-3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/zombie-shynal-die-4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/delinquent/zombie-shynal.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/dunefolk.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-3.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-4.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-5.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-6.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/icons/icon-lich.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/icons/icon-skeleton.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/icons/icon-skeleton_archer.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/icons/icon-walking_corpse.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/leech-giant.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/noble.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/orcish-shaman-defend-1.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/orcish-shaman-defend-2.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/orcish-shaman-magic.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/orcish-shaman.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/rastabahn-on-altar.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/sailor.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/sea-captain.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/skeleton-se-sacrifice5.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/skeleton-se-sacrifice6.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/images/units/skeleton-se-sacrifice7.png
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/01_Slipping_Away.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/02_Dark_Business.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/03_Bandits.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/04_Becalmed.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/05_Blackwater.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/06_Following_the_Shadow.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/07_Meeting_of_the_Minds.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/08_Carcyn.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/09_Training_Session.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/10_Merfolk_Revenge.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/11_Battleground.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/12_Walking_Trees.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/13_Together_Again.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/14_Entering_the_Northlands.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/15_Mountain_Pass.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/16_The_Mage.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/17_Mortality.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/18_Abandoned_Outpost.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/19_Lava_and_Stone.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/20_North_Knalga.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/maps/21_Against_the_World.map
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/01_Slipping_Away.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/03_Bandits.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/04_Becalmed.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/05_Blackwater.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/07_Meeting_of_the_Minds.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/08_Carcyn.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/09_Training_Session.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/10_Merfolk_Revenge.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/11_Battleground.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/12_Walking_Trees.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/13_Together_Again.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/14_Entering_the_Northlands.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/15_Mountain_Pass.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/16_The_Mage.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/17_Mortality.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/18_Abandoned_Outpost.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/19_Lava_and_Stone.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/20_North_Knalga.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/scenarios/22_Epilogue.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Bat_Blood.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Bat_Dread.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Bat_Vampire.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Bone_Bird.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Bone_Captain.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Corpse_Shynal.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Delinquent.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Dummy.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Dunefolk.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Dwarvish_Miner.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Necro_Ancient_Lich.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Necro_Dark_Adept.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Necro_Dark_Sorcerer.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Necro_Lich.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Necro_Sacrifice.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Necromancer.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Noble.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Orcish_Shaman.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Ruffian.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Sailor.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Sea_Captain.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/units/Skele_Sacrifice.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/utils/journey_chapter1.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/utils/journey_chapter2.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/utils/journey_chapter3.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/utils/terrain.cfg
+share/wesnoth/data/campaigns/Secrets_of_the_Ancients/utils/terrain_graphics.cfg
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/_main.cfg
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/ai/ca_transport_S6.lua
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/campaign_image.png
@@ -1222,6 +1547,7 @@ share/wesnoth/data/campaigns/Son_Of_The_
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/items/barrel-floating.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/de/sotbe--overlay.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/gl/sotbe--overlay.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/it/sotbe--overlay.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/pt/sotbe--overlay.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/maps/sotbe.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/portraits/albrock.png
@@ -1237,8 +1563,17 @@ share/wesnoth/data/campaigns/Son_Of_The_
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/portraits/orcish_shaman.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/portraits/shan_taum.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/portraits/young_orcish_shaman.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/elder-orcish-shaman-defend-1.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/elder-orcish-shaman-defend-2.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/elder-orcish-shaman-magic.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/elder-orcish-shaman.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/novice-orcish-shaman-defend-1.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/novice-orcish-shaman-defend-2.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/novice-orcish-shaman-magic.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/novice-orcish-shaman.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/orcish-shaman-defend-1.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/orcish-shaman-defend-2.png
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/orcish-shaman-magic.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/images/units/orcish-shaman.png
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/maps/01_End_of_Peace.map
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye/maps/03_Toward_Mountains_of_Haag.map
@@ -1303,8 +1638,10 @@ share/wesnoth/data/campaigns/The_Hammer_
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/halo/karrag_halo.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/de/thot--overlay.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/gl/thot--overlay.png
+share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/it/thot--overlay.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/pt/thot--overlay.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/maps/thot.png
+share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/misc/righteous-flame-icon.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/portraits/aiglondur.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/portraits/angarthing.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/portraits/dulcatulos.png
@@ -1329,7 +1666,6 @@ share/wesnoth/data/campaigns/The_Hammer_
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/annalist-attack9.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/annalist-defend1.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/annalist-defend2.png
-share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/annalist-defend3.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/annalist-lead.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/annalist-ranged1.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/annalist-ranged2.png
@@ -1342,9 +1678,9 @@ share/wesnoth/data/campaigns/The_Hammer_
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/karrag-ranged1.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/karrag-ranged2.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/karrag-ranged3.png
+share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/karrag-unmasked.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/karrag.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-attack1.png
-share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-attack10.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-attack2.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-attack3.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-attack4.png
@@ -1355,7 +1691,6 @@ share/wesnoth/data/campaigns/The_Hammer_
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-attack9.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-defend1.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-defend2.png
-share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-defend3.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-lead.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-ranged1.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/loremaster-ranged2.png
@@ -1421,7 +1756,6 @@ share/wesnoth/data/campaigns/The_Hammer_
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/masked_thunderguard-melee2.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/masked_thunderguard.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-attack1.png
-share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-attack10.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-attack2.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-attack3.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-attack4.png
@@ -1432,11 +1766,11 @@ share/wesnoth/data/campaigns/The_Hammer_
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-attack9.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-defend1.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-defend2.png
-share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-defend3.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-lead.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-ranged1.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness-ranged2.png
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/images/units/witness.png
+share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/lua/spawns.lua
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/maps/01_At_the_East_Gate.map
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/maps/02_Reclaiming_the_Past.map
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/maps/03_Strange_Allies.map
@@ -1449,6 +1783,7 @@ share/wesnoth/data/campaigns/The_Hammer_
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/maps/10_The_Siege_of_Kal_Kartha.map
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/maps/11_The_Court_of_Karrag.map
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/maps/12_The_Underlevels.map
+share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/maps/13_Epilogue.map
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
@@ -1462,6 +1797,7 @@ share/wesnoth/data/campaigns/The_Hammer_
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/scenarios/13_Epilogue.cfg
+share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/sounds/unlock.ogg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Dragonguard.cfg
@@ -1477,6 +1813,7 @@ share/wesnoth/data/campaigns/The_Hammer_
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/utils/abilities.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/utils/bigmap.cfg
+share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/utils/characters.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg
 share/wesnoth/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg
@@ -1486,6 +1823,7 @@ share/wesnoth/data/campaigns/The_Rise_Of
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/maps/great_continent.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/maps/green_isle.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/maps/l10n/de/green_isle--overlay.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/maps/l10n/it/green_isle--overlay.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/maps/l10n/pt/green_isle--overlay.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/misc/treaty-icon.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/addroran.png
@@ -1515,26 +1853,44 @@ share/wesnoth/data/campaigns/The_Rise_Of
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/shekkahan.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/tinry.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/typhon.png
-share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/fall_of_eldaric.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/es/trow-logo.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/trow-logo.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/trow-logo.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/trow-logo.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/it/trow-logo.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/la/trow-logo.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/lt/trow-logo.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/nl/trow-logo.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/pt/trow-logo.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/vi/trow-logo.png
-share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/prince_finds_wesnoth.png
-share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/rough_landing.png
-share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/story1.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow-logo.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_01.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_02.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_03.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_04.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_05.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_06.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_07.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_08.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_09.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_10.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_01-A_Summer_of_Storms.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_02-The_Fall.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_03-A_Harrowing_Escape.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_04-Fall_of_Eldaric.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_04a-The_Swamp_of_Esten.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_04b-The_Midlands.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_06-Temple_in_the_Deep.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_13-Peoples_in_Decline.jpg
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_15-A_New_Land.jpg
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/autumn-shyde.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/familiar-1.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/familiar-2.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/familiar-3.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/familiar-4.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/familiar-5.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/jevyan-cloaked.png
+share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/jevyan.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/kalian-elvish-champion.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/noble-commander-bow-1.png
 share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/units/noble-commander-bow-2.png
@@ -1716,6 +2072,7 @@ share/wesnoth/data/campaigns/The_South_G
 share/wesnoth/data/campaigns/The_South_Guard/images/maps/l10n/de/tsg--overlay.png
 share/wesnoth/data/campaigns/The_South_Guard/images/maps/l10n/gd/tsg--overlay.png
 share/wesnoth/data/campaigns/The_South_Guard/images/maps/l10n/gl/tsg--overlay.png
+share/wesnoth/data/campaigns/The_South_Guard/images/maps/l10n/it/tsg--overlay.png
 share/wesnoth/data/campaigns/The_South_Guard/images/maps/l10n/lt/tsg--overlay.png
 share/wesnoth/data/campaigns/The_South_Guard/images/maps/l10n/pt/tsg--overlay.png
 share/wesnoth/data/campaigns/The_South_Guard/images/maps/tsg.png
@@ -1787,7 +2144,9 @@ share/wesnoth/data/campaigns/Two_Brother
 share/wesnoth/data/campaigns/Two_Brothers/images/campaign_image.png
 share/wesnoth/data/campaigns/Two_Brothers/images/maps/l10n/de/tb--overlay.png
 share/wesnoth/data/campaigns/Two_Brothers/images/maps/l10n/gl/tb--overlay.png
+share/wesnoth/data/campaigns/Two_Brothers/images/maps/l10n/it/tb--overlay.png
 share/wesnoth/data/campaigns/Two_Brothers/images/maps/l10n/pt/tb--overlay.png
+share/wesnoth/data/campaigns/Two_Brothers/images/maps/l10n/zh_CN/tb--overlay.png
 share/wesnoth/data/campaigns/Two_Brothers/images/maps/tb.png
 share/wesnoth/data/campaigns/Two_Brothers/images/portraits/arvith.png
 share/wesnoth/data/campaigns/Two_Brothers/images/portraits/baran.png
@@ -1805,11 +2164,19 @@ share/wesnoth/data/campaigns/Two_Brother
 share/wesnoth/data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg
 share/wesnoth/data/campaigns/Two_Brothers/scenarios/05_Epilogue.cfg
 share/wesnoth/data/campaigns/Two_Brothers/utils/bigmap.cfg
+share/wesnoth/data/campaigns/Two_Brothers/utils/characters.cfg
+share/wesnoth/data/campaigns/Two_Brothers/utils/macros.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/TODO
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/_main.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/blowgun.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/claws-crab.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/energyray.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/fangs-ant.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/fangs-horror.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/fist-golem.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/leader.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/sand-storm.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/twister.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/campaign_image.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/kaleh-dead.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/magiccircle-n.png
@@ -1825,26 +2192,45 @@ share/wesnoth/data/campaigns/Under_the_B
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/rune2-burning.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/rune3-burning.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/rune4-burning.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/misc/dazed-status-icon.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/misc/dehydration-icon.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/misc/dehydration-status.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/misc/kaleh_story.jpg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/misc/night_of_fallen_stars.jpg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/misc/stunned-status-icon.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/cloaked.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/eloh.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/eloh_rage.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/elyssa.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/elyssa_silver.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/esanoo.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/garak.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/grog.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/kaleh.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/melusand.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/naga-with-bow.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/monsters/giant_ant.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/naga-hunter.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/nym.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/rogrimir.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/nym_moody.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/archer.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/champion.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/druid.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/fighter.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/flanker.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/marksman.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/mystic.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/outrider.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/pathfinder.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/ranger.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/scout.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/shaman.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/shyde.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/sun_singer.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/sun_sylph.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/tauroch_flagbearer.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/tauroch_protector.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/tauroch_rider.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/tauroch_stalwart.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/tauroch_vanguard.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/warrior.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/uncloaked.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/zhul.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/portraits/zhul_shyde.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/projectiles/sand-storm-1.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/projectiles/sand-storm-2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/projectiles/sand-storm-3.png
@@ -1855,6 +2241,7 @@ share/wesnoth/data/campaigns/Under_the_B
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/projectiles/sand-storm-8.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/terrain/dark-keep-throne.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/terrain/darkcastle.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/terrain/great-tree-smashed.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/alien/core-compact.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small-defend.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small-melee1.png
@@ -1863,352 +2250,15 @@ share/wesnoth/data/campaigns/Under_the_B
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small-ranged2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/alien/spire.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-5.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-6.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-sword.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-sword-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-sword.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-leading.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-melee-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-melee-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-5.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-6.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/corrupted-elf-attack.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/corrupted-elf-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/corrupted-elf.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-attack.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-defend-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-defend-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-magic-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-magic-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-magic-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-magic-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/eloh-serene.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-10.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-11.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-12.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-5.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-6.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-7.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-8.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-9.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-melee-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-melee-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-melee-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-melee-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-melee-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-melee-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-melee.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-moving.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-ranged-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-ranged-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-leading.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-melee-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-melee-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-die-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-die-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-die-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-sword-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-sword.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-die-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-die-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-die-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-die-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-die-5.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-sword-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-sword.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-leading.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-melee-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-melee-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-melee-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-melee-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-ranged-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-ranged-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-ranged-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-melee-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-melee-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-moving.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/prowler+female.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/prowler.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-sword.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-sword-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-sword.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-melee-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-melee-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-moving.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-attack.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-10.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-11.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-12.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-13.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-14.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-15.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-16.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-5.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-6.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-7.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-8.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-9.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-moving.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sentinel+female.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sentinel.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-attack.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal5.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal6.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal7.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal8.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal9.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-attack5.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-sword-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-sword.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-attack5.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-sword-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-sword-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-sword-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-sword-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-sword.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-ftouch-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-ftouch-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-ftouch-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing10.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing11.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing12.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing5.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing6.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing7.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing8.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing9.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/humans/human-commander-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/humans/human-commander-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/humans/human-commander-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/humans/human-commander-ranged1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/humans/human-commander-ranged2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/humans/human-commander.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/ant-attack.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/ant-defend.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/ant.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/crab-attack1.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/crab-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/crab-defend.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/crab-attack3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/crab-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/crab-defend2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/crab.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/dawarf-growl.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/dawarf-melee-1.png
@@ -2218,32 +2268,52 @@ share/wesnoth/data/campaigns/Under_the_B
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/demon-attack-2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/demon-attack-3.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/demon-defend.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/demon-defend2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/demon.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/dust-devil.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-attack-1.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-attack-2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-attack-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-attack-b1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-attack-b2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-attack-b3.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-defend.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-swoosh-b.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem-swoosh.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/monsters/flesh-golem.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-4.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-1.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-5.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-defend-both.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-defend-melee.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-moving-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-moving-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-moving-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-ranged-1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-ranged-2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-ranged-3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-ranged-4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-ranged-5.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-ranged-6.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-5.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-6.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-defend.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-melee-defend.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/orcs/nightblade-attack-se-1.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/orcs/nightblade-attack-se-2.png
@@ -2271,17 +2341,144 @@ share/wesnoth/data/campaigns/Under_the_B
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/orcs/nightblade-throw-se-7.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/orcs/nightblade-throw-se-8.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/orcs/nightblade-throw-se-9.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/corrupted-elf.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/dustbok.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/eloh.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-attack1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-attack2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-attack3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-attack4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-attack5.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-defend-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-defend-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fire/flame-color.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fire/flame-mask.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flagbearer.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bow-defend-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bow-defend-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bow.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-defend-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-defend-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-lead1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-lead2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword5.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword6.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword7.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/marksman.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic-defend-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic-defend-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic-heal-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic-heal-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic-heal-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic-heal-4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic-heal-5.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic-heal-6.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic-heal-7.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic-heal-8.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/mystic/mystic.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bolas1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bolas2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bolas3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bolas4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bow-defend-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bow-defend-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bow.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-defend-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-defend-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-lead1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-lead2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword5.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword6.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword7.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/outrider-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/outrider-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/outrider.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/pathfinder-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/pathfinder-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/pathfinder.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/protector.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/rider.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/scout-defend-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/scout-defend-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/scout.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/shaman-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/shaman-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/shaman.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/shyde.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/stalwart.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-backglow.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-heal-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-heal-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-heal-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-heal-4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-heal-5.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-heal-6.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-heal-7.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-heal-8.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-stand.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-backglow.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-def-flare.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly-defend1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly-defend2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly4.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly5.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly6.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-stand.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/vanguard.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/warrior-defend-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/warrior-defend-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/warrior.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-attack.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-defend.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-moving.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dread-lich-attack.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dread-lich-attack1.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dread-lich-attack2.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dread-lich-attack3.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dread-lich-attack4.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dread-lich-defend.png
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/dread-lich.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/spider-lich-defend.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/spider-lich-magic-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/spider-lich-magic-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/spider-lich-magic-3.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/spider-lich-melee-1.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/spider-lich-melee-2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/units/undead/spider-lich.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/lua/theme.lua
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/maps/01_The_Morning_After.map
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/maps/02_Across_the_Harsh_Sands.map
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/maps/03_A_Stirring_in_the_Night.map
@@ -2312,32 +2509,9 @@ share/wesnoth/data/campaigns/Under_the_B
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Corrupted_Elf.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Archer.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Avenger.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Captain.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Champion.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Druid.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Fighter.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Hero.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Horseman.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Hunter.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marksman.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marshal.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Outrider.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Prowler.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Ranger.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Rider.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Scout.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Sentinel.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shaman.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Sharpshooter.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Star.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Divine_Avatar.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Divine_Incarnation.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/elves/Nym.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/sounds/tauroch-hit-1.ogg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/sounds/tauroch-hit-2.ogg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/sounds/tauroch-hit-3.ogg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Minion.cfg
@@ -2359,6 +2533,32 @@ share/wesnoth/data/campaigns/Under_the_B
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin1.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin2.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin3.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Corrupted_Elf.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Avatar.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Incarnation.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Dustbok.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flagbearer.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Marksman.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Mystic.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Outrider.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Pathfinder.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Protector.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Rider.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Scout.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Shaman.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Shyde.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Stalwart.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Sylph.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Vanguard.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Warrior.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Ghost.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Nightgaunt.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/undead/Ethereal_Shadow.cfg
@@ -2369,15 +2569,18 @@ share/wesnoth/data/campaigns/Under_the_B
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/undead/Undead_Horseman.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/units/units.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/animation_macros.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/character-definitions.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/deaths.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/dialog-macros.cfg
-share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/garak-abilities.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/storytxt.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg
+share/wesnoth/data/campaigns/tutorial/_main.cfg
+share/wesnoth/data/campaigns/tutorial/images/misc/highlight-hex.png
 share/wesnoth/data/campaigns/tutorial/images/portraits/delfador.png
 share/wesnoth/data/campaigns/tutorial/images/portraits/konrad.png
 share/wesnoth/data/campaigns/tutorial/images/portraits/lisar.png
@@ -2385,34 +2588,32 @@ share/wesnoth/data/campaigns/tutorial/im
 share/wesnoth/data/campaigns/tutorial/images/units/human-princess-attack-2.png
 share/wesnoth/data/campaigns/tutorial/images/units/human-princess-attack-3.png
 share/wesnoth/data/campaigns/tutorial/images/units/human-princess-attack-4.png
-share/wesnoth/data/campaigns/tutorial/images/units/human-princess-defend.png
-share/wesnoth/data/campaigns/tutorial/images/units/human-princess-idle-1.png
-share/wesnoth/data/campaigns/tutorial/images/units/human-princess-idle-2.png
-share/wesnoth/data/campaigns/tutorial/images/units/human-princess-idle-3.png
-share/wesnoth/data/campaigns/tutorial/images/units/human-princess-idle-4.png
-share/wesnoth/data/campaigns/tutorial/images/units/human-princess-idle-5.png
-share/wesnoth/data/campaigns/tutorial/images/units/human-princess-idle-6.png
+share/wesnoth/data/campaigns/tutorial/images/units/human-princess-attack-5.png
+share/wesnoth/data/campaigns/tutorial/images/units/human-princess-attack-6.png
+share/wesnoth/data/campaigns/tutorial/images/units/human-princess-defend-1.png
+share/wesnoth/data/campaigns/tutorial/images/units/human-princess-defend-2.png
 share/wesnoth/data/campaigns/tutorial/images/units/human-princess.png
 share/wesnoth/data/campaigns/tutorial/images/units/konrad-fighter-attack-1.png
 share/wesnoth/data/campaigns/tutorial/images/units/konrad-fighter-attack-2.png
 share/wesnoth/data/campaigns/tutorial/images/units/konrad-fighter-defend.png
 share/wesnoth/data/campaigns/tutorial/images/units/konrad-fighter.png
-share/wesnoth/data/campaigns/tutorial/images/units/quintain-attack1.png
-share/wesnoth/data/campaigns/tutorial/images/units/quintain-attack2.png
 share/wesnoth/data/campaigns/tutorial/images/units/quintain.png
-share/wesnoth/data/campaigns/tutorial/maps/2_Tutorial.map
-share/wesnoth/data/campaigns/tutorial/scenarios/1_Tutorial.cfg
-share/wesnoth/data/campaigns/tutorial/scenarios/2_Speaking.cfg
-share/wesnoth/data/campaigns/tutorial/scenarios/2_Tutorial.cfg
-share/wesnoth/data/campaigns/tutorial/scenarios/utils.cfg
+share/wesnoth/data/campaigns/tutorial/lua/character_selection.lua
+share/wesnoth/data/campaigns/tutorial/maps/01_Tutorial_part_1.map
+share/wesnoth/data/campaigns/tutorial/maps/02_Tutorial_part_2.map
+share/wesnoth/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
+share/wesnoth/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
 share/wesnoth/data/campaigns/tutorial/units/Fighter.cfg
 share/wesnoth/data/campaigns/tutorial/units/Fighteress.cfg
 share/wesnoth/data/campaigns/tutorial/units/Quintain.cfg
-share/wesnoth/data/core/README
+share/wesnoth/data/campaigns/tutorial/utils/utils.cfg
+share/wesnoth/data/core/README.md
 share/wesnoth/data/core/_main.cfg
 share/wesnoth/data/core/about.cfg
+share/wesnoth/data/core/about_i18n.cfg
 share/wesnoth/data/core/editor/_main.cfg
 share/wesnoth/data/core/editor/brushes.cfg
+share/wesnoth/data/core/editor/help.cfg
 share/wesnoth/data/core/editor/items.cfg
 share/wesnoth/data/core/editor/music.cfg
 share/wesnoth/data/core/editor/terrain-groups.cfg
@@ -2468,6 +2669,7 @@ share/wesnoth/data/core/images/attacks/d
 share/wesnoth/data/core/images/attacks/entangle.png
 share/wesnoth/data/core/images/attacks/faerie-fire.png
 share/wesnoth/data/core/images/attacks/fangs-animal.png
+share/wesnoth/data/core/images/attacks/fangs-rodent.png
 share/wesnoth/data/core/images/attacks/fangs-snake.png
 share/wesnoth/data/core/images/attacks/fangs-spider.png
 share/wesnoth/data/core/images/attacks/fangs.png
@@ -2786,6 +2988,19 @@ share/wesnoth/data/core/images/halo/misc
 share/wesnoth/data/core/images/halo/misc/leadership-flare-7.png
 share/wesnoth/data/core/images/halo/misc/leadership-flare-8.png
 share/wesnoth/data/core/images/halo/misc/leadership-flare-9.png
+share/wesnoth/data/core/images/halo/ripples/ripple1.png
+share/wesnoth/data/core/images/halo/ripples/ripple10.png
+share/wesnoth/data/core/images/halo/ripples/ripple11.png
+share/wesnoth/data/core/images/halo/ripples/ripple12.png
+share/wesnoth/data/core/images/halo/ripples/ripple13.png
+share/wesnoth/data/core/images/halo/ripples/ripple2.png
+share/wesnoth/data/core/images/halo/ripples/ripple3.png
+share/wesnoth/data/core/images/halo/ripples/ripple4.png
+share/wesnoth/data/core/images/halo/ripples/ripple5.png
+share/wesnoth/data/core/images/halo/ripples/ripple6.png
+share/wesnoth/data/core/images/halo/ripples/ripple7.png
+share/wesnoth/data/core/images/halo/ripples/ripple8.png
+share/wesnoth/data/core/images/halo/ripples/ripple9.png
 share/wesnoth/data/core/images/halo/saurian-magic-halo-1.png
 share/wesnoth/data/core/images/halo/saurian-magic-halo-2.png
 share/wesnoth/data/core/images/halo/saurian-magic-halo-3.png
@@ -2876,14 +3091,20 @@ share/wesnoth/data/core/images/help/l10n
 share/wesnoth/data/core/images/help/l10n/vi/tooltip.png
 share/wesnoth/data/core/images/help/moving1.png
 share/wesnoth/data/core/images/help/moving2.png
-share/wesnoth/data/core/images/help/orb-black.png
 share/wesnoth/data/core/images/help/orb-blue.png
 share/wesnoth/data/core/images/help/orb-green.png
+share/wesnoth/data/core/images/help/orb-none.png
 share/wesnoth/data/core/images/help/orb-red.png
 share/wesnoth/data/core/images/help/orb-yellow.png
 share/wesnoth/data/core/images/help/recruit.png
 share/wesnoth/data/core/images/help/tooltip.png
+share/wesnoth/data/core/images/icons/amla-default.png
+share/wesnoth/data/core/images/icons/ankh_necklace.png
+share/wesnoth/data/core/images/icons/armor-chain.png
 share/wesnoth/data/core/images/icons/armor_leather.png
+share/wesnoth/data/core/images/icons/bag.png
+share/wesnoth/data/core/images/icons/book.png
+share/wesnoth/data/core/images/icons/book2.png
 share/wesnoth/data/core/images/icons/boots_elven.png
 share/wesnoth/data/core/images/icons/breastplate.png
 share/wesnoth/data/core/images/icons/circlet_winged.png
@@ -2894,22 +3115,30 @@ share/wesnoth/data/core/images/icons/cui
 share/wesnoth/data/core/images/icons/cuirass_muscled.png
 share/wesnoth/data/core/images/icons/dress_silk_green.png
 share/wesnoth/data/core/images/icons/greaves.png
+share/wesnoth/data/core/images/icons/hat-huntsman.png
 share/wesnoth/data/core/images/icons/helmet_bascinet.png
+share/wesnoth/data/core/images/icons/helmet_chain-coif.png
 share/wesnoth/data/core/images/icons/helmet_conical.png
 share/wesnoth/data/core/images/icons/helmet_corinthian.png
 share/wesnoth/data/core/images/icons/helmet_crested.png
+share/wesnoth/data/core/images/icons/helmet_frogmouth.png
+share/wesnoth/data/core/images/icons/helmet_great2.png
+share/wesnoth/data/core/images/icons/helmet_leather-cap.png
 share/wesnoth/data/core/images/icons/helmet_shiny.png
+share/wesnoth/data/core/images/icons/herb-bag.png
 share/wesnoth/data/core/images/icons/instrument_kantele.png
 share/wesnoth/data/core/images/icons/jewelry_butterfly_pin.png
 share/wesnoth/data/core/images/icons/jewelry_necklace_amber.png
 share/wesnoth/data/core/images/icons/jewelry_ring_prismatic.png
 share/wesnoth/data/core/images/icons/key_silver.png
 share/wesnoth/data/core/images/icons/letter_and_ale.png
+share/wesnoth/data/core/images/icons/orc_roundshield.png
 share/wesnoth/data/core/images/icons/potion_green_medium.png
 share/wesnoth/data/core/images/icons/potion_green_small.png
 share/wesnoth/data/core/images/icons/potion_red_medium.png
 share/wesnoth/data/core/images/icons/potion_red_small.png
 share/wesnoth/data/core/images/icons/ring_gold.png
+share/wesnoth/data/core/images/icons/rusty_targ.png
 share/wesnoth/data/core/images/icons/sandals.png
 share/wesnoth/data/core/images/icons/scroll_red.png
 share/wesnoth/data/core/images/icons/shield_polished.png
@@ -2917,6 +3146,8 @@ share/wesnoth/data/core/images/icons/shi
 share/wesnoth/data/core/images/icons/shield_tower.png
 share/wesnoth/data/core/images/icons/shield_tower_merfolk.png
 share/wesnoth/data/core/images/icons/shield_wooden.png
+share/wesnoth/data/core/images/icons/silver_buckler.png
+share/wesnoth/data/core/images/icons/skull_ring.png
 share/wesnoth/data/core/images/icons/steel_armor.png
 share/wesnoth/data/core/images/icons/stone_ring.png
 share/wesnoth/data/core/images/icons/tunic_elven.png
@@ -2956,11 +3187,13 @@ share/wesnoth/data/core/images/items/bra
 share/wesnoth/data/core/images/items/buckler.png
 share/wesnoth/data/core/images/items/burial.png
 share/wesnoth/data/core/images/items/cage.png
+share/wesnoth/data/core/images/items/chest-open.png
 share/wesnoth/data/core/images/items/chest-plain-closed.png
 share/wesnoth/data/core/images/items/chest-plain-open.png
 share/wesnoth/data/core/images/items/chest.png
 share/wesnoth/data/core/images/items/cloak-green.png
 share/wesnoth/data/core/images/items/coffin-closed.png
+share/wesnoth/data/core/images/items/coffin-open.png
 share/wesnoth/data/core/images/items/dragonstatue.png
 share/wesnoth/data/core/images/items/dummy.png
 share/wesnoth/data/core/images/items/flame-sword.png
@@ -3033,6 +3266,7 @@ share/wesnoth/data/core/images/maps/l10n
 share/wesnoth/data/core/images/maps/l10n/gd/wesnoth--overlay.png
 share/wesnoth/data/core/images/maps/l10n/gl/titlescreen--overlay.png
 share/wesnoth/data/core/images/maps/l10n/hu/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/it/titlescreen--overlay.png
 share/wesnoth/data/core/images/maps/l10n/it/wesnoth--overlay.png
 share/wesnoth/data/core/images/maps/l10n/la/wesnoth--overlay.png
 share/wesnoth/data/core/images/maps/l10n/lt/titlescreen--overlay.png
@@ -3043,6 +3277,7 @@ share/wesnoth/data/core/images/maps/l10n
 share/wesnoth/data/core/images/maps/l10n/sr@ijekavian/wesnoth--overlay.png
 share/wesnoth/data/core/images/maps/l10n/sr@ijekavianlatin/wesnoth--overlay.png
 share/wesnoth/data/core/images/maps/l10n/sr@latin/wesnoth--overlay.png
+share/wesnoth/data/core/images/maps/l10n/zh_CN/titlescreen--overlay.png
 share/wesnoth/data/core/images/maps/l10n/zh_CN/wesnoth--overlay.png
 share/wesnoth/data/core/images/maps/titlescreen.png
 share/wesnoth/data/core/images/maps/wesnoth.png
@@ -3066,29 +3301,17 @@ share/wesnoth/data/core/images/misc/flag
 share/wesnoth/data/core/images/misc/hero-icon.png
 share/wesnoth/data/core/images/misc/icon-amla-tough.png
 share/wesnoth/data/core/images/misc/key.png
-share/wesnoth/data/core/images/misc/l10n/en@shaw/logo.png
-share/wesnoth/data/core/images/misc/l10n/es/logo.png
-share/wesnoth/data/core/images/misc/l10n/fr/logo.png
-share/wesnoth/data/core/images/misc/l10n/gd/logo.png
-share/wesnoth/data/core/images/misc/l10n/gl/logo.png
-share/wesnoth/data/core/images/misc/l10n/hu/logo.png
-share/wesnoth/data/core/images/misc/l10n/la/logo.png
-share/wesnoth/data/core/images/misc/l10n/lt/logo.png
-share/wesnoth/data/core/images/misc/l10n/nl/logo.png
-share/wesnoth/data/core/images/misc/l10n/pt/logo.png
-share/wesnoth/data/core/images/misc/l10n/sr/logo.png
-share/wesnoth/data/core/images/misc/l10n/sr@latin/logo.png
-share/wesnoth/data/core/images/misc/l10n/vi/logo.png
-share/wesnoth/data/core/images/misc/l10n/zh_CN/logo.png
+share/wesnoth/data/core/images/misc/laurel-bronze.png
+share/wesnoth/data/core/images/misc/laurel-silver.png
 share/wesnoth/data/core/images/misc/laurel.png
 share/wesnoth/data/core/images/misc/leader-expendable.png
-share/wesnoth/data/core/images/misc/logo.png
 share/wesnoth/data/core/images/misc/loyal-icon.png
 share/wesnoth/data/core/images/misc/new-battle.png
 share/wesnoth/data/core/images/misc/new-battle2.png
 share/wesnoth/data/core/images/misc/new-journey.png
 share/wesnoth/data/core/images/misc/qmark.png
 share/wesnoth/data/core/images/misc/red-x.png
+share/wesnoth/data/core/images/misc/registered_users_only.png
 share/wesnoth/data/core/images/misc/reloaded.png
 share/wesnoth/data/core/images/misc/time-schedules/after-the-fall/10afternoon2.png
 share/wesnoth/data/core/images/misc/time-schedules/after-the-fall/11dusk2.png
@@ -3130,46 +3353,29 @@ share/wesnoth/data/core/images/portraits
 share/wesnoth/data/core/images/portraits/drakes/glider.png
 share/wesnoth/data/core/images/portraits/drakes/hurricane.png
 share/wesnoth/data/core/images/portraits/drakes/inferno.png
-share/wesnoth/data/core/images/portraits/drakes/transparent/blademaster.png
-share/wesnoth/data/core/images/portraits/drakes/transparent/burner.png
-share/wesnoth/data/core/images/portraits/drakes/transparent/clasher.png
-share/wesnoth/data/core/images/portraits/drakes/transparent/enforcer.png
-share/wesnoth/data/core/images/portraits/drakes/transparent/fighter.png
-share/wesnoth/data/core/images/portraits/drakes/transparent/flameheart.png
-share/wesnoth/data/core/images/portraits/drakes/transparent/glider.png
-share/wesnoth/data/core/images/portraits/drakes/transparent/hurricane.png
-share/wesnoth/data/core/images/portraits/drakes/transparent/inferno.png
-share/wesnoth/data/core/images/portraits/drakes/transparent/warden.png
 share/wesnoth/data/core/images/portraits/drakes/warden.png
+share/wesnoth/data/core/images/portraits/dunefolk/herbalist.png
 share/wesnoth/data/core/images/portraits/dwarves/dragonguard.png
 share/wesnoth/data/core/images/portraits/dwarves/explorer.png
+share/wesnoth/data/core/images/portraits/dwarves/fighter-2.png
 share/wesnoth/data/core/images/portraits/dwarves/fighter.png
+share/wesnoth/data/core/images/portraits/dwarves/gryphon-rider.png
 share/wesnoth/data/core/images/portraits/dwarves/guard.png
 share/wesnoth/data/core/images/portraits/dwarves/lord.png
 share/wesnoth/data/core/images/portraits/dwarves/runemaster.png
 share/wesnoth/data/core/images/portraits/dwarves/scout.png
 share/wesnoth/data/core/images/portraits/dwarves/sentinel.png
 share/wesnoth/data/core/images/portraits/dwarves/thunderer.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/dragonguard.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/explorer.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/fighter-2.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/fighter.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/gryphon-rider.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/guard.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/lord.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/runemaster.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/scout.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/sentinel.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/thunderer.png
-share/wesnoth/data/core/images/portraits/dwarves/transparent/ulfserker.png
 share/wesnoth/data/core/images/portraits/dwarves/ulfserker.png
 share/wesnoth/data/core/images/portraits/elves/archer+female.png
 share/wesnoth/data/core/images/portraits/elves/archer.png
 share/wesnoth/data/core/images/portraits/elves/captain.png
 share/wesnoth/data/core/images/portraits/elves/druid.png
+share/wesnoth/data/core/images/portraits/elves/fighter.png
 share/wesnoth/data/core/images/portraits/elves/hero.png
 share/wesnoth/data/core/images/portraits/elves/high-lord.png
 share/wesnoth/data/core/images/portraits/elves/lady.png
+share/wesnoth/data/core/images/portraits/elves/lord.png
 share/wesnoth/data/core/images/portraits/elves/marksman+female.png
 share/wesnoth/data/core/images/portraits/elves/marksman.png
 share/wesnoth/data/core/images/portraits/elves/ranger+female.png
@@ -3179,37 +3385,13 @@ share/wesnoth/data/core/images/portraits
 share/wesnoth/data/core/images/portraits/elves/shyde.png
 share/wesnoth/data/core/images/portraits/elves/sorceress.png
 share/wesnoth/data/core/images/portraits/elves/sylph.png
-share/wesnoth/data/core/images/portraits/elves/transparent/archer+female.png
-share/wesnoth/data/core/images/portraits/elves/transparent/archer.png
-share/wesnoth/data/core/images/portraits/elves/transparent/captain.png
-share/wesnoth/data/core/images/portraits/elves/transparent/druid.png
-share/wesnoth/data/core/images/portraits/elves/transparent/fighter.png
-share/wesnoth/data/core/images/portraits/elves/transparent/hero.png
-share/wesnoth/data/core/images/portraits/elves/transparent/high-lord.png
-share/wesnoth/data/core/images/portraits/elves/transparent/lady.png
-share/wesnoth/data/core/images/portraits/elves/transparent/lord.png
-share/wesnoth/data/core/images/portraits/elves/transparent/marksman+female.png
-share/wesnoth/data/core/images/portraits/elves/transparent/marksman.png
-share/wesnoth/data/core/images/portraits/elves/transparent/ranger+female.png
-share/wesnoth/data/core/images/portraits/elves/transparent/ranger.png
-share/wesnoth/data/core/images/portraits/elves/transparent/scout.png
-share/wesnoth/data/core/images/portraits/elves/transparent/shaman.png
-share/wesnoth/data/core/images/portraits/elves/transparent/shyde.png
-share/wesnoth/data/core/images/portraits/elves/transparent/sorceress.png
-share/wesnoth/data/core/images/portraits/elves/transparent/sylph.png
 share/wesnoth/data/core/images/portraits/goblins/direwolver.png
 share/wesnoth/data/core/images/portraits/goblins/impaler.png
 share/wesnoth/data/core/images/portraits/goblins/pillager.png
+share/wesnoth/data/core/images/portraits/goblins/rouser-2.png
 share/wesnoth/data/core/images/portraits/goblins/rouser.png
+share/wesnoth/data/core/images/portraits/goblins/spearman-2.png
 share/wesnoth/data/core/images/portraits/goblins/spearman.png
-share/wesnoth/data/core/images/portraits/goblins/transparent/direwolver.png
-share/wesnoth/data/core/images/portraits/goblins/transparent/impaler.png
-share/wesnoth/data/core/images/portraits/goblins/transparent/pillager.png
-share/wesnoth/data/core/images/portraits/goblins/transparent/rouser-2.png
-share/wesnoth/data/core/images/portraits/goblins/transparent/rouser.png
-share/wesnoth/data/core/images/portraits/goblins/transparent/spearman-2.png
-share/wesnoth/data/core/images/portraits/goblins/transparent/spearman.png
-share/wesnoth/data/core/images/portraits/goblins/transparent/wolf-rider.png
 share/wesnoth/data/core/images/portraits/goblins/wolf-rider.png
 share/wesnoth/data/core/images/portraits/humans/assassin+female.png
 share/wesnoth/data/core/images/portraits/humans/assassin.png
@@ -3224,12 +3406,17 @@ share/wesnoth/data/core/images/portraits
 share/wesnoth/data/core/images/portraits/humans/footpad+female.png
 share/wesnoth/data/core/images/portraits/humans/footpad.png
 share/wesnoth/data/core/images/portraits/humans/general.png
+share/wesnoth/data/core/images/portraits/humans/grand-knight-2.png
 share/wesnoth/data/core/images/portraits/humans/grand-knight.png
 share/wesnoth/data/core/images/portraits/humans/halberdier.png
+share/wesnoth/data/core/images/portraits/humans/heavy-infantry.png
+share/wesnoth/data/core/images/portraits/humans/horseman.png
 share/wesnoth/data/core/images/portraits/humans/huntsman.png
+share/wesnoth/data/core/images/portraits/humans/iron-mauler.png
 share/wesnoth/data/core/images/portraits/humans/javelineer.png
 share/wesnoth/data/core/images/portraits/humans/knight.png
 share/wesnoth/data/core/images/portraits/humans/lancer.png
+share/wesnoth/data/core/images/portraits/humans/lieutenant.png
 share/wesnoth/data/core/images/portraits/humans/longbowman.png
 share/wesnoth/data/core/images/portraits/humans/mage+female.png
 share/wesnoth/data/core/images/portraits/humans/mage-arch+female.png
@@ -3243,6 +3430,7 @@ share/wesnoth/data/core/images/portraits
 share/wesnoth/data/core/images/portraits/humans/mage-white+female.png
 share/wesnoth/data/core/images/portraits/humans/mage-white.png
 share/wesnoth/data/core/images/portraits/humans/mage.png
+share/wesnoth/data/core/images/portraits/humans/marshal-2.png
 share/wesnoth/data/core/images/portraits/humans/marshal.png
 share/wesnoth/data/core/images/portraits/humans/master-at-arms.png
 share/wesnoth/data/core/images/portraits/humans/master-bowman.png
@@ -3256,147 +3444,58 @@ share/wesnoth/data/core/images/portraits
 share/wesnoth/data/core/images/portraits/humans/ranger.png
 share/wesnoth/data/core/images/portraits/humans/royal-guard.png
 share/wesnoth/data/core/images/portraits/humans/ruffian.png
+share/wesnoth/data/core/images/portraits/humans/sergeant.png
+share/wesnoth/data/core/images/portraits/humans/spearman-2.png
 share/wesnoth/data/core/images/portraits/humans/spearman.png
+share/wesnoth/data/core/images/portraits/humans/swordsman-2.png
+share/wesnoth/data/core/images/portraits/humans/swordsman-3.png
+share/wesnoth/data/core/images/portraits/humans/swordsman.png
 share/wesnoth/data/core/images/portraits/humans/thief+female.png
 share/wesnoth/data/core/images/portraits/humans/thief.png
 share/wesnoth/data/core/images/portraits/humans/thug.png
-share/wesnoth/data/core/images/portraits/humans/transparent/assassin+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/assassin.png
-share/wesnoth/data/core/images/portraits/humans/transparent/bandit.png
-share/wesnoth/data/core/images/portraits/humans/transparent/bowman.png
-share/wesnoth/data/core/images/portraits/humans/transparent/cavalier.png
-share/wesnoth/data/core/images/portraits/humans/transparent/cavalryman.png
-share/wesnoth/data/core/images/portraits/humans/transparent/dark-adept+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/dark-adept.png
-share/wesnoth/data/core/images/portraits/humans/transparent/duelist.png
-share/wesnoth/data/core/images/portraits/humans/transparent/fencer.png
-share/wesnoth/data/core/images/portraits/humans/transparent/footpad+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/footpad.png
-share/wesnoth/data/core/images/portraits/humans/transparent/general.png
-share/wesnoth/data/core/images/portraits/humans/transparent/grand-knight-2.png
-share/wesnoth/data/core/images/portraits/humans/transparent/grand-knight.png
-share/wesnoth/data/core/images/portraits/humans/transparent/halberdier.png
-share/wesnoth/data/core/images/portraits/humans/transparent/heavy-infantry.png
-share/wesnoth/data/core/images/portraits/humans/transparent/horseman.png
-share/wesnoth/data/core/images/portraits/humans/transparent/huntsman.png
-share/wesnoth/data/core/images/portraits/humans/transparent/iron-mauler.png
-share/wesnoth/data/core/images/portraits/humans/transparent/javelineer.png
-share/wesnoth/data/core/images/portraits/humans/transparent/knight.png
-share/wesnoth/data/core/images/portraits/humans/transparent/lancer.png
-share/wesnoth/data/core/images/portraits/humans/transparent/lieutenant.png
-share/wesnoth/data/core/images/portraits/humans/transparent/longbowman.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage-arch+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage-arch.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage-light+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage-light.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage-red+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage-red.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage-silver+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage-silver.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage-white+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage-white.png
-share/wesnoth/data/core/images/portraits/humans/transparent/mage.png
-share/wesnoth/data/core/images/portraits/humans/transparent/marshal-2.png
-share/wesnoth/data/core/images/portraits/humans/transparent/marshal.png
-share/wesnoth/data/core/images/portraits/humans/transparent/master-at-arms.png
-share/wesnoth/data/core/images/portraits/humans/transparent/master-bowman.png
-share/wesnoth/data/core/images/portraits/humans/transparent/necromancer+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/necromancer.png
-share/wesnoth/data/core/images/portraits/humans/transparent/outlaw+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/outlaw.png
-share/wesnoth/data/core/images/portraits/humans/transparent/paladin.png
-share/wesnoth/data/core/images/portraits/humans/transparent/peasant.png
-share/wesnoth/data/core/images/portraits/humans/transparent/pikeman.png
-share/wesnoth/data/core/images/portraits/humans/transparent/ranger.png
-share/wesnoth/data/core/images/portraits/humans/transparent/royal-guard.png
-share/wesnoth/data/core/images/portraits/humans/transparent/ruffian.png
-share/wesnoth/data/core/images/portraits/humans/transparent/sergeant.png
-share/wesnoth/data/core/images/portraits/humans/transparent/spearman-2.png
-share/wesnoth/data/core/images/portraits/humans/transparent/spearman.png
-share/wesnoth/data/core/images/portraits/humans/transparent/swordsman-2.png
-share/wesnoth/data/core/images/portraits/humans/transparent/swordsman-3.png
-share/wesnoth/data/core/images/portraits/humans/transparent/swordsman.png
-share/wesnoth/data/core/images/portraits/humans/transparent/thief+female.png
-share/wesnoth/data/core/images/portraits/humans/transparent/thief.png
-share/wesnoth/data/core/images/portraits/humans/transparent/thug.png
-share/wesnoth/data/core/images/portraits/humans/transparent/trapper.png
-share/wesnoth/data/core/images/portraits/humans/transparent/woodsman.png
 share/wesnoth/data/core/images/portraits/humans/trapper.png
-share/wesnoth/data/core/images/portraits/khalifate/hakim.png
-share/wesnoth/data/core/images/portraits/khalifate/transparent/hakim.png
+share/wesnoth/data/core/images/portraits/humans/woodsman.png
 share/wesnoth/data/core/images/portraits/merfolk/enchantress.png
 share/wesnoth/data/core/images/portraits/merfolk/fighter.png
 share/wesnoth/data/core/images/portraits/merfolk/hoplite.png
 share/wesnoth/data/core/images/portraits/merfolk/hunter.png
+share/wesnoth/data/core/images/portraits/merfolk/initiate-2.png
 share/wesnoth/data/core/images/portraits/merfolk/initiate.png
 share/wesnoth/data/core/images/portraits/merfolk/netcaster.png
 share/wesnoth/data/core/images/portraits/merfolk/priestess.png
 share/wesnoth/data/core/images/portraits/merfolk/spearman.png
-share/wesnoth/data/core/images/portraits/merfolk/transparent/enchantress.png
-share/wesnoth/data/core/images/portraits/merfolk/transparent/fighter.png
-share/wesnoth/data/core/images/portraits/merfolk/transparent/hoplite.png
-share/wesnoth/data/core/images/portraits/merfolk/transparent/hunter.png
-share/wesnoth/data/core/images/portraits/merfolk/transparent/initiate-2.png
-share/wesnoth/data/core/images/portraits/merfolk/transparent/initiate.png
-share/wesnoth/data/core/images/portraits/merfolk/transparent/netcaster.png
-share/wesnoth/data/core/images/portraits/merfolk/transparent/priestess.png
-share/wesnoth/data/core/images/portraits/merfolk/transparent/spearman.png
-share/wesnoth/data/core/images/portraits/merfolk/transparent/triton.png
 share/wesnoth/data/core/images/portraits/merfolk/triton.png
 share/wesnoth/data/core/images/portraits/monsters/bat.png
 share/wesnoth/data/core/images/portraits/monsters/deep-tentacle.png
 share/wesnoth/data/core/images/portraits/monsters/giant-mudcrawler.png
+share/wesnoth/data/core/images/portraits/monsters/giant-rat.png
+share/wesnoth/data/core/images/portraits/monsters/giant-spider.png
 share/wesnoth/data/core/images/portraits/monsters/gryphon.png
 share/wesnoth/data/core/images/portraits/monsters/ogre.png
 share/wesnoth/data/core/images/portraits/monsters/scorpion.png
 share/wesnoth/data/core/images/portraits/monsters/sea-serpent.png
-share/wesnoth/data/core/images/portraits/monsters/transparent/bat.png
-share/wesnoth/data/core/images/portraits/monsters/transparent/deep-tentacle.png
-share/wesnoth/data/core/images/portraits/monsters/transparent/giant-mudcrawler.png
-share/wesnoth/data/core/images/portraits/monsters/transparent/gryphon.png
-share/wesnoth/data/core/images/portraits/monsters/transparent/ogre.png
-share/wesnoth/data/core/images/portraits/monsters/transparent/scorpion.png
-share/wesnoth/data/core/images/portraits/monsters/transparent/sea-serpent.png
-share/wesnoth/data/core/images/portraits/monsters/transparent/young-ogre.png
+share/wesnoth/data/core/images/portraits/monsters/yeti.png
 share/wesnoth/data/core/images/portraits/monsters/young-ogre.png
 share/wesnoth/data/core/images/portraits/nagas/fighter.png
 share/wesnoth/data/core/images/portraits/nagas/myrmidon.png
-share/wesnoth/data/core/images/portraits/nagas/transparent/fighter.png
-share/wesnoth/data/core/images/portraits/nagas/transparent/myrmidon.png
+share/wesnoth/data/core/images/portraits/orcs/archer.png
+share/wesnoth/data/core/images/portraits/orcs/assassin.png
+share/wesnoth/data/core/images/portraits/orcs/crossbowman.png
+share/wesnoth/data/core/images/portraits/orcs/grunt-2.png
+share/wesnoth/data/core/images/portraits/orcs/grunt-3.png
+share/wesnoth/data/core/images/portraits/orcs/grunt-4.png
+share/wesnoth/data/core/images/portraits/orcs/grunt-5.png
+share/wesnoth/data/core/images/portraits/orcs/grunt-6.png
+share/wesnoth/data/core/images/portraits/orcs/grunt.png
+share/wesnoth/data/core/images/portraits/orcs/leader-2.png
 share/wesnoth/data/core/images/portraits/orcs/leader.png
 share/wesnoth/data/core/images/portraits/orcs/slayer.png
 share/wesnoth/data/core/images/portraits/orcs/slurbow.png
 share/wesnoth/data/core/images/portraits/orcs/sovereign.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/archer.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/assassin.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/crossbowman.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/grunt-2.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/grunt-3.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/grunt-4.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/grunt-5.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/grunt-6.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/grunt.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/leader-2.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/leader.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/slayer.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/slurbow.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/sovereign.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/warlord.png
-share/wesnoth/data/core/images/portraits/orcs/transparent/warrior.png
 share/wesnoth/data/core/images/portraits/orcs/warlord.png
 share/wesnoth/data/core/images/portraits/orcs/warrior.png
 share/wesnoth/data/core/images/portraits/saurians/augur.png
 share/wesnoth/data/core/images/portraits/saurians/skirmisher.png
-share/wesnoth/data/core/images/portraits/saurians/transparent/augur.png
-share/wesnoth/data/core/images/portraits/saurians/transparent/skirmisher.png
-share/wesnoth/data/core/images/portraits/trolls/transparent/troll-hero-alt.png
-share/wesnoth/data/core/images/portraits/trolls/transparent/troll-hero.png
-share/wesnoth/data/core/images/portraits/trolls/transparent/troll-rocklobber.png
-share/wesnoth/data/core/images/portraits/trolls/transparent/troll-shaman.png
-share/wesnoth/data/core/images/portraits/trolls/transparent/troll-warrior.png
-share/wesnoth/data/core/images/portraits/trolls/transparent/troll.png
-share/wesnoth/data/core/images/portraits/trolls/transparent/whelp.png
 share/wesnoth/data/core/images/portraits/trolls/troll-hero-alt.png
 share/wesnoth/data/core/images/portraits/trolls/troll-hero.png
 share/wesnoth/data/core/images/portraits/trolls/troll-rocklobber.png
@@ -3411,6 +3510,7 @@ share/wesnoth/data/core/images/portraits
 share/wesnoth/data/core/images/portraits/undead/brown-lich.png
 share/wesnoth/data/core/images/portraits/undead/death-knight.png
 share/wesnoth/data/core/images/portraits/undead/deathblade.png
+share/wesnoth/data/core/images/portraits/undead/draug-2.png
 share/wesnoth/data/core/images/portraits/undead/draug.png
 share/wesnoth/data/core/images/portraits/undead/ghost.png
 share/wesnoth/data/core/images/portraits/undead/ghoul.png
@@ -3419,28 +3519,22 @@ share/wesnoth/data/core/images/portraits
 share/wesnoth/data/core/images/portraits/undead/revenant.png
 share/wesnoth/data/core/images/portraits/undead/shadow.png
 share/wesnoth/data/core/images/portraits/undead/skeleton.png
+share/wesnoth/data/core/images/portraits/undead/soulless.png
 share/wesnoth/data/core/images/portraits/undead/spectre.png
-share/wesnoth/data/core/images/portraits/undead/transparent/ancient-lich.png
-share/wesnoth/data/core/images/portraits/undead/transparent/archer.png
-share/wesnoth/data/core/images/portraits/undead/transparent/banebow.png
-share/wesnoth/data/core/images/portraits/undead/transparent/bone-shooter.png
-share/wesnoth/data/core/images/portraits/undead/transparent/brown-lich.png
-share/wesnoth/data/core/images/portraits/undead/transparent/death-knight.png
-share/wesnoth/data/core/images/portraits/undead/transparent/deathblade.png
-share/wesnoth/data/core/images/portraits/undead/transparent/draug-2.png
-share/wesnoth/data/core/images/portraits/undead/transparent/draug.png
-share/wesnoth/data/core/images/portraits/undead/transparent/ghost.png
-share/wesnoth/data/core/images/portraits/undead/transparent/ghoul.png
-share/wesnoth/data/core/images/portraits/undead/transparent/lich.png
-share/wesnoth/data/core/images/portraits/undead/transparent/nightgaunt.png
-share/wesnoth/data/core/images/portraits/undead/transparent/revenant.png
-share/wesnoth/data/core/images/portraits/undead/transparent/shadow.png
-share/wesnoth/data/core/images/portraits/undead/transparent/skeleton.png
-share/wesnoth/data/core/images/portraits/undead/transparent/spectre.png
-share/wesnoth/data/core/images/portraits/undead/transparent/wraith.png
+share/wesnoth/data/core/images/portraits/undead/walking-corpse.png
 share/wesnoth/data/core/images/portraits/undead/wraith.png
+share/wesnoth/data/core/images/portraits/undead/zombie-bat.png
+share/wesnoth/data/core/images/portraits/undead/zombie-drake.png
+share/wesnoth/data/core/images/portraits/undead/zombie-dwarf.png
+share/wesnoth/data/core/images/portraits/undead/zombie-goblin.png
+share/wesnoth/data/core/images/portraits/undead/zombie-gryphon.png
+share/wesnoth/data/core/images/portraits/undead/zombie-saurian.png
+share/wesnoth/data/core/images/portraits/undead/zombie-swimmer.png
+share/wesnoth/data/core/images/portraits/undead/zombie-troll.png
+share/wesnoth/data/core/images/portraits/undead/zombie-wolf.png
+share/wesnoth/data/core/images/portraits/undead/zombie-wose.png
 share/wesnoth/data/core/images/portraits/woses/ancient-wose.png
-share/wesnoth/data/core/images/portraits/woses/transparent/ancient-wose.png
+share/wesnoth/data/core/images/portraits/woses/wose.png
 share/wesnoth/data/core/images/projectiles/bolas-n.png
 share/wesnoth/data/core/images/projectiles/bolas-ne.png
 share/wesnoth/data/core/images/projectiles/bone-n.png
@@ -3616,6 +3710,8 @@ share/wesnoth/data/core/images/projectil
 share/wesnoth/data/core/images/projectiles/whitemissile-n.png
 share/wesnoth/data/core/images/projectiles/whitemissile-ne.png
 share/wesnoth/data/core/images/scenery/castle-ruins.png
+share/wesnoth/data/core/images/scenery/castle-ruins2.png
+share/wesnoth/data/core/images/scenery/castle-ruins3.png
 share/wesnoth/data/core/images/scenery/circle-magic-glow.png
 share/wesnoth/data/core/images/scenery/circle-magic.png
 share/wesnoth/data/core/images/scenery/dwarven-doors-closed.png
@@ -3680,6 +3776,7 @@ share/wesnoth/data/core/images/scenery/o
 share/wesnoth/data/core/images/scenery/pine1.png
 share/wesnoth/data/core/images/scenery/pine2.png
 share/wesnoth/data/core/images/scenery/rock-cairn.png
+share/wesnoth/data/core/images/scenery/rock-cairn2.png
 share/wesnoth/data/core/images/scenery/rock1.png
 share/wesnoth/data/core/images/scenery/rock2.png
 share/wesnoth/data/core/images/scenery/rock3.png
@@ -3701,6 +3798,7 @@ share/wesnoth/data/core/images/scenery/s
 share/wesnoth/data/core/images/scenery/signpost.png
 share/wesnoth/data/core/images/scenery/slab1.png
 share/wesnoth/data/core/images/scenery/snowbits.png
+share/wesnoth/data/core/images/scenery/snowbits2.png
 share/wesnoth/data/core/images/scenery/summoning-center.png
 share/wesnoth/data/core/images/scenery/summoning-circle1.png
 share/wesnoth/data/core/images/scenery/summoning-circle2.png
@@ -3739,13 +3837,27 @@ share/wesnoth/data/core/images/scenery/w
 share/wesnoth/data/core/images/scenery/windmill-16.png
 share/wesnoth/data/core/images/scenery/windmill-17.png
 share/wesnoth/data/core/images/scenery/windmill-18.png
+share/wesnoth/data/core/images/scenery/wreck-2.png
+share/wesnoth/data/core/images/scenery/wreck-3.png
 share/wesnoth/data/core/images/scenery/wreck.png
+share/wesnoth/data/core/images/story/grim-altar.jpg
 share/wesnoth/data/core/images/story/landscape-battlefield.jpg
 share/wesnoth/data/core/images/story/landscape-battlefield_nohumans.jpg
 share/wesnoth/data/core/images/story/landscape-bridge.jpg
 share/wesnoth/data/core/images/story/landscape-bridge_sun.jpg
 share/wesnoth/data/core/images/story/landscape-castle.jpg
+share/wesnoth/data/core/images/story/landscape-coast.jpg
+share/wesnoth/data/core/images/story/landscape-hills-01.jpg
+share/wesnoth/data/core/images/story/landscape-hills-02.jpg
+share/wesnoth/data/core/images/story/landscape-mountains-01.jpg
+share/wesnoth/data/core/images/story/landscape-mountains-02.jpg
+share/wesnoth/data/core/images/story/landscape-mountains-03.jpg
+share/wesnoth/data/core/images/story/landscape-mountains-04.jpg
+share/wesnoth/data/core/images/story/landscape-mountains-05.jpg
 share/wesnoth/data/core/images/story/landscape-plain.jpg
+share/wesnoth/data/core/images/story/swamp-01.jpg
+share/wesnoth/data/core/images/story/swamp-02.jpg
+share/wesnoth/data/core/images/story/swamp-03.jpg
 share/wesnoth/data/core/images/terrain/alpha.png
 share/wesnoth/data/core/images/terrain/alphamask.png
 share/wesnoth/data/core/images/terrain/bridge/chasm-dock-l-ne.png
@@ -3960,6 +4072,143 @@ share/wesnoth/data/core/images/terrain/b
 share/wesnoth/data/core/images/terrain/bridge/wood-se-nw.png
 share/wesnoth/data/core/images/terrain/bridge/wood-se-sw.png
 share/wesnoth/data/core/images/terrain/bridge/wood-sw-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-to-ground-n-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-to-ground-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-to-ground-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-to-ground-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-to-ground-nw-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/castle-to-ground-nw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/floor.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/floor2.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/floor3.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-rim-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-rim-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-rim-nw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-rim-s.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-rim-se.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-rim-sw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-small-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-small-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-small-nw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-small-s.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-small-se.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-small-sw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/keep-tile.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/reef.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/reef2.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/reef3.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/reef4.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/stone-post.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/stone-post2.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/stone-post3.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/stone-post4.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-camp/tile.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-tile.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-to-ground-n-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-to-ground-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-to-ground-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-to-ground-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-to-ground-nw-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle-to-ground-nw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle2-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle2-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle2-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle2-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle2-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle2-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle2-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle3-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/castle3-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/cobbles.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-l.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-ccw-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-l.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-castle-cw-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-tile.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-n-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-ne-se.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n-ne-se.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-nw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-se.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-sw-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-sw-nw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-ground-sw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-water-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-water-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep-to-water-nw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep2-castle-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep2-castle-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep2-castle-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep2-castle-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep2-castle-cw-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep2-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep2-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/keep2-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/mask-n.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/mask-ne.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/mask-nw.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/mask-se.png
+share/wesnoth/data/core/images/terrain/castle/aquatic-castle/mask-sw.png
 share/wesnoth/data/core/images/terrain/castle/castle-concave-bl.png
 share/wesnoth/data/core/images/terrain/castle/castle-concave-br.png
 share/wesnoth/data/core/images/terrain/castle/castle-concave-l.png
@@ -4013,6 +4262,80 @@ share/wesnoth/data/core/images/terrain/c
 share/wesnoth/data/core/images/terrain/castle/dwarven-keep-floor.png
 share/wesnoth/data/core/images/terrain/castle/dwarven-keep-tile.png
 share/wesnoth/data/core/images/terrain/castle/dwarven-keep.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle2-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle2-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle2-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle2-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle2-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle2-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle2-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle2-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle3-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/castle3-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/grounds.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/grounds2.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/grounds3.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/grounds4.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/grounds5.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/grounds6.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-ccw-bl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-ccw-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-ccw-l.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-ccw-r.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-ccw-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-ccw-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-cw-bl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-cw-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-cw-l.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-cw-r.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-cw-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle-cw-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle2-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle2-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-castle2-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep-tile.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep2-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep2-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep2-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep2-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep2-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep2.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep3.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep4.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/keep5.png
+share/wesnoth/data/core/images/terrain/castle/elven-ruin/tile.png
 share/wesnoth/data/core/images/terrain/castle/elven/castle-concave-bl.png
 share/wesnoth/data/core/images/terrain/castle/elven/castle-concave-br.png
 share/wesnoth/data/core/images/terrain/castle/elven/castle-concave-l.png
@@ -4060,6 +4383,27 @@ share/wesnoth/data/core/images/terrain/c
 share/wesnoth/data/core/images/terrain/castle/elven/keep-tile.png
 share/wesnoth/data/core/images/terrain/castle/elven/keep.png
 share/wesnoth/data/core/images/terrain/castle/elven/tile.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-keep-tile.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular-tile.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular2-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular2-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular2-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular2-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/regular2-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/tent.png
+share/wesnoth/data/core/images/terrain/castle/encampment-ruin/tent2.png
 share/wesnoth/data/core/images/terrain/castle/encampment/regular-concave-bl.png
 share/wesnoth/data/core/images/terrain/castle/encampment/regular-concave-br.png
 share/wesnoth/data/core/images/terrain/castle/encampment/regular-concave-l.png
@@ -4307,6 +4651,10 @@ share/wesnoth/data/core/images/terrain/c
 share/wesnoth/data/core/images/terrain/castle/sand/castle-convex-r.png
 share/wesnoth/data/core/images/terrain/castle/sand/castle-convex-tl.png
 share/wesnoth/data/core/images/terrain/castle/sand/castle-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/sand/cobbles-ruin.png
+share/wesnoth/data/core/images/terrain/castle/sand/cobbles-ruin2.png
+share/wesnoth/data/core/images/terrain/castle/sand/cobbles-ruin3.png
+share/wesnoth/data/core/images/terrain/castle/sand/cobbles-ruin4.png
 share/wesnoth/data/core/images/terrain/castle/sand/cobbles.png
 share/wesnoth/data/core/images/terrain/castle/sand/dirt.png
 share/wesnoth/data/core/images/terrain/castle/sand/keep-castle-ccw-bl.png
@@ -4354,6 +4702,8 @@ share/wesnoth/data/core/images/terrain/c
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-castle-convex-tl.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-castle-convex-tr.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-dirt.png
+share/wesnoth/data/core/images/terrain/castle/sand/ruin-dirt2.png
+share/wesnoth/data/core/images/terrain/castle/sand/ruin-dirt3.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-castle-ccw-bl.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-castle-ccw-br.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-castle-ccw-l.png
@@ -4373,6 +4723,7 @@ share/wesnoth/data/core/images/terrain/c
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-castle-cw-r.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-castle-cw-tl.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-castle-cw-tr.png
+share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-castle2-cw-tl.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-concave-bl.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-concave-br.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-concave-l.png
@@ -4386,6 +4737,11 @@ share/wesnoth/data/core/images/terrain/c
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-convex-tl.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-convex-tr.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep-tile.png
+share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep2-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep2-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep2-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep2-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/sand/ruin-keep2-convex-tr.png
 share/wesnoth/data/core/images/terrain/castle/sand/ruin-tile.png
 share/wesnoth/data/core/images/terrain/castle/sand/tile.png
 share/wesnoth/data/core/images/terrain/castle/snowy/castle-concave-bl.png
@@ -4585,6 +4941,48 @@ share/wesnoth/data/core/images/terrain/c
 share/wesnoth/data/core/images/terrain/castle/sunkenkeep-convex-tr.png
 share/wesnoth/data/core/images/terrain/castle/swamp-keep-tile.png
 share/wesnoth/data/core/images/terrain/castle/swamp-ruin-tile.png
+share/wesnoth/data/core/images/terrain/castle/troll/castle-to-ground-n-ne.png
+share/wesnoth/data/core/images/terrain/castle/troll/castle-to-ground-n.png
+share/wesnoth/data/core/images/terrain/castle/troll/castle-to-ground-ne.png
+share/wesnoth/data/core/images/terrain/castle/troll/castle-to-ground-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/castle/troll/castle-to-ground-nw-n.png
+share/wesnoth/data/core/images/terrain/castle/troll/castle-to-ground-nw.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-rim-n.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-rim-ne.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-rim-nw.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-rim-s.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-rim-se.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-rim-sw.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-small-n.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-small-ne.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-small-nw.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-small-s.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-small-se.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-small-sw.png
+share/wesnoth/data/core/images/terrain/castle/troll/keep-tile.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-concave-bl.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-concave-br.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-concave-l.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-concave-r.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-concave-tl.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-concave-tr.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-convex-bl.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-convex-br.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-convex-l.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-convex-r.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-convex-tl.png
+share/wesnoth/data/core/images/terrain/castle/troll/regular-convex-tr.png
+share/wesnoth/data/core/images/terrain/castle/troll/stone-post.png
+share/wesnoth/data/core/images/terrain/castle/troll/stone-post2.png
+share/wesnoth/data/core/images/terrain/castle/troll/stone-post3.png
+share/wesnoth/data/core/images/terrain/castle/troll/stone-post4.png
+share/wesnoth/data/core/images/terrain/castle/troll/tile.png
 share/wesnoth/data/core/images/terrain/castle/winter-orcish/fort-concave-bl.png
 share/wesnoth/data/core/images/terrain/castle/winter-orcish/fort-concave-br.png
 share/wesnoth/data/core/images/terrain/castle/winter-orcish/fort-concave-l.png
@@ -4675,19 +5073,6 @@ share/wesnoth/data/core/images/terrain/c
 share/wesnoth/data/core/images/terrain/cave/earthy-floor4.png
 share/wesnoth/data/core/images/terrain/cave/earthy-floor5.png
 share/wesnoth/data/core/images/terrain/cave/earthy-floor6.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-concave-bl.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-concave-br.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-concave-l.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-concave-r.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-concave-tl.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-concave-tr.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-convex-bl.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-convex-br.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-convex-l.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-convex-r.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-convex-tl.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-convex-tr.png
-share/wesnoth/data/core/images/terrain/cave/earthy-wall-hewn-tile.png
 share/wesnoth/data/core/images/terrain/cave/earthy-wall-rough-chasm-concave-bl.png
 share/wesnoth/data/core/images/terrain/cave/earthy-wall-rough-chasm-concave-br.png
 share/wesnoth/data/core/images/terrain/cave/earthy-wall-rough-chasm-concave-l.png
@@ -4760,19 +5145,6 @@ share/wesnoth/data/core/images/terrain/c
 share/wesnoth/data/core/images/terrain/cave/path8.png
 share/wesnoth/data/core/images/terrain/cave/path9.png
 share/wesnoth/data/core/images/terrain/cave/wall-editor.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-concave-bl.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-concave-br.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-concave-l.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-concave-r.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-concave-tl.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-concave-tr.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-convex-bl.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-convex-br.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-convex-l.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-convex-r.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-convex-tl.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-convex-tr.png
-share/wesnoth/data/core/images/terrain/cave/wall-hewn-tile.png
 share/wesnoth/data/core/images/terrain/cave/wall-rough-chasm-concave-bl.png
 share/wesnoth/data/core/images/terrain/cave/wall-rough-chasm-concave-br.png
 share/wesnoth/data/core/images/terrain/cave/wall-rough-chasm-concave-l.png
@@ -4894,6 +5266,67 @@ share/wesnoth/data/core/images/terrain/c
 share/wesnoth/data/core/images/terrain/darken-linger.png
 share/wesnoth/data/core/images/terrain/darken.png
 share/wesnoth/data/core/images/terrain/dawn.png
+share/wesnoth/data/core/images/terrain/desert_mountains/blend-from-chasm-s.png
+share/wesnoth/data/core/images/terrain/desert_mountains/blend-from-chasm-se.png
+share/wesnoth/data/core/images/terrain/desert_mountains/blend-from-chasm-sw.png
+share/wesnoth/data/core/images/terrain/desert_mountains/cloud-desert-tile.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-castle-n-ne.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-castle-n.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-castle-ne.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-castle-nw.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-castle2-n.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-castle2-ne.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-castle2-nw.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-n-ne.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-n.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-ne.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-nw.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-tile.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-to-water-n-ne.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-to-water-n.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-to-water-ne.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-to-water-nw-n.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert-to-water-nw.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert3.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert4.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert5.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert5_1.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert5_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert5_2_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert5_3.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert6.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert6_1.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert6_1_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert6_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert6_2_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert6_3.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range1_1.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range1_1_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range1_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range1_3.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range2_1.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range2_1_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range2_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range2_2_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range2_3.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range2_3_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range3_1.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range3_1_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range3_2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range3_3.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range3_4.png
+share/wesnoth/data/core/images/terrain/desert_mountains/desert_range3_5.png
+share/wesnoth/data/core/images/terrain/desert_mountains/peak.png
+share/wesnoth/data/core/images/terrain/desert_mountains/peak2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/peak3.png
+share/wesnoth/data/core/images/terrain/desert_mountains/peak4.png
+share/wesnoth/data/core/images/terrain/desert_mountains/peak5.png
+share/wesnoth/data/core/images/terrain/desert_mountains/peak_large1.png
+share/wesnoth/data/core/images/terrain/desert_mountains/peak_large2.png
+share/wesnoth/data/core/images/terrain/desert_mountains/peak_range1_1.png
+share/wesnoth/data/core/images/terrain/desert_mountains/peak_range1_2.png
 share/wesnoth/data/core/images/terrain/embellishments/desert-plant.png
 share/wesnoth/data/core/images/terrain/embellishments/desert-plant10.png
 share/wesnoth/data/core/images/terrain/embellishments/desert-plant11.png
@@ -4977,6 +5410,7 @@ share/wesnoth/data/core/images/terrain/e
 share/wesnoth/data/core/images/terrain/embellishments/rocks4.png
 share/wesnoth/data/core/images/terrain/embellishments/rocks5.png
 share/wesnoth/data/core/images/terrain/embellishments/rocks6.png
+share/wesnoth/data/core/images/terrain/embellishments/rocks7.png
 share/wesnoth/data/core/images/terrain/embellishments/stones-small.png
 share/wesnoth/data/core/images/terrain/embellishments/stones-small2.png
 share/wesnoth/data/core/images/terrain/embellishments/stones-small3.png
@@ -5007,6 +5441,7 @@ share/wesnoth/data/core/images/terrain/e
 share/wesnoth/data/core/images/terrain/embellishments/water-lilies3.png
 share/wesnoth/data/core/images/terrain/embellishments/water-lilies4.png
 share/wesnoth/data/core/images/terrain/embellishments/water-lilies5.png
+share/wesnoth/data/core/images/terrain/fake-shroud-editor.png
 share/wesnoth/data/core/images/terrain/flat/bank-n.png
 share/wesnoth/data/core/images/terrain/flat/bank-ne.png
 share/wesnoth/data/core/images/terrain/flat/bank-nw.png
@@ -5896,6 +6331,253 @@ share/wesnoth/data/core/images/terrain/h
 share/wesnoth/data/core/images/terrain/hills/snow2.png
 share/wesnoth/data/core/images/terrain/hills/snow3.png
 share/wesnoth/data/core/images/terrain/impassable-editor.png
+share/wesnoth/data/core/images/terrain/interior/carpet_mask.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-corner-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-corner-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-corner-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-corner-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-hex-full.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-hex-left.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-hex-lower.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-hex-ne.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-hex-nw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-hex-right.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-hex-se.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-hex-sw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-hex-upper.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-hex.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-n-ne-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-n-ne-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-n-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-ne-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-ne-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-ne.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-nw-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-nw-n-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-nw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-s-sw-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-se-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-se-s.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-se.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-smallcorner-ne.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-smallcorner-nw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-smallcorner-se.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-smallcorner-sw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-sw-nw-n-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-sw-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-sw.png
+share/wesnoth/data/core/images/terrain/interior/cave-rug/rug-tile.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-corner-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-corner-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-corner-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-corner-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-hex-full.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-hex-left.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-hex-lower.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-hex-ne.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-hex-nw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-hex-right.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-hex-se.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-hex-sw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-hex-upper.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-hex.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-n-ne-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-n-ne-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-n-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-ne-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-ne-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-ne.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-nw-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-nw-n-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-nw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-s-sw-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-se-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-se-s.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-se.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-smallcorner-ne.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-smallcorner-nw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-smallcorner-se.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-smallcorner-sw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-sw-nw-n-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-sw-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-sw.png
+share/wesnoth/data/core/images/terrain/interior/regular-rug/rug-tile.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-corner-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-corner-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-corner-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-corner-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-hex-full.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-hex-left.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-hex-lower.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-hex-ne.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-hex-nw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-hex-right.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-hex-se.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-hex-sw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-hex-upper.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-hex.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-n-ne-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-n-ne-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-n-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-ne-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-ne-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-ne.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-nw-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-nw-n-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-nw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-s-sw-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-se-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-se-s.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-se.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-smallcorner-ne.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-smallcorner-nw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-smallcorner-se.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-smallcorner-sw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-sw-nw-n-ne-se.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-sw-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-sw.png
+share/wesnoth/data/core/images/terrain/interior/royal-rug/rug-tile.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-assist-ccw-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-assist-cw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-ccw-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-cw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-n-ne-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-n-ne-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-n-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-ne-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-ne-se-s.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-nw-gap-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-off2-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-off2-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-off2-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-off2-s.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-offccw-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-offccw-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-offccw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-offccw-s.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-offccw-se.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-offcw-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-offcw-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-offcw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-offcw-s.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-offcw-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-s-sw-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-se-gap-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-se-s-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-se-s.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-se.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-sw-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-chasm/stone-regular-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-crowded-patch-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-crowded-patch-s.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-n-ne-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-ne-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-nw-gap-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-s.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-se-gap-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-se-s-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-se.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-sw-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-sw-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-sw-nw.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular-sw.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular2.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular3.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular4.png
+share/wesnoth/data/core/images/terrain/interior/stone-regular5.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-burnt-n.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-burnt-ne.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-burnt-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-burnt-nw.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-burnt-s.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-burnt-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-burnt-se.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-burnt-sw.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-n.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-ne.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-nw.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-s.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-se-s.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-se.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-clean-sw.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-n.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-ne.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-nw-n-ne.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-nw-n.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-nw.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-s.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-se-s-sw.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-se-s.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-se.png
+share/wesnoth/data/core/images/terrain/interior/wood-chasm/wood-regular-sw.png
 share/wesnoth/data/core/images/terrain/interior/wood-regular-n-ne.png
 share/wesnoth/data/core/images/terrain/interior/wood-regular-n.png
 share/wesnoth/data/core/images/terrain/interior/wood-regular-ne.png
@@ -5911,6 +6593,10 @@ share/wesnoth/data/core/images/terrain/i
 share/wesnoth/data/core/images/terrain/interior/wood-regular.png
 share/wesnoth/data/core/images/terrain/interior/wood-regular2.png
 share/wesnoth/data/core/images/terrain/interior/wood-regular3.png
+share/wesnoth/data/core/images/terrain/interior/wood-ruined.png
+share/wesnoth/data/core/images/terrain/interior/wood-ruined2.png
+share/wesnoth/data/core/images/terrain/interior/wood-ruined3.png
+share/wesnoth/data/core/images/terrain/interior/wood-ruined4.png
 share/wesnoth/data/core/images/terrain/interior/wood-tan-debris.png
 share/wesnoth/data/core/images/terrain/interior/wood-tan-debris2.png
 share/wesnoth/data/core/images/terrain/interior/wood-tan-debris3.png
@@ -5923,14 +6609,83 @@ share/wesnoth/data/core/images/terrain/i
 share/wesnoth/data/core/images/terrain/interior/wood-tan2.png
 share/wesnoth/data/core/images/terrain/interior/wood-tan3.png
 share/wesnoth/data/core/images/terrain/interior/wood-tan4.png
-share/wesnoth/data/core/images/terrain/light-n.png
-share/wesnoth/data/core/images/terrain/light-ne.png
-share/wesnoth/data/core/images/terrain/light-nw.png
-share/wesnoth/data/core/images/terrain/light-s.png
-share/wesnoth/data/core/images/terrain/light-se.png
-share/wesnoth/data/core/images/terrain/light-sw.png
-share/wesnoth/data/core/images/terrain/light.png
+share/wesnoth/data/core/images/terrain/light/light-concave-2-bl.png
+share/wesnoth/data/core/images/terrain/light/light-concave-2-br.png
+share/wesnoth/data/core/images/terrain/light/light-concave-2-l.png
+share/wesnoth/data/core/images/terrain/light/light-concave-2-r.png
+share/wesnoth/data/core/images/terrain/light/light-concave-2-tl.png
+share/wesnoth/data/core/images/terrain/light/light-concave-2-tr.png
+share/wesnoth/data/core/images/terrain/light/light-convex-bl-br.png
+share/wesnoth/data/core/images/terrain/light/light-convex-bl-l.png
+share/wesnoth/data/core/images/terrain/light/light-convex-br-bl.png
+share/wesnoth/data/core/images/terrain/light/light-convex-br-r.png
+share/wesnoth/data/core/images/terrain/light/light-convex-l-bl.png
+share/wesnoth/data/core/images/terrain/light/light-convex-l-tl.png
+share/wesnoth/data/core/images/terrain/light/light-convex-r-br.png
+share/wesnoth/data/core/images/terrain/light/light-convex-r-tr.png
+share/wesnoth/data/core/images/terrain/light/light-convex-tl-l.png
+share/wesnoth/data/core/images/terrain/light/light-convex-tl-tr.png
+share/wesnoth/data/core/images/terrain/light/light-convex-tr-r.png
+share/wesnoth/data/core/images/terrain/light/light-convex-tr-tl.png
+share/wesnoth/data/core/images/terrain/light/light.png
 share/wesnoth/data/core/images/terrain/mask.png
+share/wesnoth/data/core/images/terrain/masks/7hex-bl-br.png
+share/wesnoth/data/core/images/terrain/masks/7hex-bl-l.png
+share/wesnoth/data/core/images/terrain/masks/7hex-bl.png
+share/wesnoth/data/core/images/terrain/masks/7hex-br-bl.png
+share/wesnoth/data/core/images/terrain/masks/7hex-br-r.png
+share/wesnoth/data/core/images/terrain/masks/7hex-br.png
+share/wesnoth/data/core/images/terrain/masks/7hex-l-bl.png
+share/wesnoth/data/core/images/terrain/masks/7hex-l-tl.png
+share/wesnoth/data/core/images/terrain/masks/7hex-l.png
+share/wesnoth/data/core/images/terrain/masks/7hex-r-br.png
+share/wesnoth/data/core/images/terrain/masks/7hex-r-tr.png
+share/wesnoth/data/core/images/terrain/masks/7hex-r.png
+share/wesnoth/data/core/images/terrain/masks/7hex-tl-l.png
+share/wesnoth/data/core/images/terrain/masks/7hex-tl-tr.png
+share/wesnoth/data/core/images/terrain/masks/7hex-tl.png
+share/wesnoth/data/core/images/terrain/masks/7hex-tr-r.png
+share/wesnoth/data/core/images/terrain/masks/7hex-tr-tl.png
+share/wesnoth/data/core/images/terrain/masks/7hex-tr.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-2-bl.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-2-br.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-2-l.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-2-r.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-2-tl.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-2-tr.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-bl-br.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-bl-l.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-br-bl.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-br-r.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-l-bl.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-l-tl.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-r-br.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-r-tr.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-tl-l.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-tl-tr.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-tr-r.png
+share/wesnoth/data/core/images/terrain/masks/long-concave-tr-tl.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-bl-br.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-bl-l.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-br-bl.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-br-r.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-l-bl.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-l-tl.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-r-br.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-r-tr.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-tl-l.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-tl-tr.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-tr-r.png
+share/wesnoth/data/core/images/terrain/masks/long-convex-tr-tl.png
+share/wesnoth/data/core/images/terrain/misc/brazier-A01.png
+share/wesnoth/data/core/images/terrain/misc/brazier-A02.png
+share/wesnoth/data/core/images/terrain/misc/brazier-A03.png
+share/wesnoth/data/core/images/terrain/misc/brazier-A04.png
+share/wesnoth/data/core/images/terrain/misc/brazier-A05.png
+share/wesnoth/data/core/images/terrain/misc/brazier-A06.png
+share/wesnoth/data/core/images/terrain/misc/brazier-A07.png
+share/wesnoth/data/core/images/terrain/misc/brazier-A08.png
+share/wesnoth/data/core/images/terrain/misc/brazier-embellishment.png
 share/wesnoth/data/core/images/terrain/misc/detritus/detritusA-1.png
 share/wesnoth/data/core/images/terrain/misc/detritus/detritusA-2.png
 share/wesnoth/data/core/images/terrain/misc/detritus/detritusA-3.png
@@ -6024,6 +6779,18 @@ share/wesnoth/data/core/images/terrain/m
 share/wesnoth/data/core/images/terrain/misc/rubble.png
 share/wesnoth/data/core/images/terrain/misc/rubble2.png
 share/wesnoth/data/core/images/terrain/misc/rubble3.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A01.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A02.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A03.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A04.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A05.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A06.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A07.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A08.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A09.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A10.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A11.png
+share/wesnoth/data/core/images/terrain/misc/smoke-A12.png
 share/wesnoth/data/core/images/terrain/misc/windmill-A01.png
 share/wesnoth/data/core/images/terrain/misc/windmill-A02.png
 share/wesnoth/data/core/images/terrain/misc/windmill-A03.png
@@ -6167,6 +6934,16 @@ share/wesnoth/data/core/images/terrain/m
 share/wesnoth/data/core/images/terrain/mountains/volcano6_3.png
 share/wesnoth/data/core/images/terrain/off-map/alpha.png
 share/wesnoth/data/core/images/terrain/off-map/background.png
+share/wesnoth/data/core/images/terrain/off-map/border-corner_bottom_left_even.png
+share/wesnoth/data/core/images/terrain/off-map/border-corner_bottom_left_odd.png
+share/wesnoth/data/core/images/terrain/off-map/border-corner_bottom_right_even.png
+share/wesnoth/data/core/images/terrain/off-map/border-corner_bottom_right_odd.png
+share/wesnoth/data/core/images/terrain/off-map/border-corner_top_left.png
+share/wesnoth/data/core/images/terrain/off-map/border-corner_top_left_even.png
+share/wesnoth/data/core/images/terrain/off-map/border-corner_top_left_odd.png
+share/wesnoth/data/core/images/terrain/off-map/border-corner_top_right_even.png
+share/wesnoth/data/core/images/terrain/off-map/border-corner_top_right_odd.png
+share/wesnoth/data/core/images/terrain/off-map/border-editor.png
 share/wesnoth/data/core/images/terrain/off-map/border-n-ne-se-s.png
 share/wesnoth/data/core/images/terrain/off-map/border-n-ne-se.png
 share/wesnoth/data/core/images/terrain/off-map/border-n-ne.png
@@ -6194,31 +6971,71 @@ share/wesnoth/data/core/images/terrain/o
 share/wesnoth/data/core/images/terrain/off-map/border-sw.png
 share/wesnoth/data/core/images/terrain/off-map/border.png
 share/wesnoth/data/core/images/terrain/off-map/fade_border_bottom_even.png
-share/wesnoth/data/core/images/terrain/off-map/fade_border_bottom_even_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_border_bottom_odd.png
-share/wesnoth/data/core/images/terrain/off-map/fade_border_bottom_odd_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_border_left.png
-share/wesnoth/data/core/images/terrain/off-map/fade_border_left_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_border_right.png
-share/wesnoth/data/core/images/terrain/off-map/fade_border_right_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_border_top_even.png
-share/wesnoth/data/core/images/terrain/off-map/fade_border_top_even_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_border_top_odd.png
-share/wesnoth/data/core/images/terrain/off-map/fade_border_top_odd_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_corner_bottom_left.png
-share/wesnoth/data/core/images/terrain/off-map/fade_corner_bottom_left_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_corner_bottom_right_even.png
-share/wesnoth/data/core/images/terrain/off-map/fade_corner_bottom_right_even_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_corner_bottom_right_odd.png
-share/wesnoth/data/core/images/terrain/off-map/fade_corner_bottom_right_odd_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_corner_top_left.png
-share/wesnoth/data/core/images/terrain/off-map/fade_corner_top_left_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_corner_top_right_even.png
-share/wesnoth/data/core/images/terrain/off-map/fade_corner_top_right_even_editor.png
 share/wesnoth/data/core/images/terrain/off-map/fade_corner_top_right_odd.png
-share/wesnoth/data/core/images/terrain/off-map/fade_corner_top_right_odd_editor.png
 share/wesnoth/data/core/images/terrain/off-map/offmap-editor.png
 share/wesnoth/data/core/images/terrain/off-map/symbol.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-left-n.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-long-n.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-long-se.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-long-sw.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-n-tile.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-n.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-left-n.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-long-n.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-long-se.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-long-sw.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-n-tile.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-n.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-right-n.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-se-end.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-se-tile.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-se.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-sw-end.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-sw-tile.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-open-sw.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-right-n.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-se-end.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-se-tile.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-se.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-sw-end.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-sw-tile.png
+share/wesnoth/data/core/images/terrain/portals/door-wooden-sw.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-left-n.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-long-n.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-long-se.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-long-sw.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-n-tile.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-n.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-left-n.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-long-n.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-long-se.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-long-sw.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-n-tile.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-n.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-right-n.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-se-end.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-se-tile.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-se.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-sw-end.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-sw-tile.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-open-sw.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-right-n.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-se-end.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-se-tile.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-se.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-sw-end.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-sw-tile.png
+share/wesnoth/data/core/images/terrain/portals/gate-rusty-sw.png
 share/wesnoth/data/core/images/terrain/sand/beach-n-ne-se-s-sw-nw.png
 share/wesnoth/data/core/images/terrain/sand/beach-n-ne-se-s.png
 share/wesnoth/data/core/images/terrain/sand/beach-n-ne-se.png
@@ -6613,7 +7430,24 @@ share/wesnoth/data/core/images/terrain/u
 share/wesnoth/data/core/images/terrain/unwalkable/lava-high-convex-r.png
 share/wesnoth/data/core/images/terrain/unwalkable/lava-high-convex-tl.png
 share/wesnoth/data/core/images/terrain/unwalkable/lava-high-convex-tr.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava-tile.png
 share/wesnoth/data/core/images/terrain/unwalkable/lava.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava01.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava02.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava03.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava04.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava05.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava06.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava07.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava08.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava09.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava10.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava11.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava12.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava13.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava14.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava15.png
+share/wesnoth/data/core/images/terrain/unwalkable/lava16.png
 share/wesnoth/data/core/images/terrain/unwalkable/lava2.png
 share/wesnoth/data/core/images/terrain/unwalkable/lava3.png
 share/wesnoth/data/core/images/terrain/village/camp-tile.png
@@ -6622,26 +7456,48 @@ share/wesnoth/data/core/images/terrain/v
 share/wesnoth/data/core/images/terrain/village/cave.png
 share/wesnoth/data/core/images/terrain/village/cave2.png
 share/wesnoth/data/core/images/terrain/village/cave3.png
+share/wesnoth/data/core/images/terrain/village/coast-night.png
 share/wesnoth/data/core/images/terrain/village/coast-tile.png
 share/wesnoth/data/core/images/terrain/village/coast.png
+share/wesnoth/data/core/images/terrain/village/coast2-night.png
 share/wesnoth/data/core/images/terrain/village/coast2.png
+share/wesnoth/data/core/images/terrain/village/coast3-night.png
 share/wesnoth/data/core/images/terrain/village/coast3.png
+share/wesnoth/data/core/images/terrain/village/coast4-night.png
 share/wesnoth/data/core/images/terrain/village/coast4.png
-share/wesnoth/data/core/images/terrain/village/coast5-A01.png
-share/wesnoth/data/core/images/terrain/village/coast5-A02.png
-share/wesnoth/data/core/images/terrain/village/coast5-A03.png
-share/wesnoth/data/core/images/terrain/village/coast5-A04.png
+share/wesnoth/data/core/images/terrain/village/coast_5-A01.png
+share/wesnoth/data/core/images/terrain/village/coast_5-A02.png
+share/wesnoth/data/core/images/terrain/village/coast_5-A03.png
+share/wesnoth/data/core/images/terrain/village/coast_5-A04.png
 share/wesnoth/data/core/images/terrain/village/desert-camp-tile.png
 share/wesnoth/data/core/images/terrain/village/desert-camp.png
+share/wesnoth/data/core/images/terrain/village/desert-night.png
 share/wesnoth/data/core/images/terrain/village/desert-oasis-1.png
 share/wesnoth/data/core/images/terrain/village/desert-oasis-2.png
 share/wesnoth/data/core/images/terrain/village/desert-oasis-3.png
 share/wesnoth/data/core/images/terrain/village/desert-oasis-tile.png
+share/wesnoth/data/core/images/terrain/village/desert-ruin-tile.png
+share/wesnoth/data/core/images/terrain/village/desert-ruin.png
+share/wesnoth/data/core/images/terrain/village/desert-ruin2.png
+share/wesnoth/data/core/images/terrain/village/desert-ruin3.png
+share/wesnoth/data/core/images/terrain/village/desert-ruin4.png
+share/wesnoth/data/core/images/terrain/village/desert-ruin5.png
+share/wesnoth/data/core/images/terrain/village/desert-ruin6.png
+share/wesnoth/data/core/images/terrain/village/desert-ruin7.png
 share/wesnoth/data/core/images/terrain/village/desert-tile.png
 share/wesnoth/data/core/images/terrain/village/desert.png
+share/wesnoth/data/core/images/terrain/village/desert2-night.png
 share/wesnoth/data/core/images/terrain/village/desert2.png
+share/wesnoth/data/core/images/terrain/village/desert3-night.png
 share/wesnoth/data/core/images/terrain/village/desert3.png
+share/wesnoth/data/core/images/terrain/village/desert4-night.png
 share/wesnoth/data/core/images/terrain/village/desert4.png
+share/wesnoth/data/core/images/terrain/village/desert5-night.png
+share/wesnoth/data/core/images/terrain/village/desert5.png
+share/wesnoth/data/core/images/terrain/village/desert6-night.png
+share/wesnoth/data/core/images/terrain/village/desert6.png
+share/wesnoth/data/core/images/terrain/village/desert7-night.png
+share/wesnoth/data/core/images/terrain/village/desert7.png
 share/wesnoth/data/core/images/terrain/village/drake-tile.png
 share/wesnoth/data/core/images/terrain/village/drake1-A01.png
 share/wesnoth/data/core/images/terrain/village/drake1-A02.png
@@ -6660,6 +7516,7 @@ share/wesnoth/data/core/images/terrain/v
 share/wesnoth/data/core/images/terrain/village/dwarven2.png
 share/wesnoth/data/core/images/terrain/village/dwarven3.png
 share/wesnoth/data/core/images/terrain/village/dwarven4.png
+share/wesnoth/data/core/images/terrain/village/elven-night.png
 share/wesnoth/data/core/images/terrain/village/elven-snow-tile.png
 share/wesnoth/data/core/images/terrain/village/elven-snow.png
 share/wesnoth/data/core/images/terrain/village/elven-snow2.png
@@ -6667,9 +7524,13 @@ share/wesnoth/data/core/images/terrain/v
 share/wesnoth/data/core/images/terrain/village/elven-snow4.png
 share/wesnoth/data/core/images/terrain/village/elven-tile.png
 share/wesnoth/data/core/images/terrain/village/elven.png
+share/wesnoth/data/core/images/terrain/village/elven2-night.png
 share/wesnoth/data/core/images/terrain/village/elven2.png
+share/wesnoth/data/core/images/terrain/village/elven3-night.png
 share/wesnoth/data/core/images/terrain/village/elven3.png
+share/wesnoth/data/core/images/terrain/village/elven4-night.png
 share/wesnoth/data/core/images/terrain/village/elven4.png
+share/wesnoth/data/core/images/terrain/village/human-city-night.png
 share/wesnoth/data/core/images/terrain/village/human-city-ruin-tile.png
 share/wesnoth/data/core/images/terrain/village/human-city-ruin.png
 share/wesnoth/data/core/images/terrain/village/human-city-ruin2.png
@@ -6682,8 +7543,11 @@ share/wesnoth/data/core/images/terrain/v
 share/wesnoth/data/core/images/terrain/village/human-city-snow4.png
 share/wesnoth/data/core/images/terrain/village/human-city-tile.png
 share/wesnoth/data/core/images/terrain/village/human-city.png
+share/wesnoth/data/core/images/terrain/village/human-city2-night.png
 share/wesnoth/data/core/images/terrain/village/human-city2.png
+share/wesnoth/data/core/images/terrain/village/human-city3-night.png
 share/wesnoth/data/core/images/terrain/village/human-city3.png
+share/wesnoth/data/core/images/terrain/village/human-city4-night.png
 share/wesnoth/data/core/images/terrain/village/human-city4.png
 share/wesnoth/data/core/images/terrain/village/human-cottage-ruin-tile.png
 share/wesnoth/data/core/images/terrain/village/human-cottage-ruin.png
@@ -6695,6 +7559,7 @@ share/wesnoth/data/core/images/terrain/v
 share/wesnoth/data/core/images/terrain/village/human-hills-tile.png
 share/wesnoth/data/core/images/terrain/village/human-hills.png
 share/wesnoth/data/core/images/terrain/village/human-mountain-tile.png
+share/wesnoth/data/core/images/terrain/village/human-night.png
 share/wesnoth/data/core/images/terrain/village/human-snow-hills-tile.png
 share/wesnoth/data/core/images/terrain/village/human-snow-hills.png
 share/wesnoth/data/core/images/terrain/village/human-snow-mountain-tile.png
@@ -6704,29 +7569,45 @@ share/wesnoth/data/core/images/terrain/v
 share/wesnoth/data/core/images/terrain/village/human-snow4.png
 share/wesnoth/data/core/images/terrain/village/human-tile.png
 share/wesnoth/data/core/images/terrain/village/human.png
+share/wesnoth/data/core/images/terrain/village/human2-night.png
 share/wesnoth/data/core/images/terrain/village/human2.png
+share/wesnoth/data/core/images/terrain/village/human3-night.png
 share/wesnoth/data/core/images/terrain/village/human3.png
+share/wesnoth/data/core/images/terrain/village/human4-night.png
 share/wesnoth/data/core/images/terrain/village/human4.png
 share/wesnoth/data/core/images/terrain/village/hut-hills-tile.png
 share/wesnoth/data/core/images/terrain/village/hut-mountains-tile.png
+share/wesnoth/data/core/images/terrain/village/hut-night.png
 share/wesnoth/data/core/images/terrain/village/hut-snow-hills-tile.png
 share/wesnoth/data/core/images/terrain/village/hut-snow-tile.png
 share/wesnoth/data/core/images/terrain/village/hut-snow.png
 share/wesnoth/data/core/images/terrain/village/hut-snow2.png
 share/wesnoth/data/core/images/terrain/village/hut-tile.png
 share/wesnoth/data/core/images/terrain/village/hut.png
+share/wesnoth/data/core/images/terrain/village/hut2-night.png
 share/wesnoth/data/core/images/terrain/village/hut2.png
+share/wesnoth/data/core/images/terrain/village/hut3-night.png
+share/wesnoth/data/core/images/terrain/village/hut3.png
+share/wesnoth/data/core/images/terrain/village/hut4-night.png
+share/wesnoth/data/core/images/terrain/village/hut4.png
 share/wesnoth/data/core/images/terrain/village/igloo-tile.png
 share/wesnoth/data/core/images/terrain/village/igloo.png
 share/wesnoth/data/core/images/terrain/village/igloo2.png
+share/wesnoth/data/core/images/terrain/village/igloo3.png
+share/wesnoth/data/core/images/terrain/village/igloo4.png
+share/wesnoth/data/core/images/terrain/village/log-cabin-night.png
 share/wesnoth/data/core/images/terrain/village/log-cabin-snow-tile.png
 share/wesnoth/data/core/images/terrain/village/log-cabin-snow.png
 share/wesnoth/data/core/images/terrain/village/log-cabin-tile.png
 share/wesnoth/data/core/images/terrain/village/log-cabin.png
+share/wesnoth/data/core/images/terrain/village/log-cabin2-night.png
 share/wesnoth/data/core/images/terrain/village/log-cabin2.png
+share/wesnoth/data/core/images/terrain/village/log-cabin3-night.png
 share/wesnoth/data/core/images/terrain/village/log-cabin3.png
+share/wesnoth/data/core/images/terrain/village/log-cabin4-night.png
 share/wesnoth/data/core/images/terrain/village/log-cabin4.png
 share/wesnoth/data/core/images/terrain/village/orc-hills-tile.png
+share/wesnoth/data/core/images/terrain/village/orc-night.png
 share/wesnoth/data/core/images/terrain/village/orc-snow-hills-tile.png
 share/wesnoth/data/core/images/terrain/village/orc-snow-tile.png
 share/wesnoth/data/core/images/terrain/village/orc-snow.png
@@ -6735,14 +7616,22 @@ share/wesnoth/data/core/images/terrain/v
 share/wesnoth/data/core/images/terrain/village/orc-snow4.png
 share/wesnoth/data/core/images/terrain/village/orc-tile.png
 share/wesnoth/data/core/images/terrain/village/orc.png
+share/wesnoth/data/core/images/terrain/village/orc2-night.png
 share/wesnoth/data/core/images/terrain/village/orc2.png
+share/wesnoth/data/core/images/terrain/village/orc3-night.png
 share/wesnoth/data/core/images/terrain/village/orc3.png
+share/wesnoth/data/core/images/terrain/village/orc4-night.png
 share/wesnoth/data/core/images/terrain/village/orc4.png
+share/wesnoth/data/core/images/terrain/village/orc5-night.png
+share/wesnoth/data/core/images/terrain/village/orc5.png
 share/wesnoth/data/core/images/terrain/village/snow-tile.png
 share/wesnoth/data/core/images/terrain/village/swamp-merfolk-tile.png
+share/wesnoth/data/core/images/terrain/village/swampwater-night.png
 share/wesnoth/data/core/images/terrain/village/swampwater-tile.png
 share/wesnoth/data/core/images/terrain/village/swampwater.png
+share/wesnoth/data/core/images/terrain/village/swampwater2-night.png
 share/wesnoth/data/core/images/terrain/village/swampwater2.png
+share/wesnoth/data/core/images/terrain/village/swampwater3-night.png
 share/wesnoth/data/core/images/terrain/village/swampwater3.png
 share/wesnoth/data/core/images/terrain/village/tropical-forest.png
 share/wesnoth/data/core/images/terrain/village/tropical-forest2.png
@@ -6770,59 +7659,166 @@ share/wesnoth/data/core/images/terrain/v
 share/wesnoth/data/core/images/terrain/void/void-sw-nw.png
 share/wesnoth/data/core/images/terrain/void/void-sw.png
 share/wesnoth/data/core/images/terrain/void/void.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-base.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A01-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A01-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A02-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A02-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A03-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A03-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A04-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A04-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A05-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A05-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A06-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A06-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A07-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A07-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A08-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A08-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A09-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A09-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A10-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-A10-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-lit-tile.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-n-ne-se-bg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-n-ne-se-fg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-n-ne-se-s-fg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-ne-se-s-sw-nw-fg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-ne-se-s-sw.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-ne-se-s.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-ne-se.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-nw-n-ne-se-bg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-nw-n-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-nw-n.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-nw.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-s-sw-ne-n-fg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-s-sw-nw-n-fg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-s-sw-nw.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-s-sw.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-s.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-se-s-sw-nw.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-se-s-sw.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-se-s.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-se.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-sw-ne.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-sw-nw-n-bg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-sw-nw-n-fg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-sw-nw-n-ne-bg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-sw-nw-n-ne-se-bg.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-sw-nw.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-sw.png
-share/wesnoth/data/core/images/terrain/walls/wall-stone-tile.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone-convex-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone-convex-l.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone-convex-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone-corner-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone-tile.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone2-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone2-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/clean/wall-stone2-convex-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/flames-tile.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/base-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/base-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/base-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/flames.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/glow1-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/glow1-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/glow1-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/glow2-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/glow2-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/glow2-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/glow3-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/glow3-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/glow3-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/mask-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/mask-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/mask-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/mask2-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/mask2-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/mask2-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/mask3-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/mask3-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/mask3-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/wall-post-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/wall-post-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/sconce/wall-post-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/base.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/flames.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/glow1.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/glow2.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/glow3.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/mask.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/mask2.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/mask3.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/post-chasm.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/post-water.png
+share/wesnoth/data/core/images/terrain/walls/stone/flames/torch/post.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A01-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A01-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A01-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A01-convex-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A02-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A02-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A03-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A03-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A04-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A04-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A05-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A05-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A06-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A06-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A07-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A07-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A08-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A08-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A09-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A09-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A10-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/lit/wall-stone-lit-A10-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mine-mixed-ccw-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mine-mixed-ccw-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mine-mixed-ccw-l.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mine-mixed-ccw-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mine-mixed-ccw-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mine-mixed-cw-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mine-mixed-cw-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mine-mixed-cw-l.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mine-mixed-cw-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mine-mixed-cw-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-ccw-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-ccw-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-ccw-l.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-ccw-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-ccw-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-ccw-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-corner-ccw-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-corner-cw-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-cw-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-cw-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-cw-l.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-cw-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-cw-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-mixed-cw-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-base.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-concave-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-concave-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-concave-l.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-concave-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-convex-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-convex-l.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-convex-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-convex-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-convex-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-corner-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-corner-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-corner-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-corner-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-lit-tile.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-concave-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-concave-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-concave-l.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-concave-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-convex-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-convex-l.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-convex-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-convex-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-convex-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-corner-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-corner-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-corner-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-corner-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-tile.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-tile.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-white-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-white-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-white-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-white-convex-br.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-white-convex-l.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-white-convex-r.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-white-corner-bl.png
+share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-white-tile.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-chasm-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-chasm-convex-br.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-chasm-convex-l.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-chasm-convex-r.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-concave-bl.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-concave-br.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-concave-l.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-concave-r.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-concave-tl.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-convex-br.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-convex-l.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-convex-r.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-convex-tl.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-convex-tr.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine-tile.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine2-concave-tr.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine2-convex-bl.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine2-convex-br.png
+share/wesnoth/data/core/images/terrain/walls/wall-mine2-convex-r.png
+share/wesnoth/data/core/images/terrain/water/bottom.png
 share/wesnoth/data/core/images/terrain/water/coast-grey-tile.png
 share/wesnoth/data/core/images/terrain/water/coast-tile.png
 share/wesnoth/data/core/images/terrain/water/coast-tropical-A01-n.png
@@ -7317,6 +8313,29 @@ share/wesnoth/data/core/images/terrain/w
 share/wesnoth/data/core/images/terrain/water/ocean-long-A15-sw.png
 share/wesnoth/data/core/images/terrain/water/ocean-tile.png
 share/wesnoth/data/core/images/terrain/water/ocean-tropical-tile.png
+share/wesnoth/data/core/images/terrain/water/ocean01.png
+share/wesnoth/data/core/images/terrain/water/ocean02.png
+share/wesnoth/data/core/images/terrain/water/ocean03.png
+share/wesnoth/data/core/images/terrain/water/ocean04.png
+share/wesnoth/data/core/images/terrain/water/ocean05.png
+share/wesnoth/data/core/images/terrain/water/ocean06.png
+share/wesnoth/data/core/images/terrain/water/ocean07.png
+share/wesnoth/data/core/images/terrain/water/ocean08.png
+share/wesnoth/data/core/images/terrain/water/ocean09.png
+share/wesnoth/data/core/images/terrain/water/ocean10.png
+share/wesnoth/data/core/images/terrain/water/ocean11.png
+share/wesnoth/data/core/images/terrain/water/ocean12.png
+share/wesnoth/data/core/images/terrain/water/ocean13.png
+share/wesnoth/data/core/images/terrain/water/ocean14.png
+share/wesnoth/data/core/images/terrain/water/ocean15.png
+share/wesnoth/data/core/images/terrain/water/ocean16.png
+share/wesnoth/data/core/images/terrain/water/ocean17.png
+share/wesnoth/data/core/images/terrain/water/ocean18.png
+share/wesnoth/data/core/images/terrain/water/ocean19.png
+share/wesnoth/data/core/images/terrain/water/ocean20.png
+share/wesnoth/data/core/images/terrain/water/ocean21.png
+share/wesnoth/data/core/images/terrain/water/overlay-gray.png
+share/wesnoth/data/core/images/terrain/water/overlay-tropical.png
 share/wesnoth/data/core/images/terrain/water/reef-gray-tile.png
 share/wesnoth/data/core/images/terrain/water/reef-tile.png
 share/wesnoth/data/core/images/terrain/water/reef-tropical-tile.png
@@ -7324,50 +8343,57 @@ share/wesnoth/data/core/images/terrain/w
 share/wesnoth/data/core/images/terrain/water/reef2.png
 share/wesnoth/data/core/images/terrain/water/reef3.png
 share/wesnoth/data/core/images/terrain/water/reef4.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A01-bl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A01-br.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A01-l.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A01-r.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A01-tl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A01-tr.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A02-bl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A02-br.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A02-l.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A02-r.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A02-tl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A02-tr.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A03-bl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A03-br.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A03-l.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A03-r.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A03-tl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A03-tr.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A04-bl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A04-br.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A04-l.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A04-r.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A04-tl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A04-tr.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A05-bl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A05-br.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A05-l.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A05-r.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A05-tl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A05-tr.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A06-bl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A06-br.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A06-l.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A06-r.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A06-tl.png
-share/wesnoth/data/core/images/terrain/water/waves-concave-A06-tr.png
+share/wesnoth/data/core/images/terrain/water/water01.png
+share/wesnoth/data/core/images/terrain/water/water02.png
+share/wesnoth/data/core/images/terrain/water/water03.png
+share/wesnoth/data/core/images/terrain/water/water04.png
+share/wesnoth/data/core/images/terrain/water/water05.png
+share/wesnoth/data/core/images/terrain/water/water06.png
+share/wesnoth/data/core/images/terrain/water/water07.png
+share/wesnoth/data/core/images/terrain/water/water08.png
+share/wesnoth/data/core/images/terrain/water/water09.png
+share/wesnoth/data/core/images/terrain/water/water10.png
+share/wesnoth/data/core/images/terrain/water/water11.png
+share/wesnoth/data/core/images/terrain/water/water12.png
+share/wesnoth/data/core/images/terrain/water/water13.png
+share/wesnoth/data/core/images/terrain/water/water14.png
+share/wesnoth/data/core/images/terrain/water/water15.png
+share/wesnoth/data/core/images/terrain/water/water16.png
+share/wesnoth/data/core/images/terrain/water/water17.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A01.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A02.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A03.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A04.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A05.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A06.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A07.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A08.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A09.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A10.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A11.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A12.png
+share/wesnoth/data/core/images/terrain/water/waves-concave-A13.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A01.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A02.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A03.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A04.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A05.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A06.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A07.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A08.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A09.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A10.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A11.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A12.png
+share/wesnoth/data/core/images/terrain/water/waves-convex-A13.png
+share/wesnoth/data/core/images/themes/classic/mapframe_corner.png
+share/wesnoth/data/core/images/themes/classic/mapframe_top.png
+share/wesnoth/data/core/images/themes/classic/mapframe_toprightcorner.png
 share/wesnoth/data/core/images/themes/classic/menubar.png
 share/wesnoth/data/core/images/themes/classic/minimap-800.png
 share/wesnoth/data/core/images/themes/classic/minimap.png
 share/wesnoth/data/core/images/themes/classic/sidebar.png
-share/wesnoth/data/core/images/themes/editor/classic/mapframe_corner.png
 share/wesnoth/data/core/images/themes/editor/classic/mapframe_rightside.png
-share/wesnoth/data/core/images/themes/editor/classic/mapframe_top.png
-share/wesnoth/data/core/images/themes/editor/classic/mapframe_toprightcorner.png
 share/wesnoth/data/core/images/themes/editor/classic/menubar-800.png
 share/wesnoth/data/core/images/themes/editor/classic/menubar_rightside-800.png
 share/wesnoth/data/core/images/themes/editor/classic/menubar_rightside.png
@@ -7435,6 +8461,7 @@ share/wesnoth/data/core/images/themes/un
 share/wesnoth/data/core/images/themes/unit_box/misc/time-schedules/default/schedule-underground-illum.png
 share/wesnoth/data/core/images/themes/unit_box/misc/time-schedules/default/schedule-underground.png
 share/wesnoth/data/core/images/themes/unit_box/misc/time-schedules/default/tod-schedule-24hrs.png
+share/wesnoth/data/core/images/themes/unit_box/status-bg.png
 share/wesnoth/data/core/images/themes/units-bw.png
 share/wesnoth/data/core/images/themes/units.png
 share/wesnoth/data/core/images/themes/upkeep-bw.png
@@ -7960,6 +8987,32 @@ share/wesnoth/data/core/images/units/dra
 share/wesnoth/data/core/images/units/drakes/warrior-takeoff-3.png
 share/wesnoth/data/core/images/units/drakes/warrior-takeoff-4.png
 share/wesnoth/data/core/images/units/drakes/warrior.png
+share/wesnoth/data/core/images/units/dunefolk/apothecary.png
+share/wesnoth/data/core/images/units/dunefolk/blademaster.png
+share/wesnoth/data/core/images/units/dunefolk/burner.png
+share/wesnoth/data/core/images/units/dunefolk/cataphract.png
+share/wesnoth/data/core/images/units/dunefolk/elder-falcon.png
+share/wesnoth/data/core/images/units/dunefolk/explorer.png
+share/wesnoth/data/core/images/units/dunefolk/falcon.png
+share/wesnoth/data/core/images/units/dunefolk/firetrooper.png
+share/wesnoth/data/core/images/units/dunefolk/harrier.png
+share/wesnoth/data/core/images/units/dunefolk/herbalist.png
+share/wesnoth/data/core/images/units/dunefolk/marauder.png
+share/wesnoth/data/core/images/units/dunefolk/piercer.png
+share/wesnoth/data/core/images/units/dunefolk/raider.png
+share/wesnoth/data/core/images/units/dunefolk/ranger.png
+share/wesnoth/data/core/images/units/dunefolk/rider.png
+share/wesnoth/data/core/images/units/dunefolk/rover.png
+share/wesnoth/data/core/images/units/dunefolk/scorcher.png
+share/wesnoth/data/core/images/units/dunefolk/skirmisher.png
+share/wesnoth/data/core/images/units/dunefolk/soldier.png
+share/wesnoth/data/core/images/units/dunefolk/spearguard.png
+share/wesnoth/data/core/images/units/dunefolk/spearmaster.png
+share/wesnoth/data/core/images/units/dunefolk/sunderer.png
+share/wesnoth/data/core/images/units/dunefolk/swiftrider.png
+share/wesnoth/data/core/images/units/dunefolk/swordsman.png
+share/wesnoth/data/core/images/units/dunefolk/warmaster.png
+share/wesnoth/data/core/images/units/dunefolk/windrider.png
 share/wesnoth/data/core/images/units/dwarves/arcanister.png
 share/wesnoth/data/core/images/units/dwarves/berserker/berserker-attack-1.png
 share/wesnoth/data/core/images/units/dwarves/berserker/berserker-attack-2.png
@@ -8234,6 +9287,13 @@ share/wesnoth/data/core/images/units/dwa
 share/wesnoth/data/core/images/units/dwarves/fighter-se-run7.png
 share/wesnoth/data/core/images/units/dwarves/fighter-se-run8.png
 share/wesnoth/data/core/images/units/dwarves/fighter-se-run9.png
+share/wesnoth/data/core/images/units/dwarves/fighter-taunt-1.png
+share/wesnoth/data/core/images/units/dwarves/fighter-taunt-2.png
+share/wesnoth/data/core/images/units/dwarves/fighter-taunt-3.png
+share/wesnoth/data/core/images/units/dwarves/fighter-taunt-4.png
+share/wesnoth/data/core/images/units/dwarves/fighter-taunt-5.png
+share/wesnoth/data/core/images/units/dwarves/fighter-taunt-6.png
+share/wesnoth/data/core/images/units/dwarves/fighter-taunt-7.png
 share/wesnoth/data/core/images/units/dwarves/fighter.png
 share/wesnoth/data/core/images/units/dwarves/gryphon-master-flying-1.png
 share/wesnoth/data/core/images/units/dwarves/gryphon-master-flying-2.png
@@ -8274,6 +9334,13 @@ share/wesnoth/data/core/images/units/dwa
 share/wesnoth/data/core/images/units/dwarves/guard-idle-4.png
 share/wesnoth/data/core/images/units/dwarves/guard-idle-5.png
 share/wesnoth/data/core/images/units/dwarves/guard-idle-6.png
+share/wesnoth/data/core/images/units/dwarves/guard-ne-attack-1.png
+share/wesnoth/data/core/images/units/dwarves/guard-ne-attack-2.png
+share/wesnoth/data/core/images/units/dwarves/guard-ne-attack-3.png
+share/wesnoth/data/core/images/units/dwarves/guard-ne-attack-4.png
+share/wesnoth/data/core/images/units/dwarves/guard-ne-attack-5.png
+share/wesnoth/data/core/images/units/dwarves/guard-ne-attack-6.png
+share/wesnoth/data/core/images/units/dwarves/guard-ne-attack-7.png
 share/wesnoth/data/core/images/units/dwarves/guard-ne-run1.png
 share/wesnoth/data/core/images/units/dwarves/guard-ne-run10.png
 share/wesnoth/data/core/images/units/dwarves/guard-ne-run2.png
@@ -8284,6 +9351,7 @@ share/wesnoth/data/core/images/units/dwa
 share/wesnoth/data/core/images/units/dwarves/guard-ne-run7.png
 share/wesnoth/data/core/images/units/dwarves/guard-ne-run8.png
 share/wesnoth/data/core/images/units/dwarves/guard-ne-run9.png
+share/wesnoth/data/core/images/units/dwarves/guard-ne.png
 share/wesnoth/data/core/images/units/dwarves/guard-se-run1.png
 share/wesnoth/data/core/images/units/dwarves/guard-se-run10.png
 share/wesnoth/data/core/images/units/dwarves/guard-se-run2.png
@@ -8429,6 +9497,12 @@ share/wesnoth/data/core/images/units/dwa
 share/wesnoth/data/core/images/units/dwarves/runesmith-attack-se-7.png
 share/wesnoth/data/core/images/units/dwarves/runesmith-attack-se-8.png
 share/wesnoth/data/core/images/units/dwarves/runesmith-attack-se-9.png
+share/wesnoth/data/core/images/units/dwarves/runesmith-bob-1.png
+share/wesnoth/data/core/images/units/dwarves/runesmith-bob-2.png
+share/wesnoth/data/core/images/units/dwarves/runesmith-bob-3.png
+share/wesnoth/data/core/images/units/dwarves/runesmith-bob-4.png
+share/wesnoth/data/core/images/units/dwarves/runesmith-bob-5.png
+share/wesnoth/data/core/images/units/dwarves/runesmith-bob-6.png
 share/wesnoth/data/core/images/units/dwarves/runesmith-defend-1.png
 share/wesnoth/data/core/images/units/dwarves/runesmith-defend-2.png
 share/wesnoth/data/core/images/units/dwarves/runesmith.png
@@ -8447,13 +9521,42 @@ share/wesnoth/data/core/images/units/dwa
 share/wesnoth/data/core/images/units/dwarves/scout-ranged-3.png
 share/wesnoth/data/core/images/units/dwarves/scout.png
 share/wesnoth/data/core/images/units/dwarves/sentinel-attack.png
+share/wesnoth/data/core/images/units/dwarves/sentinel-bob-1.png
+share/wesnoth/data/core/images/units/dwarves/sentinel-bob-2.png
+share/wesnoth/data/core/images/units/dwarves/sentinel-bob-3.png
+share/wesnoth/data/core/images/units/dwarves/sentinel-bob-4.png
+share/wesnoth/data/core/images/units/dwarves/sentinel-bob-5.png
 share/wesnoth/data/core/images/units/dwarves/sentinel-defend-1.png
 share/wesnoth/data/core/images/units/dwarves/sentinel-defend-2.png
 share/wesnoth/data/core/images/units/dwarves/sentinel.png
 share/wesnoth/data/core/images/units/dwarves/stalwart-attack.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-bob-1.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-bob-2.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-bob-3.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-bob-4.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-bob-5.png
 share/wesnoth/data/core/images/units/dwarves/stalwart-defend-1.png
 share/wesnoth/data/core/images/units/dwarves/stalwart-defend-2.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-se-run-1.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-se-run-10.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-se-run-2.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-se-run-3.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-se-run-4.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-se-run-5.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-se-run-6.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-se-run-7.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-se-run-8.png
+share/wesnoth/data/core/images/units/dwarves/stalwart-se-run-9.png
 share/wesnoth/data/core/images/units/dwarves/stalwart.png
+share/wesnoth/data/core/images/units/dwarves/stalwart/stalwart-ne-attack1.png
+share/wesnoth/data/core/images/units/dwarves/stalwart/stalwart-ne-attack2.png
+share/wesnoth/data/core/images/units/dwarves/stalwart/stalwart-ne-attack3.png
+share/wesnoth/data/core/images/units/dwarves/stalwart/stalwart-ne-attack4.png
+share/wesnoth/data/core/images/units/dwarves/stalwart/stalwart-ne-attack5.png
+share/wesnoth/data/core/images/units/dwarves/stalwart/stalwart-ne-attack6.png
+share/wesnoth/data/core/images/units/dwarves/stalwart/stalwart-ne-attack7.png
+share/wesnoth/data/core/images/units/dwarves/stalwart/stalwart-ne-attack8.png
+share/wesnoth/data/core/images/units/dwarves/stalwart/stalwart-ne-attack9.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-idle-1.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-idle-10.png
 share/wesnoth/data/core/images/units/dwarves/steelclad-idle-11.png
@@ -8775,6 +9878,12 @@ share/wesnoth/data/core/images/units/dwa
 share/wesnoth/data/core/images/units/dwarves/ulfserker-attack-6.png
 share/wesnoth/data/core/images/units/dwarves/ulfserker-attack-7.png
 share/wesnoth/data/core/images/units/dwarves/ulfserker-attack-8.png
+share/wesnoth/data/core/images/units/dwarves/ulfserker-bob-1.png
+share/wesnoth/data/core/images/units/dwarves/ulfserker-bob-2.png
+share/wesnoth/data/core/images/units/dwarves/ulfserker-bob-3.png
+share/wesnoth/data/core/images/units/dwarves/ulfserker-bob-4.png
+share/wesnoth/data/core/images/units/dwarves/ulfserker-bob-5.png
+share/wesnoth/data/core/images/units/dwarves/ulfserker-bob-6.png
 share/wesnoth/data/core/images/units/dwarves/ulfserker-idle-1.png
 share/wesnoth/data/core/images/units/dwarves/ulfserker-idle-2.png
 share/wesnoth/data/core/images/units/dwarves/ulfserker-idle-3.png
@@ -9121,9 +10230,6 @@ share/wesnoth/data/core/images/units/elv
 share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-8.png
 share/wesnoth/data/core/images/units/elves-wood/sorceress-melee-attack-9.png
 share/wesnoth/data/core/images/units/elves-wood/sorceress.png
-share/wesnoth/data/core/images/units/elves-wood/sylph-defend.png
-share/wesnoth/data/core/images/units/elves-wood/sylph-magic.png
-share/wesnoth/data/core/images/units/elves-wood/sylph-melee.png
 share/wesnoth/data/core/images/units/elves-wood/sylph.png
 share/wesnoth/data/core/images/units/goblins/direwolver-attack.png
 share/wesnoth/data/core/images/units/goblins/direwolver-defend-1.png
@@ -9328,17 +10434,21 @@ share/wesnoth/data/core/images/units/hum
 share/wesnoth/data/core/images/units/human-loyalists/halberdier-slash-se-1.png
 share/wesnoth/data/core/images/units/human-loyalists/halberdier-slash-se-2.png
 share/wesnoth/data/core/images/units/human-loyalists/halberdier.png
-share/wesnoth/data/core/images/units/human-loyalists/heavy-infantry-idle-1.png
-share/wesnoth/data/core/images/units/human-loyalists/heavy-infantry-idle-2.png
-share/wesnoth/data/core/images/units/human-loyalists/heavy-infantry-idle-3.png
-share/wesnoth/data/core/images/units/human-loyalists/heavy-infantry-idle-4.png
-share/wesnoth/data/core/images/units/human-loyalists/heavy-infantry-idle-5.png
-share/wesnoth/data/core/images/units/human-loyalists/heavy-infantry-idle-6.png
-share/wesnoth/data/core/images/units/human-loyalists/heavy-infantry-idle-7.png
-share/wesnoth/data/core/images/units/human-loyalists/heavy-infantry-idle-8.png
-share/wesnoth/data/core/images/units/human-loyalists/heavy-infantry-idle-9.png
 share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-1.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-10.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-11.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-12.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-13.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-14.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-15.png
 share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-2.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-3.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-4.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-5.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-6.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-7.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-8.png
+share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-attack-9.png
 share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-defend-1.png
 share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry-defend-2.png
 share/wesnoth/data/core/images/units/human-loyalists/heavyinfantry.png
@@ -9443,6 +10553,148 @@ share/wesnoth/data/core/images/units/hum
 share/wesnoth/data/core/images/units/human-loyalists/javelineer-defend-ranged.png
 share/wesnoth/data/core/images/units/human-loyalists/javelineer-defend.png
 share/wesnoth/data/core/images/units/human-loyalists/javelineer.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack10.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack11.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack12.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack7.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack8.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-attack9.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash10.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash11.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash12.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash7.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash8.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-n-slash9.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack10.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack11.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack12.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack7.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack8.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-attack9.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-bob1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-bob2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-bob3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-bob4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-bob5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-bob6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-defend1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-defend2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-die1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-die2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-die3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-die4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-die5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-run1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-run2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-run3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-run4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-run5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-run6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-run7.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-run8.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash10.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash11.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash12.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash7.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash8.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-ne-slash9.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack10.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack11.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack12.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack13.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack7.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack8.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-attack9.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash10.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash11.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash12.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash13.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash7.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash8.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-s-slash9.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack10.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack11.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack12.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack13.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack7.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack8.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-attack9.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-bob1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-bob2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-bob3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-bob4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-bob5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-bob6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-defend1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-defend2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-die1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-die2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-die3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-die4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-die5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-run1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-run2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-run3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-run4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-run5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-run6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-run7.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-run8.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash1.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash10.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash11.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash12.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash13.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash2.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash3.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash4.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash5.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash6.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash7.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash8.png
+share/wesnoth/data/core/images/units/human-loyalists/knight/knight-se-slash9.png
 share/wesnoth/data/core/images/units/human-loyalists/knight/knight.png
 share/wesnoth/data/core/images/units/human-loyalists/lancer/lancer.png
 share/wesnoth/data/core/images/units/human-loyalists/lieutenant-attack-sword-1.png
@@ -9617,6 +10869,10 @@ share/wesnoth/data/core/images/units/hum
 share/wesnoth/data/core/images/units/human-loyalists/shocktrooper.png
 share/wesnoth/data/core/images/units/human-loyalists/siegetrooper-attack-1.png
 share/wesnoth/data/core/images/units/human-loyalists/siegetrooper-attack-2.png
+share/wesnoth/data/core/images/units/human-loyalists/siegetrooper-attack-3.png
+share/wesnoth/data/core/images/units/human-loyalists/siegetrooper-attack-4.png
+share/wesnoth/data/core/images/units/human-loyalists/siegetrooper-attack-5.png
+share/wesnoth/data/core/images/units/human-loyalists/siegetrooper-attack-6.png
 share/wesnoth/data/core/images/units/human-loyalists/siegetrooper-defend-1.png
 share/wesnoth/data/core/images/units/human-loyalists/siegetrooper-defend-2.png
 share/wesnoth/data/core/images/units/human-loyalists/siegetrooper.png
@@ -9721,6 +10977,16 @@ share/wesnoth/data/core/images/units/hum
 share/wesnoth/data/core/images/units/human-magi/arch-mage-idle-3.png
 share/wesnoth/data/core/images/units/human-magi/arch-mage-idle-4.png
 share/wesnoth/data/core/images/units/human-magi/arch-mage-idle-5.png
+share/wesnoth/data/core/images/units/human-magi/arch-mage-standing-1.png
+share/wesnoth/data/core/images/units/human-magi/arch-mage-standing-10.png
+share/wesnoth/data/core/images/units/human-magi/arch-mage-standing-2.png
+share/wesnoth/data/core/images/units/human-magi/arch-mage-standing-3.png
+share/wesnoth/data/core/images/units/human-magi/arch-mage-standing-4.png
+share/wesnoth/data/core/images/units/human-magi/arch-mage-standing-5.png
+share/wesnoth/data/core/images/units/human-magi/arch-mage-standing-6.png
+share/wesnoth/data/core/images/units/human-magi/arch-mage-standing-7.png
+share/wesnoth/data/core/images/units/human-magi/arch-mage-standing-8.png
+share/wesnoth/data/core/images/units/human-magi/arch-mage-standing-9.png
 share/wesnoth/data/core/images/units/human-magi/arch-mage.png
 share/wesnoth/data/core/images/units/human-magi/elder-mage-defend.png
 share/wesnoth/data/core/images/units/human-magi/elder-mage-melee1.png
@@ -9746,40 +11012,24 @@ share/wesnoth/data/core/images/units/hum
 share/wesnoth/data/core/images/units/human-magi/mage+female-attack-staff1.png
 share/wesnoth/data/core/images/units/human-magi/mage+female-attack-staff2.png
 share/wesnoth/data/core/images/units/human-magi/mage+female-defend.png
-share/wesnoth/data/core/images/units/human-magi/mage+female-die-1.png
-share/wesnoth/data/core/images/units/human-magi/mage+female-die-2.png
-share/wesnoth/data/core/images/units/human-magi/mage+female-die-3.png
-share/wesnoth/data/core/images/units/human-magi/mage+female-die-4.png
 share/wesnoth/data/core/images/units/human-magi/mage+female.png
 share/wesnoth/data/core/images/units/human-magi/mage-attack-magic1.png
 share/wesnoth/data/core/images/units/human-magi/mage-attack-magic2.png
 share/wesnoth/data/core/images/units/human-magi/mage-attack-staff1.png
 share/wesnoth/data/core/images/units/human-magi/mage-attack-staff2.png
 share/wesnoth/data/core/images/units/human-magi/mage-defend.png
-share/wesnoth/data/core/images/units/human-magi/mage-die-1.png
-share/wesnoth/data/core/images/units/human-magi/mage-die-2.png
-share/wesnoth/data/core/images/units/human-magi/mage-die-3.png
-share/wesnoth/data/core/images/units/human-magi/mage-die-4.png
 share/wesnoth/data/core/images/units/human-magi/mage.png
 share/wesnoth/data/core/images/units/human-magi/red-mage+female-attack-magic-1.png
 share/wesnoth/data/core/images/units/human-magi/red-mage+female-attack-magic-2.png
 share/wesnoth/data/core/images/units/human-magi/red-mage+female-attack-staff-1.png
 share/wesnoth/data/core/images/units/human-magi/red-mage+female-attack-staff-2.png
 share/wesnoth/data/core/images/units/human-magi/red-mage+female-defend.png
-share/wesnoth/data/core/images/units/human-magi/red-mage+female-die-1.png
-share/wesnoth/data/core/images/units/human-magi/red-mage+female-die-2.png
-share/wesnoth/data/core/images/units/human-magi/red-mage+female-die-3.png
-share/wesnoth/data/core/images/units/human-magi/red-mage+female-die-4.png
 share/wesnoth/data/core/images/units/human-magi/red-mage+female.png
 share/wesnoth/data/core/images/units/human-magi/red-mage-attack-magic-1.png
 share/wesnoth/data/core/images/units/human-magi/red-mage-attack-magic-2.png
 share/wesnoth/data/core/images/units/human-magi/red-mage-attack-staff-1.png
 share/wesnoth/data/core/images/units/human-magi/red-mage-attack-staff-2.png
 share/wesnoth/data/core/images/units/human-magi/red-mage-defend.png
-share/wesnoth/data/core/images/units/human-magi/red-mage-die-1.png
-share/wesnoth/data/core/images/units/human-magi/red-mage-die-2.png
-share/wesnoth/data/core/images/units/human-magi/red-mage-die-3.png
-share/wesnoth/data/core/images/units/human-magi/red-mage-die-4.png
 share/wesnoth/data/core/images/units/human-magi/red-mage.png
 share/wesnoth/data/core/images/units/human-magi/silver-mage+female-attack-magic1.png
 share/wesnoth/data/core/images/units/human-magi/silver-mage+female-attack-magic2.png
@@ -9985,25 +11235,11 @@ share/wesnoth/data/core/images/units/hum
 share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-defend-1.png
 share/wesnoth/data/core/images/units/human-outlaws/ranger-sword-defend-2.png
 share/wesnoth/data/core/images/units/human-outlaws/ranger.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue+female-attack.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue+female-defend.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue+female-die-1.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue+female-die-2.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue+female-die-3.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue+female-die-4.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue+female-die-5.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue+female-die-6.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue+female-ranged.png
+share/wesnoth/data/core/images/units/human-outlaws/rogue+female-defend-1.png
+share/wesnoth/data/core/images/units/human-outlaws/rogue+female-defend-2.png
 share/wesnoth/data/core/images/units/human-outlaws/rogue+female.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue-attack.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue-defend.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue-die-1.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue-die-2.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue-die-3.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue-die-4.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue-die-5.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue-die-6.png
-share/wesnoth/data/core/images/units/human-outlaws/rogue-ranged.png
+share/wesnoth/data/core/images/units/human-outlaws/rogue-defend-1.png
+share/wesnoth/data/core/images/units/human-outlaws/rogue-defend-2.png
 share/wesnoth/data/core/images/units/human-outlaws/rogue.png
 share/wesnoth/data/core/images/units/human-outlaws/thief+female-attack.png
 share/wesnoth/data/core/images/units/human-outlaws/thief+female-defend-1-1.png
@@ -10142,32 +11378,6 @@ share/wesnoth/data/core/images/units/hum
 share/wesnoth/data/core/images/units/human-peasants/woodsman-melee-1.png
 share/wesnoth/data/core/images/units/human-peasants/woodsman-melee-2.png
 share/wesnoth/data/core/images/units/human-peasants/woodsman.png
-share/wesnoth/data/core/images/units/khalifate/arif.png
-share/wesnoth/data/core/images/units/khalifate/batal.png
-share/wesnoth/data/core/images/units/khalifate/elder-falcon.png
-share/wesnoth/data/core/images/units/khalifate/falcon.png
-share/wesnoth/data/core/images/units/khalifate/faris.png
-share/wesnoth/data/core/images/units/khalifate/ghazi.png
-share/wesnoth/data/core/images/units/khalifate/hadaf.png
-share/wesnoth/data/core/images/units/khalifate/hakim.png
-share/wesnoth/data/core/images/units/khalifate/jawal.png
-share/wesnoth/data/core/images/units/khalifate/jundi.png
-share/wesnoth/data/core/images/units/khalifate/khaiyal.png
-share/wesnoth/data/core/images/units/khalifate/khalid.png
-share/wesnoth/data/core/images/units/khalifate/mighwar.png
-share/wesnoth/data/core/images/units/khalifate/monawish.png
-share/wesnoth/data/core/images/units/khalifate/mudafi.png
-share/wesnoth/data/core/images/units/khalifate/mufariq.png
-share/wesnoth/data/core/images/units/khalifate/muharib.png
-share/wesnoth/data/core/images/units/khalifate/naffat.png
-share/wesnoth/data/core/images/units/khalifate/qanas.png
-share/wesnoth/data/core/images/units/khalifate/qatif-al-nar.png
-share/wesnoth/data/core/images/units/khalifate/rami.png
-share/wesnoth/data/core/images/units/khalifate/rasikh.png
-share/wesnoth/data/core/images/units/khalifate/saree.png
-share/wesnoth/data/core/images/units/khalifate/shuja.png
-share/wesnoth/data/core/images/units/khalifate/tabib.png
-share/wesnoth/data/core/images/units/khalifate/tineen.png
 share/wesnoth/data/core/images/units/merfolk/diviner.png
 share/wesnoth/data/core/images/units/merfolk/enchantress.png
 share/wesnoth/data/core/images/units/merfolk/entangler.png
@@ -10254,6 +11464,21 @@ share/wesnoth/data/core/images/units/mon
 share/wesnoth/data/core/images/units/monsters/deep-tentacle-die-4.png
 share/wesnoth/data/core/images/units/monsters/deep-tentacle-die-5.png
 share/wesnoth/data/core/images/units/monsters/deep-tentacle-die-6.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-defend-1.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-defend-2.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-n-1.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-n-2.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-n-3.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-n-4.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-n-5.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-n-6.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-s-1.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-s-2.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-s-3.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-s-4.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-s-5.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-melee-s-6.png
+share/wesnoth/data/core/images/units/monsters/deep-tentacle-ranged-defend.png
 share/wesnoth/data/core/images/units/monsters/deep-tentacle.png
 share/wesnoth/data/core/images/units/monsters/direwolf-attack.png
 share/wesnoth/data/core/images/units/monsters/direwolf-defend-1.png
@@ -10335,7 +11560,46 @@ share/wesnoth/data/core/images/units/mon
 share/wesnoth/data/core/images/units/monsters/mudcrawler-die-2.png
 share/wesnoth/data/core/images/units/monsters/mudcrawler-die-3.png
 share/wesnoth/data/core/images/units/monsters/mudcrawler.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-defend1.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-defend2.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-ne-defend1.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-ne-defend2.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-ne-pincer1.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-ne-pincer2.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-ne-pincer3.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-ne-pincer4.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-ne-pincer5.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-ne-pincer6.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-ne.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-pincer-1.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-pincer-2.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-pincer-3.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-pincer-4.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-pincer-5.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-pincer-6.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-stinger-1.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-stinger-2.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-stinger-3.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-stinger-4.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-stinger-5.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-stinger-6.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpion-stinger-7.png
 share/wesnoth/data/core/images/units/monsters/scorpion/scorpion.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-defend1.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-defend2.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-pincer1.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-pincer2.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-pincer3.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-pincer4.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-pincer5.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-pincer6.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-pincer7.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-sting1.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-sting2.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-sting3.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-sting4.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling-sting5.png
+share/wesnoth/data/core/images/units/monsters/scorpion/scorpling.png
 share/wesnoth/data/core/images/units/monsters/seaserpent.png
 share/wesnoth/data/core/images/units/monsters/skeletal-dragon/skeletal-dragon.png
 share/wesnoth/data/core/images/units/monsters/spider-melee-1.png
@@ -10458,6 +11722,12 @@ share/wesnoth/data/core/images/units/ogr
 share/wesnoth/data/core/images/units/ogres/young-ogre-idle-3.png
 share/wesnoth/data/core/images/units/ogres/young-ogre-idle-4.png
 share/wesnoth/data/core/images/units/ogres/young-ogre.png
+share/wesnoth/data/core/images/units/orcs/archer-bob-1.png
+share/wesnoth/data/core/images/units/orcs/archer-bob-2.png
+share/wesnoth/data/core/images/units/orcs/archer-bob-3.png
+share/wesnoth/data/core/images/units/orcs/archer-bob-4.png
+share/wesnoth/data/core/images/units/orcs/archer-bob-5.png
+share/wesnoth/data/core/images/units/orcs/archer-bob-6.png
 share/wesnoth/data/core/images/units/orcs/archer-bow-attack-1.png
 share/wesnoth/data/core/images/units/orcs/archer-bow-attack-2.png
 share/wesnoth/data/core/images/units/orcs/archer-bow-attack-3.png
@@ -10541,6 +11811,45 @@ share/wesnoth/data/core/images/units/orc
 share/wesnoth/data/core/images/units/orcs/leader-ranged-defend.png
 share/wesnoth/data/core/images/units/orcs/leader-ranged.png
 share/wesnoth/data/core/images/units/orcs/leader.png
+share/wesnoth/data/core/images/units/orcs/nightblade-attack-se1.png
+share/wesnoth/data/core/images/units/orcs/nightblade-attack-se2.png
+share/wesnoth/data/core/images/units/orcs/nightblade-attack-se3.png
+share/wesnoth/data/core/images/units/orcs/nightblade-attack-se4.png
+share/wesnoth/data/core/images/units/orcs/nightblade-attack-se5.png
+share/wesnoth/data/core/images/units/orcs/nightblade-attack-se6.png
+share/wesnoth/data/core/images/units/orcs/nightblade-attack-se7.png
+share/wesnoth/data/core/images/units/orcs/nightblade-attack-se8.png
+share/wesnoth/data/core/images/units/orcs/nightblade-attack-se9.png
+share/wesnoth/data/core/images/units/orcs/nightblade-defend-se1-1.png
+share/wesnoth/data/core/images/units/orcs/nightblade-defend-se1-2.png
+share/wesnoth/data/core/images/units/orcs/nightblade-defend-se1-3.png
+share/wesnoth/data/core/images/units/orcs/nightblade-defend-se1-4.png
+share/wesnoth/data/core/images/units/orcs/nightblade-defend-se1-5.png
+share/wesnoth/data/core/images/units/orcs/nightblade-defend-se2-1.png
+share/wesnoth/data/core/images/units/orcs/nightblade-defend-se2-2.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se1.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se10.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se11.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se12.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se2.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se3.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se4.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se5.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se6.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se7.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se8.png
+share/wesnoth/data/core/images/units/orcs/nightblade-kick-se9.png
+share/wesnoth/data/core/images/units/orcs/nightblade-se.png
+share/wesnoth/data/core/images/units/orcs/nightblade-throw-se1.png
+share/wesnoth/data/core/images/units/orcs/nightblade-throw-se2.png
+share/wesnoth/data/core/images/units/orcs/nightblade-throw-se3.png
+share/wesnoth/data/core/images/units/orcs/nightblade-throw-se4.png
+share/wesnoth/data/core/images/units/orcs/nightblade-throw-se5.png
+share/wesnoth/data/core/images/units/orcs/nightblade-throw-se6.png
+share/wesnoth/data/core/images/units/orcs/nightblade-throw-se7.png
+share/wesnoth/data/core/images/units/orcs/nightblade-throw-se8.png
+share/wesnoth/data/core/images/units/orcs/nightblade-throw-se9.png
+share/wesnoth/data/core/images/units/orcs/nightblade.png
 share/wesnoth/data/core/images/units/orcs/ruler-attack-sword-1.png
 share/wesnoth/data/core/images/units/orcs/ruler-attack-sword-2.png
 share/wesnoth/data/core/images/units/orcs/ruler-attack-sword-3.png
@@ -11247,7 +12556,6 @@ share/wesnoth/data/core/images/units/und
 share/wesnoth/data/core/images/units/undead-necromancers/ancient-lich-magic-3.png
 share/wesnoth/data/core/images/units/undead-necromancers/ancient-lich-melee-1.png
 share/wesnoth/data/core/images/units/undead-necromancers/ancient-lich-melee-2.png
-share/wesnoth/data/core/images/units/undead-necromancers/ancient-lich-melee.png
 share/wesnoth/data/core/images/units/undead-necromancers/ancient-lich.png
 share/wesnoth/data/core/images/units/undead-necromancers/dark-sorcerer+female-attack-staff-1.png
 share/wesnoth/data/core/images/units/undead-necromancers/dark-sorcerer+female-attack-staff-2.png
@@ -11287,49 +12595,57 @@ share/wesnoth/data/core/images/units/und
 share/wesnoth/data/core/images/units/undead-necromancers/necromancer-magic-2.png
 share/wesnoth/data/core/images/units/undead-necromancers/necromancer-magic-3.png
 share/wesnoth/data/core/images/units/undead-necromancers/necromancer.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-attack.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-bow-attack-1.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-bow-attack-2.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-bow-attack-3.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-bow-attack-4.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-bow-defend.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-bow.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-defend.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-1.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-10.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-11.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-12.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-13.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-2.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-3.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-4.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-5.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-6.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-7.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-8.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die-9.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die2-1.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die2-2.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die2-3.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die2-4.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die2-5.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die2-6.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-die2-7.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-1.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-10.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-11.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-12.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-13.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-14.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-2.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-3.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-4.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-5.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-6.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-7.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-8.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer-idle-9.png
-share/wesnoth/data/core/images/units/undead-skeletal/archer.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-attack.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bob-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bob-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bob-3.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bob-4.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bob-5.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bob-6.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bob-7.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bob-8.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bow-attack-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bow-attack-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bow-attack-3.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bow-attack-4.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bow-defend.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-bow.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-defend.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-10.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-11.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-12.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-13.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-3.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-4.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-5.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-6.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-7.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-8.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die-9.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die2-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die2-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die2-3.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die2-4.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die2-5.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die2-6.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-die2-7.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-10.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-11.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-12.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-13.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-14.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-3.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-4.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-5.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-6.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-7.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-8.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer-idle-9.png
+share/wesnoth/data/core/images/units/undead-skeletal/archer/archer.png
 share/wesnoth/data/core/images/units/undead-skeletal/banebow-bow-attack-1.png
 share/wesnoth/data/core/images/units/undead-skeletal/banebow-bow-attack-2.png
 share/wesnoth/data/core/images/units/undead-skeletal/banebow-bow-attack-3.png
@@ -11343,6 +12659,14 @@ share/wesnoth/data/core/images/units/und
 share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-defend-1.png
 share/wesnoth/data/core/images/units/undead-skeletal/banebow-melee-defend-2.png
 share/wesnoth/data/core/images/units/undead-skeletal/banebow.png
+share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bob-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bob-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bob-3.png
+share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bob-4.png
+share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bob-5.png
+share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bob-6.png
+share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bob-7.png
+share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bob-8.png
 share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bow-attack-1.png
 share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bow-attack-2.png
 share/wesnoth/data/core/images/units/undead-skeletal/bone-shooter-bow-attack-3.png
@@ -11398,29 +12722,53 @@ share/wesnoth/data/core/images/units/und
 share/wesnoth/data/core/images/units/undead-skeletal/deathknight.png
 share/wesnoth/data/core/images/units/undead-skeletal/draug-attack1.png
 share/wesnoth/data/core/images/units/undead-skeletal/draug-attack2.png
+share/wesnoth/data/core/images/units/undead-skeletal/draug-bob1.png
+share/wesnoth/data/core/images/units/undead-skeletal/draug-bob2.png
+share/wesnoth/data/core/images/units/undead-skeletal/draug-bob3.png
+share/wesnoth/data/core/images/units/undead-skeletal/draug-bob4.png
+share/wesnoth/data/core/images/units/undead-skeletal/draug-bob5.png
+share/wesnoth/data/core/images/units/undead-skeletal/draug-bob6.png
+share/wesnoth/data/core/images/units/undead-skeletal/draug-bob7.png
+share/wesnoth/data/core/images/units/undead-skeletal/draug-bob8.png
 share/wesnoth/data/core/images/units/undead-skeletal/draug-defend-1.png
 share/wesnoth/data/core/images/units/undead-skeletal/draug-defend-2.png
 share/wesnoth/data/core/images/units/undead-skeletal/draug.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack-1.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack-10.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack-2.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack-3.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack-4.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack-5.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack-6.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack-7.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack-8.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack-9.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-defend-1.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-defend-2.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-1.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-2.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-3.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-4.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-5.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-6.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-7.png
-share/wesnoth/data/core/images/units/undead-skeletal/revenant.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-attack-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-attack-10.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-attack-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-attack-3.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-attack-4.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-attack-5.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-attack-6.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-attack-7.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-attack-8.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-attack-9.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-defend-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-defend-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-dying-1.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-dying-2.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-dying-3.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-dying-4.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-dying-5.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-dying-6.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-dying-7.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-ne-bob1.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-ne-bob2.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-ne-bob3.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-ne-bob4.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-ne-bob5.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-ne-bob6.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-ne-bob7.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-ne-bob8.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-se-bob1.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-se-bob2.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-se-bob3.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-se-bob4.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-se-bob5.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-se-bob6.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-se-bob7.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant-se-bob8.png
+share/wesnoth/data/core/images/units/undead-skeletal/revenant/revenant.png
 share/wesnoth/data/core/images/units/undead-skeletal/skeleton/skeleton-dying-1.png
 share/wesnoth/data/core/images/units/undead-skeletal/skeleton/skeleton-dying-2.png
 share/wesnoth/data/core/images/units/undead-skeletal/skeleton/skeleton-dying-3.png
@@ -11623,6 +12971,7 @@ share/wesnoth/data/core/images/units/und
 share/wesnoth/data/core/images/units/undead/soulless-drake-die-1.png
 share/wesnoth/data/core/images/units/undead/soulless-drake-die-2.png
 share/wesnoth/data/core/images/units/undead/soulless-drake-die-3.png
+share/wesnoth/data/core/images/units/undead/soulless-drake-die-4.png
 share/wesnoth/data/core/images/units/undead/soulless-drake.png
 share/wesnoth/data/core/images/units/undead/soulless-dwarf-attack-n.png
 share/wesnoth/data/core/images/units/undead/soulless-dwarf-attack-s.png
@@ -11642,6 +12991,15 @@ share/wesnoth/data/core/images/units/und
 share/wesnoth/data/core/images/units/undead/soulless-goblin-die-3.png
 share/wesnoth/data/core/images/units/undead/soulless-goblin-die-4.png
 share/wesnoth/data/core/images/units/undead/soulless-goblin.png
+share/wesnoth/data/core/images/units/undead/soulless-gryphon-attack-n.png
+share/wesnoth/data/core/images/units/undead/soulless-gryphon-attack-s.png
+share/wesnoth/data/core/images/units/undead/soulless-gryphon-attack.png
+share/wesnoth/data/core/images/units/undead/soulless-gryphon-defend.png
+share/wesnoth/data/core/images/units/undead/soulless-gryphon-die-1.png
+share/wesnoth/data/core/images/units/undead/soulless-gryphon-die-2.png
+share/wesnoth/data/core/images/units/undead/soulless-gryphon-die-3.png
+share/wesnoth/data/core/images/units/undead/soulless-gryphon-die-4.png
+share/wesnoth/data/core/images/units/undead/soulless-gryphon.png
 share/wesnoth/data/core/images/units/undead/soulless-mounted-attack-n.png
 share/wesnoth/data/core/images/units/undead/soulless-mounted-attack-s.png
 share/wesnoth/data/core/images/units/undead/soulless-mounted-attack.png
@@ -11678,6 +13036,15 @@ share/wesnoth/data/core/images/units/und
 share/wesnoth/data/core/images/units/undead/soulless-troll-die-3.png
 share/wesnoth/data/core/images/units/undead/soulless-troll-die-4.png
 share/wesnoth/data/core/images/units/undead/soulless-troll.png
+share/wesnoth/data/core/images/units/undead/soulless-wolf-attack-n.png
+share/wesnoth/data/core/images/units/undead/soulless-wolf-attack-s.png
+share/wesnoth/data/core/images/units/undead/soulless-wolf-attack.png
+share/wesnoth/data/core/images/units/undead/soulless-wolf-defend.png
+share/wesnoth/data/core/images/units/undead/soulless-wolf-die-1.png
+share/wesnoth/data/core/images/units/undead/soulless-wolf-die-2.png
+share/wesnoth/data/core/images/units/undead/soulless-wolf-die-3.png
+share/wesnoth/data/core/images/units/undead/soulless-wolf-die-4.png
+share/wesnoth/data/core/images/units/undead/soulless-wolf.png
 share/wesnoth/data/core/images/units/undead/soulless-wose-attack-n.png
 share/wesnoth/data/core/images/units/undead/soulless-wose-attack-s.png
 share/wesnoth/data/core/images/units/undead/soulless-wose-attack.png
@@ -11767,6 +13134,15 @@ share/wesnoth/data/core/images/units/und
 share/wesnoth/data/core/images/units/undead/zombie-goblin-die-3.png
 share/wesnoth/data/core/images/units/undead/zombie-goblin-die-4.png
 share/wesnoth/data/core/images/units/undead/zombie-goblin.png
+share/wesnoth/data/core/images/units/undead/zombie-gryphon-attack-n.png
+share/wesnoth/data/core/images/units/undead/zombie-gryphon-attack-s.png
+share/wesnoth/data/core/images/units/undead/zombie-gryphon-attack.png
+share/wesnoth/data/core/images/units/undead/zombie-gryphon-defend.png
+share/wesnoth/data/core/images/units/undead/zombie-gryphon-die-1.png
+share/wesnoth/data/core/images/units/undead/zombie-gryphon-die-2.png
+share/wesnoth/data/core/images/units/undead/zombie-gryphon-die-3.png
+share/wesnoth/data/core/images/units/undead/zombie-gryphon-die-4.png
+share/wesnoth/data/core/images/units/undead/zombie-gryphon.png
 share/wesnoth/data/core/images/units/undead/zombie-mounted-attack-n.png
 share/wesnoth/data/core/images/units/undead/zombie-mounted-attack-s.png
 share/wesnoth/data/core/images/units/undead/zombie-mounted-attack.png
@@ -11803,6 +13179,15 @@ share/wesnoth/data/core/images/units/und
 share/wesnoth/data/core/images/units/undead/zombie-troll-die-3.png
 share/wesnoth/data/core/images/units/undead/zombie-troll-die-4.png
 share/wesnoth/data/core/images/units/undead/zombie-troll.png
+share/wesnoth/data/core/images/units/undead/zombie-wolf-attack-n.png
+share/wesnoth/data/core/images/units/undead/zombie-wolf-attack-s.png
+share/wesnoth/data/core/images/units/undead/zombie-wolf-attack.png
+share/wesnoth/data/core/images/units/undead/zombie-wolf-defend.png
+share/wesnoth/data/core/images/units/undead/zombie-wolf-die-1.png
+share/wesnoth/data/core/images/units/undead/zombie-wolf-die-2.png
+share/wesnoth/data/core/images/units/undead/zombie-wolf-die-3.png
+share/wesnoth/data/core/images/units/undead/zombie-wolf-die-4.png
+share/wesnoth/data/core/images/units/undead/zombie-wolf.png
 share/wesnoth/data/core/images/units/undead/zombie-wose-attack-n.png
 share/wesnoth/data/core/images/units/undead/zombie-wose-attack-s.png
 share/wesnoth/data/core/images/units/undead/zombie-wose-attack.png
@@ -11885,7 +13270,6 @@ share/wesnoth/data/core/macros/abilities
 share/wesnoth/data/core/macros/ai.cfg
 share/wesnoth/data/core/macros/ai_candidate_actions.cfg
 share/wesnoth/data/core/macros/ai_controller.cfg
-share/wesnoth/data/core/macros/ai_micro_ais.cfg
 share/wesnoth/data/core/macros/amla.cfg
 share/wesnoth/data/core/macros/animation-utils.cfg
 share/wesnoth/data/core/macros/animation-utils2.cfg
@@ -11904,7 +13288,6 @@ share/wesnoth/data/core/macros/schedules
 share/wesnoth/data/core/macros/side-utils.cfg
 share/wesnoth/data/core/macros/sound-utils.cfg
 share/wesnoth/data/core/macros/special-notes.cfg
-share/wesnoth/data/core/macros/story.cfg
 share/wesnoth/data/core/macros/teleport-utils.cfg
 share/wesnoth/data/core/macros/terrain-utils.cfg
 share/wesnoth/data/core/macros/traits.cfg
@@ -11918,6 +13301,7 @@ share/wesnoth/data/core/music/defeat.ogg
 share/wesnoth/data/core/music/defeat2.ogg
 share/wesnoth/data/core/music/elf-land.ogg
 share/wesnoth/data/core/music/elvish-theme.ogg
+share/wesnoth/data/core/music/frantic-old.ogg
 share/wesnoth/data/core/music/frantic.ogg
 share/wesnoth/data/core/music/heroes_rite.ogg
 share/wesnoth/data/core/music/into_the_shadows.ogg
@@ -11931,6 +13315,7 @@ share/wesnoth/data/core/music/main_menu.
 share/wesnoth/data/core/music/northern_mountains.ogg
 share/wesnoth/data/core/music/northerners.ogg
 share/wesnoth/data/core/music/nunc_dimittis.ogg
+share/wesnoth/data/core/music/return_to_wesnoth.ogg
 share/wesnoth/data/core/music/revelation.ogg
 share/wesnoth/data/core/music/sad.ogg
 share/wesnoth/data/core/music/siege_of_laurelmor.ogg
@@ -11973,6 +13358,7 @@ share/wesnoth/data/core/sounds/bow-puny.
 share/wesnoth/data/core/sounds/bow.ogg
 share/wesnoth/data/core/sounds/cave-in.ogg
 share/wesnoth/data/core/sounds/claws.ogg
+share/wesnoth/data/core/sounds/club-miss.ogg
 share/wesnoth/data/core/sounds/club.ogg
 share/wesnoth/data/core/sounds/crossbow-fire-miss.ogg
 share/wesnoth/data/core/sounds/crossbow-fire.ogg
@@ -11988,6 +13374,7 @@ share/wesnoth/data/core/sounds/drake-hit
 share/wesnoth/data/core/sounds/drake-hit-3.ogg
 share/wesnoth/data/core/sounds/dwarf-die-1.ogg
 share/wesnoth/data/core/sounds/dwarf-die-2.ogg
+share/wesnoth/data/core/sounds/dwarf-die-3.ogg
 share/wesnoth/data/core/sounds/dwarf-hit-1.ogg
 share/wesnoth/data/core/sounds/dwarf-hit-2.ogg
 share/wesnoth/data/core/sounds/dwarf-hit-3.ogg
@@ -12063,12 +13450,16 @@ share/wesnoth/data/core/sounds/human-old
 share/wesnoth/data/core/sounds/human-old-hit-2.ogg
 share/wesnoth/data/core/sounds/human-old-hit-3.ogg
 share/wesnoth/data/core/sounds/human-old-hit-4.ogg
+share/wesnoth/data/core/sounds/ink-miss.ogg
+share/wesnoth/data/core/sounds/ink.ogg
 share/wesnoth/data/core/sounds/knife.ogg
 share/wesnoth/data/core/sounds/lich-die.ogg
 share/wesnoth/data/core/sounds/lich-hit-1.ogg
 share/wesnoth/data/core/sounds/lich-hit-2.ogg
 share/wesnoth/data/core/sounds/lightning-miss.ogg
 share/wesnoth/data/core/sounds/lightning.ogg
+share/wesnoth/data/core/sounds/mace-miss.ogg
+share/wesnoth/data/core/sounds/mace.ogg
 share/wesnoth/data/core/sounds/mace.wav
 share/wesnoth/data/core/sounds/magic-dark-big-miss.ogg
 share/wesnoth/data/core/sounds/magic-dark-big.ogg
@@ -12103,6 +13494,10 @@ share/wesnoth/data/core/sounds/mermen-hi
 share/wesnoth/data/core/sounds/miss-1.ogg
 share/wesnoth/data/core/sounds/miss-2.ogg
 share/wesnoth/data/core/sounds/miss-3.ogg
+share/wesnoth/data/core/sounds/mud-fist-miss.ogg
+share/wesnoth/data/core/sounds/mud-fist.ogg
+share/wesnoth/data/core/sounds/mud-glob-miss.ogg
+share/wesnoth/data/core/sounds/mud-glob.ogg
 share/wesnoth/data/core/sounds/naga-die.ogg
 share/wesnoth/data/core/sounds/naga-hit-1.ogg
 share/wesnoth/data/core/sounds/naga-hit-2.ogg
@@ -12154,6 +13549,8 @@ share/wesnoth/data/core/sounds/spear.wav
 share/wesnoth/data/core/sounds/squishy-hit.wav
 share/wesnoth/data/core/sounds/squishy-miss.wav
 share/wesnoth/data/core/sounds/squishy-strike.wav
+share/wesnoth/data/core/sounds/staff-miss.ogg
+share/wesnoth/data/core/sounds/staff.ogg
 share/wesnoth/data/core/sounds/staff.wav
 share/wesnoth/data/core/sounds/sword-1.ogg
 share/wesnoth/data/core/sounds/tail.ogg
@@ -12207,11 +13604,14 @@ share/wesnoth/data/core/sounds/zombie-hi
 share/wesnoth/data/core/team-colors.cfg
 share/wesnoth/data/core/terrain-graphics.cfg
 share/wesnoth/data/core/terrain-graphics/Makefile
+share/wesnoth/data/core/terrain-graphics/aquatic.cfg
 share/wesnoth/data/core/terrain-graphics/base.cfg
+share/wesnoth/data/core/terrain-graphics/borders.cfg
 share/wesnoth/data/core/terrain-graphics/bridge.cfg
 share/wesnoth/data/core/terrain-graphics/builder.cfg
 share/wesnoth/data/core/terrain-graphics/castles.cfg
 share/wesnoth/data/core/terrain-graphics/editor.cfg
+share/wesnoth/data/core/terrain-graphics/gates.cfg
 share/wesnoth/data/core/terrain-graphics/internal-border.cfg
 share/wesnoth/data/core/terrain-graphics/internal-complex.cfg
 share/wesnoth/data/core/terrain-graphics/internal-corners.cfg
@@ -12253,6 +13653,33 @@ share/wesnoth/data/core/units/drakes/Sky
 share/wesnoth/data/core/units/drakes/Thrasher.cfg
 share/wesnoth/data/core/units/drakes/Warden.cfg
 share/wesnoth/data/core/units/drakes/Warrior.cfg
+share/wesnoth/data/core/units/dunefolk/Apothecary.cfg
+share/wesnoth/data/core/units/dunefolk/Blademaster.cfg
+share/wesnoth/data/core/units/dunefolk/Burner.cfg
+share/wesnoth/data/core/units/dunefolk/Cataphract.cfg
+share/wesnoth/data/core/units/dunefolk/Elder_Falcon.cfg
+share/wesnoth/data/core/units/dunefolk/Explorer.cfg
+share/wesnoth/data/core/units/dunefolk/Falcon.cfg
+share/wesnoth/data/core/units/dunefolk/Firetrooper.cfg
+share/wesnoth/data/core/units/dunefolk/Harrier.cfg
+share/wesnoth/data/core/units/dunefolk/Herbalist.cfg
+share/wesnoth/data/core/units/dunefolk/Marauder.cfg
+share/wesnoth/data/core/units/dunefolk/Piercer.cfg
+share/wesnoth/data/core/units/dunefolk/Raider.cfg
+share/wesnoth/data/core/units/dunefolk/Ranger.cfg
+share/wesnoth/data/core/units/dunefolk/Rider.cfg
+share/wesnoth/data/core/units/dunefolk/Rover.cfg
+share/wesnoth/data/core/units/dunefolk/Scorcher.cfg
+share/wesnoth/data/core/units/dunefolk/Skirmisher.cfg
+share/wesnoth/data/core/units/dunefolk/Soldier.cfg
+share/wesnoth/data/core/units/dunefolk/Spearguard.cfg
+share/wesnoth/data/core/units/dunefolk/Spearmaster.cfg
+share/wesnoth/data/core/units/dunefolk/Sunderer.cfg
+share/wesnoth/data/core/units/dunefolk/Swiftrider.cfg
+share/wesnoth/data/core/units/dunefolk/Swordsman.cfg
+share/wesnoth/data/core/units/dunefolk/Warmaster.cfg
+share/wesnoth/data/core/units/dunefolk/Windrider.cfg
+share/wesnoth/data/core/units/dunefolk/deprecated.cfg
 share/wesnoth/data/core/units/dwarves/Arcanister.cfg
 share/wesnoth/data/core/units/dwarves/Berserker.cfg
 share/wesnoth/data/core/units/dwarves/Dragonguard.cfg
@@ -12355,32 +13782,6 @@ share/wesnoth/data/core/units/humans/Woo
 share/wesnoth/data/core/units/humans/Woodsman_Poacher.cfg
 share/wesnoth/data/core/units/humans/Woodsman_Ranger.cfg
 share/wesnoth/data/core/units/humans/Woodsman_Trapper.cfg
-share/wesnoth/data/core/units/khalifate/Arif.cfg
-share/wesnoth/data/core/units/khalifate/Batal.cfg
-share/wesnoth/data/core/units/khalifate/Elder_Falcon.cfg
-share/wesnoth/data/core/units/khalifate/Falcon.cfg
-share/wesnoth/data/core/units/khalifate/Faris.cfg
-share/wesnoth/data/core/units/khalifate/Ghazi.cfg
-share/wesnoth/data/core/units/khalifate/Hadaf.cfg
-share/wesnoth/data/core/units/khalifate/Hakim.cfg
-share/wesnoth/data/core/units/khalifate/Jawal.cfg
-share/wesnoth/data/core/units/khalifate/Jundi.cfg
-share/wesnoth/data/core/units/khalifate/Khaiyal.cfg
-share/wesnoth/data/core/units/khalifate/Khalid.cfg
-share/wesnoth/data/core/units/khalifate/Mighwar.cfg
-share/wesnoth/data/core/units/khalifate/Monawish.cfg
-share/wesnoth/data/core/units/khalifate/Mudafi.cfg
-share/wesnoth/data/core/units/khalifate/Mufariq.cfg
-share/wesnoth/data/core/units/khalifate/Muharib.cfg
-share/wesnoth/data/core/units/khalifate/Naffat.cfg
-share/wesnoth/data/core/units/khalifate/Qanas.cfg
-share/wesnoth/data/core/units/khalifate/Qatif-al-nar.cfg
-share/wesnoth/data/core/units/khalifate/Rami.cfg
-share/wesnoth/data/core/units/khalifate/Rasikh.cfg
-share/wesnoth/data/core/units/khalifate/Saree.cfg
-share/wesnoth/data/core/units/khalifate/Shuja.cfg
-share/wesnoth/data/core/units/khalifate/Tabib.cfg
-share/wesnoth/data/core/units/khalifate/Tineen.cfg
 share/wesnoth/data/core/units/merfolk/Diviner.cfg
 share/wesnoth/data/core/units/merfolk/Enchantress.cfg
 share/wesnoth/data/core/units/merfolk/Entangler.cfg
@@ -12401,6 +13802,7 @@ share/wesnoth/data/core/units/monsters/F
 share/wesnoth/data/core/units/monsters/Giant_Mudcrawler.cfg
 share/wesnoth/data/core/units/monsters/Giant_Rat.cfg
 share/wesnoth/data/core/units/monsters/Giant_Scorpion.cfg
+share/wesnoth/data/core/units/monsters/Giant_Scorpling.cfg
 share/wesnoth/data/core/units/monsters/Giant_Spider.cfg
 share/wesnoth/data/core/units/monsters/Mudcrawler.cfg
 share/wesnoth/data/core/units/monsters/Sea_Serpent.cfg
@@ -12421,6 +13823,7 @@ share/wesnoth/data/core/units/orcs/Assas
 share/wesnoth/data/core/units/orcs/Crossbowman.cfg
 share/wesnoth/data/core/units/orcs/Grunt.cfg
 share/wesnoth/data/core/units/orcs/Leader.cfg
+share/wesnoth/data/core/units/orcs/Nightblade.cfg
 share/wesnoth/data/core/units/orcs/Ruler.cfg
 share/wesnoth/data/core/units/orcs/Slayer.cfg
 share/wesnoth/data/core/units/orcs/Slurbow.cfg
@@ -12467,112 +13870,164 @@ share/wesnoth/data/core/units/undead/Spi
 share/wesnoth/data/core/units/wose/Ancient.cfg
 share/wesnoth/data/core/units/wose/Elder.cfg
 share/wesnoth/data/core/units/wose/Wose.cfg
+share/wesnoth/data/cores.cfg
 share/wesnoth/data/english.cfg
 share/wesnoth/data/game_config.cfg
+share/wesnoth/data/gui/_main.cfg
 share/wesnoth/data/gui/default.cfg
-share/wesnoth/data/gui/default/macros/_initial.cfg
-share/wesnoth/data/gui/default/macros/filler.cfg
-share/wesnoth/data/gui/default/macros/horizontal_scrollbar.cfg
-share/wesnoth/data/gui/default/macros/vertical_scrollbar.cfg
-share/wesnoth/data/gui/default/widget/button_25x25.cfg
-share/wesnoth/data/gui/default/widget/button_default.cfg
-share/wesnoth/data/gui/default/widget/drawing_default.cfg
-share/wesnoth/data/gui/default/widget/horizontal_scrollbar_default.cfg
-share/wesnoth/data/gui/default/widget/image_default.cfg
-share/wesnoth/data/gui/default/widget/label_alignment.cfg
-share/wesnoth/data/gui/default/widget/label_default.cfg
-share/wesnoth/data/gui/default/widget/label_title_screen_revision.cfg
-share/wesnoth/data/gui/default/widget/listbox_default.cfg
-share/wesnoth/data/gui/default/widget/listbox_wml_message.cfg
-share/wesnoth/data/gui/default/widget/matrix_default.cfg
-share/wesnoth/data/gui/default/widget/minimap_default.cfg
-share/wesnoth/data/gui/default/widget/multi_page_default.cfg
-share/wesnoth/data/gui/default/widget/panel_default.cfg
-share/wesnoth/data/gui/default/widget/panel_title_screen.cfg
-share/wesnoth/data/gui/default/widget/panel_wml_message.cfg
-share/wesnoth/data/gui/default/widget/progress_bar_default.cfg
-share/wesnoth/data/gui/default/widget/progress_bar_title_screen.cfg
-share/wesnoth/data/gui/default/widget/repeating_button_default.cfg
-share/wesnoth/data/gui/default/widget/scroll_label_default.cfg
-share/wesnoth/data/gui/default/widget/scroll_label_description.cfg
-share/wesnoth/data/gui/default/widget/scroll_label_wml_message.cfg
-share/wesnoth/data/gui/default/widget/scrollbar_panel_default.cfg
-share/wesnoth/data/gui/default/widget/slider_default.cfg
-share/wesnoth/data/gui/default/widget/slider_minimal.cfg
-share/wesnoth/data/gui/default/widget/spacer_default.cfg
-share/wesnoth/data/gui/default/widget/stacked_widget_default.cfg
-share/wesnoth/data/gui/default/widget/text_box_default.cfg
-share/wesnoth/data/gui/default/widget/toggle_button_default.cfg
-share/wesnoth/data/gui/default/widget/toggle_button_icon.cfg
-share/wesnoth/data/gui/default/widget/toggle_button_listbox_text.cfg
-share/wesnoth/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg
-share/wesnoth/data/gui/default/widget/toggle_button_radio.cfg
-share/wesnoth/data/gui/default/widget/toggle_button_tree_view_node.cfg
-share/wesnoth/data/gui/default/widget/toggle_panel_default.cfg
-share/wesnoth/data/gui/default/widget/toggle_panel_wml_message.cfg
-share/wesnoth/data/gui/default/widget/tree_view_default.cfg
-share/wesnoth/data/gui/default/widget/vertical_scrollbar_default.cfg
-share/wesnoth/data/gui/default/widget/window_borderless.cfg
-share/wesnoth/data/gui/default/widget/window_default.cfg
-share/wesnoth/data/gui/default/widget/window_tooltip_large.cfg
-share/wesnoth/data/gui/default/window/addon_connect.cfg
-share/wesnoth/data/gui/default/window/addon_description.cfg
-share/wesnoth/data/gui/default/window/addon_filter_options.cfg
-share/wesnoth/data/gui/default/window/addon_list.cfg
-share/wesnoth/data/gui/default/window/addon_uninstall_list.cfg
-share/wesnoth/data/gui/default/window/campaign_dialog.cfg
-share/wesnoth/data/gui/default/window/campaign_difficulty.cfg
-share/wesnoth/data/gui/default/window/chat_log.cfg
-share/wesnoth/data/gui/default/window/custom_tod.cfg
-share/wesnoth/data/gui/default/window/data_manage.cfg
-share/wesnoth/data/gui/default/window/debug_clock.cfg
-share/wesnoth/data/gui/default/window/edit_label.cfg
-share/wesnoth/data/gui/default/window/edit_text.cfg
-share/wesnoth/data/gui/default/window/editor_edit_label.cfg
-share/wesnoth/data/gui/default/window/editor_edit_scenario.cfg
-share/wesnoth/data/gui/default/window/editor_edit_side.cfg
-share/wesnoth/data/gui/default/window/editor_generate_map.cfg
-share/wesnoth/data/gui/default/window/editor_new_map.cfg
-share/wesnoth/data/gui/default/window/editor_resize_map.cfg
-share/wesnoth/data/gui/default/window/editor_set_starting_position.cfg
-share/wesnoth/data/gui/default/window/folder_create.cfg
-share/wesnoth/data/gui/default/window/formula_debugger.cfg
-share/wesnoth/data/gui/default/window/game_delete.cfg
-share/wesnoth/data/gui/default/window/game_load.cfg
-share/wesnoth/data/gui/default/window/game_paths.cfg
-share/wesnoth/data/gui/default/window/game_save.cfg
-share/wesnoth/data/gui/default/window/game_save_message.cfg
-share/wesnoth/data/gui/default/window/game_save_oos.cfg
-share/wesnoth/data/gui/default/window/game_save_overwrite.cfg
-share/wesnoth/data/gui/default/window/gamestate_inspector.cfg
-share/wesnoth/data/gui/default/window/language_selection.cfg
-share/wesnoth/data/gui/default/window/lobby_main.cfg
-share/wesnoth/data/gui/default/window/lobby_player_info.cfg
-share/wesnoth/data/gui/default/window/message.cfg
-share/wesnoth/data/gui/default/window/mp_change_control.cfg
-share/wesnoth/data/gui/default/window/mp_cmd_wrapper.cfg
-share/wesnoth/data/gui/default/window/mp_connect.cfg
-share/wesnoth/data/gui/default/window/mp_create_game.cfg
-share/wesnoth/data/gui/default/window/mp_create_game_choose_mods.cfg
-share/wesnoth/data/gui/default/window/mp_create_game_set_password.cfg
-share/wesnoth/data/gui/default/window/mp_depcheck_confirm_change.cfg
-share/wesnoth/data/gui/default/window/mp_depcheck_select_new.cfg
-share/wesnoth/data/gui/default/window/mp_host_game_prompt.cfg
-share/wesnoth/data/gui/default/window/mp_login.cfg
-share/wesnoth/data/gui/default/window/mp_method_selection.cfg
-share/wesnoth/data/gui/default/window/mp_server_list.cfg
-share/wesnoth/data/gui/default/window/network_transmission.cfg
-share/wesnoth/data/gui/default/window/screenshot_notification.cfg
-share/wesnoth/data/gui/default/window/simple_item_selector.cfg
-share/wesnoth/data/gui/default/window/theme_list.cfg
-share/wesnoth/data/gui/default/window/title_screen.cfg
-share/wesnoth/data/gui/default/window/tooltip_large.cfg
-share/wesnoth/data/gui/default/window/transient_message.cfg
-share/wesnoth/data/gui/default/window/unit_attack.cfg
-share/wesnoth/data/gui/default/window/unit_create.cfg
-share/wesnoth/data/gui/default/window/wml_error.cfg
-share/wesnoth/data/gui/default/window/wml_message.cfg
+share/wesnoth/data/gui/macros/_initial.cfg
+share/wesnoth/data/gui/macros/custom_options_tree.cfg
+share/wesnoth/data/gui/macros/filler.cfg
+share/wesnoth/data/gui/macros/horizontal_scrollbar.cfg
+share/wesnoth/data/gui/macros/player_list_panel.cfg
+share/wesnoth/data/gui/macros/vertical_scrollbar.cfg
 share/wesnoth/data/gui/schema.cfg
+share/wesnoth/data/gui/widget/addon_list.cfg
+share/wesnoth/data/gui/widget/button_25x25.cfg
+share/wesnoth/data/gui/widget/button_default.cfg
+share/wesnoth/data/gui/widget/chatbox.cfg
+share/wesnoth/data/gui/widget/drawing_default.cfg
+share/wesnoth/data/gui/widget/horizontal_scrollbar_default.cfg
+share/wesnoth/data/gui/widget/image_default.cfg
+share/wesnoth/data/gui/widget/label_default.cfg
+share/wesnoth/data/gui/widget/label_story_screen_title.cfg
+share/wesnoth/data/gui/widget/label_title_screen_tip.cfg
+share/wesnoth/data/gui/widget/listbox_default.cfg
+share/wesnoth/data/gui/widget/listbox_wml_message.cfg
+share/wesnoth/data/gui/widget/matrix_default.cfg
+share/wesnoth/data/gui/widget/menu_button_default.cfg
+share/wesnoth/data/gui/widget/minimap_default.cfg
+share/wesnoth/data/gui/widget/multi_page_default.cfg
+share/wesnoth/data/gui/widget/multimenu_button_default.cfg
+share/wesnoth/data/gui/widget/panel_box_display.cfg
+share/wesnoth/data/gui/widget/panel_default.cfg
+share/wesnoth/data/gui/widget/panel_story_viewer.cfg
+share/wesnoth/data/gui/widget/panel_wml_message.cfg
+share/wesnoth/data/gui/widget/progress_bar_default.cfg
+share/wesnoth/data/gui/widget/repeating_button_default.cfg
+share/wesnoth/data/gui/widget/repeating_button_scrollbar.cfg
+share/wesnoth/data/gui/widget/scroll_label_default.cfg
+share/wesnoth/data/gui/widget/scroll_label_description.cfg
+share/wesnoth/data/gui/widget/scroll_label_verbatim.cfg
+share/wesnoth/data/gui/widget/scroll_label_wml_message.cfg
+share/wesnoth/data/gui/widget/scrollbar_panel_default.cfg
+share/wesnoth/data/gui/widget/size_lock_default.cfg
+share/wesnoth/data/gui/widget/slider_default.cfg
+share/wesnoth/data/gui/widget/slider_minimal.cfg
+share/wesnoth/data/gui/widget/spacer_default.cfg
+share/wesnoth/data/gui/widget/stacked_widget_default.cfg
+share/wesnoth/data/gui/widget/text_box_default.cfg
+share/wesnoth/data/gui/widget/toggle_button_default.cfg
+share/wesnoth/data/gui/widget/toggle_button_icon.cfg
+share/wesnoth/data/gui/widget/toggle_button_listbox_header.cfg
+share/wesnoth/data/gui/widget/toggle_button_orb.cfg
+share/wesnoth/data/gui/widget/toggle_button_radio.cfg
+share/wesnoth/data/gui/widget/toggle_button_tree_view_node.cfg
+share/wesnoth/data/gui/widget/toggle_panel_default.cfg
+share/wesnoth/data/gui/widget/toggle_panel_wml_message.cfg
+share/wesnoth/data/gui/widget/tree_view_default.cfg
+share/wesnoth/data/gui/widget/unit_preview_pane.cfg
+share/wesnoth/data/gui/widget/vertical_scrollbar_default.cfg
+share/wesnoth/data/gui/widget/window_borderless.cfg
+share/wesnoth/data/gui/widget/window_default.cfg
+share/wesnoth/data/gui/widget/window_tooltip_large.cfg
+share/wesnoth/data/gui/window/addon_connect.cfg
+share/wesnoth/data/gui/window/addon_manager.cfg
+share/wesnoth/data/gui/window/addon_uninstall_list.cfg
+share/wesnoth/data/gui/window/advanced_graphics_options.cfg
+share/wesnoth/data/gui/window/attack_predictions.cfg
+share/wesnoth/data/gui/window/campaign_dialog.cfg
+share/wesnoth/data/gui/window/campaign_difficulty.cfg
+share/wesnoth/data/gui/window/chat_log.cfg
+share/wesnoth/data/gui/window/core_dialog.cfg
+share/wesnoth/data/gui/window/custom_tod.cfg
+share/wesnoth/data/gui/window/debug_clock.cfg
+share/wesnoth/data/gui/window/depcheck_confirm_change.cfg
+share/wesnoth/data/gui/window/depcheck_select_new.cfg
+share/wesnoth/data/gui/window/drop_down_list.cfg
+share/wesnoth/data/gui/window/edit_label.cfg
+share/wesnoth/data/gui/window/edit_text.cfg
+share/wesnoth/data/gui/window/editor_edit_label.cfg
+share/wesnoth/data/gui/window/editor_edit_scenario.cfg
+share/wesnoth/data/gui/window/editor_edit_side.cfg
+share/wesnoth/data/gui/window/editor_generate_map.cfg
+share/wesnoth/data/gui/window/editor_new_map.cfg
+share/wesnoth/data/gui/window/editor_resize_map.cfg
+share/wesnoth/data/gui/window/editor_set_starting_position.cfg
+share/wesnoth/data/gui/window/end_credits.cfg
+share/wesnoth/data/gui/window/file_dialog.cfg
+share/wesnoth/data/gui/window/folder_create.cfg
+share/wesnoth/data/gui/window/formula_debugger.cfg
+share/wesnoth/data/gui/window/game_cache_options.cfg
+share/wesnoth/data/gui/window/game_delete.cfg
+share/wesnoth/data/gui/window/game_load.cfg
+share/wesnoth/data/gui/window/game_save.cfg
+share/wesnoth/data/gui/window/game_save_message.cfg
+share/wesnoth/data/gui/window/game_save_oos.cfg
+share/wesnoth/data/gui/window/game_save_overwrite.cfg
+share/wesnoth/data/gui/window/game_stats.cfg
+share/wesnoth/data/gui/window/game_version.cfg
+share/wesnoth/data/gui/window/gamestate_inspector.cfg
+share/wesnoth/data/gui/window/generator_settings.cfg
+share/wesnoth/data/gui/window/help_browser.cfg
+share/wesnoth/data/gui/window/hotkey_bind.cfg
+share/wesnoth/data/gui/window/install_dependencies.cfg
+share/wesnoth/data/gui/window/label_settings.cfg
+share/wesnoth/data/gui/window/language_selection.cfg
+share/wesnoth/data/gui/window/loadscreen.cfg
+share/wesnoth/data/gui/window/lobby_main.cfg
+share/wesnoth/data/gui/window/lobby_player_info.cfg
+share/wesnoth/data/gui/window/logging.cfg
+share/wesnoth/data/gui/window/lua_interpreter.cfg
+share/wesnoth/data/gui/window/message.cfg
+share/wesnoth/data/gui/window/mp_alerts_options.cfg
+share/wesnoth/data/gui/window/mp_change_control.cfg
+share/wesnoth/data/gui/window/mp_connect.cfg
+share/wesnoth/data/gui/window/mp_create_game.cfg
+share/wesnoth/data/gui/window/mp_create_game/default_resolution.cfg
+share/wesnoth/data/gui/window/mp_create_game/small_resolution.cfg
+share/wesnoth/data/gui/window/mp_create_game/tiny_resolution.cfg
+share/wesnoth/data/gui/window/mp_faction_select.cfg
+share/wesnoth/data/gui/window/mp_host_game_prompt.cfg
+share/wesnoth/data/gui/window/mp_join_game.cfg
+share/wesnoth/data/gui/window/mp_join_game_password_prompt.cfg
+share/wesnoth/data/gui/window/mp_login.cfg
+share/wesnoth/data/gui/window/mp_method_selection.cfg
+share/wesnoth/data/gui/window/mp_server_list.cfg
+share/wesnoth/data/gui/window/mp_staging.cfg
+share/wesnoth/data/gui/window/network_transmission.cfg
+share/wesnoth/data/gui/window/outro.cfg
+share/wesnoth/data/gui/window/preferences.cfg
+share/wesnoth/data/gui/window/preferences/01_general.cfg
+share/wesnoth/data/gui/window/preferences/02_hotkeys.cfg
+share/wesnoth/data/gui/window/preferences/03_display.cfg
+share/wesnoth/data/gui/window/preferences/04_sound.cfg
+share/wesnoth/data/gui/window/preferences/05_multiplayer.cfg
+share/wesnoth/data/gui/window/preferences/06_advanced.cfg
+share/wesnoth/data/gui/window/preferences/_final.cfg
+share/wesnoth/data/gui/window/preferences/_initial.cfg
+share/wesnoth/data/gui/window/screenshot_notification.cfg
+share/wesnoth/data/gui/window/select_orb_colors.cfg
+share/wesnoth/data/gui/window/simple_item_selector.cfg
+share/wesnoth/data/gui/window/sp_options_configure.cfg
+share/wesnoth/data/gui/window/statistics_dialog.cfg
+share/wesnoth/data/gui/window/story_viewer.cfg
+share/wesnoth/data/gui/window/surrender_quit.cfg
+share/wesnoth/data/gui/window/synced_choice_wait.cfg
+share/wesnoth/data/gui/window/terrain_layers.cfg
+share/wesnoth/data/gui/window/theme_list.cfg
+share/wesnoth/data/gui/window/title_screen.cfg
+share/wesnoth/data/gui/window/tooltip_floating.cfg
+share/wesnoth/data/gui/window/tooltip_large.cfg
+share/wesnoth/data/gui/window/transient_message.cfg
+share/wesnoth/data/gui/window/unit_advance.cfg
+share/wesnoth/data/gui/window/unit_attack.cfg
+share/wesnoth/data/gui/window/unit_create.cfg
+share/wesnoth/data/gui/window/unit_list.cfg
+share/wesnoth/data/gui/window/unit_recall.cfg
+share/wesnoth/data/gui/window/unit_recruit.cfg
+share/wesnoth/data/gui/window/wml_error.cfg
+share/wesnoth/data/gui/window/wml_message.cfg
 share/wesnoth/data/hardwired/WARNING
 share/wesnoth/data/hardwired/fonts.cfg
 share/wesnoth/data/hardwired/language.cfg
@@ -12581,6 +14036,7 @@ share/wesnoth/data/languages/af_ZA.cfg
 share/wesnoth/data/languages/ang_GB.cfg
 share/wesnoth/data/languages/ang_GB%latin.cfg@localhost
 share/wesnoth/data/languages/ar_AR.cfg
+share/wesnoth/data/languages/ast_ES.cfg
 share/wesnoth/data/languages/bg_BG.cfg
 share/wesnoth/data/languages/ca_ES.cfg
 share/wesnoth/data/languages/ca_ES%valencia.cfg@localhost
@@ -12636,15 +14092,46 @@ share/wesnoth/data/languages/vi_VN.cfg
 share/wesnoth/data/languages/zh_CN.cfg
 share/wesnoth/data/languages/zh_TW.cfg
 share/wesnoth/data/lua/backwards-compatibility.lua
+share/wesnoth/data/lua/cave_map_generator.lua
+share/wesnoth/data/lua/core.lua
+share/wesnoth/data/lua/feeding.lua
+share/wesnoth/data/lua/functional.lua
 share/wesnoth/data/lua/helper.lua
+share/wesnoth/data/lua/ilua.lua
 share/wesnoth/data/lua/location_set.lua
+share/wesnoth/data/lua/mapgen_helper.lua
+share/wesnoth/data/lua/on_event.lua
+share/wesnoth/data/lua/package.lua
+share/wesnoth/data/lua/wml-conditionals.lua
+share/wesnoth/data/lua/wml-flow.lua
 share/wesnoth/data/lua/wml-tags.lua
+share/wesnoth/data/lua/wml-utils.lua
+share/wesnoth/data/lua/wml/animate_unit.lua
+share/wesnoth/data/lua/wml/endlevel.lua
+share/wesnoth/data/lua/wml/find_path.lua
+share/wesnoth/data/lua/wml/harm_unit.lua
+share/wesnoth/data/lua/wml/heal_unit.lua
 share/wesnoth/data/lua/wml/items.lua
+share/wesnoth/data/lua/wml/kill.lua
+share/wesnoth/data/lua/wml/message.lua
+share/wesnoth/data/lua/wml/micro_ai.lua
+share/wesnoth/data/lua/wml/modify_ai.lua
+share/wesnoth/data/lua/wml/modify_side.lua
+share/wesnoth/data/lua/wml/modify_unit.lua
+share/wesnoth/data/lua/wml/move_unit.lua
+share/wesnoth/data/lua/wml/object.lua
 share/wesnoth/data/lua/wml/objectives.lua
+share/wesnoth/data/lua/wml/random_placement.lua
+share/wesnoth/data/lua/wml/role.lua
+share/wesnoth/data/lua/wml/set_variable.lua
+share/wesnoth/data/lua/wml/test_condition.lua
 share/wesnoth/data/multiplayer/_main.cfg
 share/wesnoth/data/multiplayer/eras.cfg
+share/wesnoth/data/multiplayer/eras.lua
 share/wesnoth/data/multiplayer/factions/drakes-aoh.cfg
 share/wesnoth/data/multiplayer/factions/drakes-default.cfg
+share/wesnoth/data/multiplayer/factions/dunefolk-aoh.cfg
+share/wesnoth/data/multiplayer/factions/dunefolk-default.cfg
 share/wesnoth/data/multiplayer/factions/khalifate-aoh.cfg
 share/wesnoth/data/multiplayer/factions/khalifate-default.cfg
 share/wesnoth/data/multiplayer/factions/knalgans-aoh.cfg
@@ -12660,26 +14147,35 @@ share/wesnoth/data/multiplayer/factions/
 share/wesnoth/data/multiplayer/maps/2p_Aethermaw.map
 share/wesnoth/data/multiplayer/maps/2p_Arcanclave_Citadel.map
 share/wesnoth/data/multiplayer/maps/2p_Caves_of_the_Basilisk.map
+share/wesnoth/data/multiplayer/maps/2p_Clearing_Gushes.map
 share/wesnoth/data/multiplayer/maps/2p_Cynsaun_Battlefield.map
 share/wesnoth/data/multiplayer/maps/2p_Den_of_Onis.map
 share/wesnoth/data/multiplayer/maps/2p_Elensefar_Courtyard.map
 share/wesnoth/data/multiplayer/maps/2p_Fallenstar_Lake.map
 share/wesnoth/data/multiplayer/maps/2p_Hamlets.map
+share/wesnoth/data/multiplayer/maps/2p_Hellhole.map
 share/wesnoth/data/multiplayer/maps/2p_Hornshark_Island.map
 share/wesnoth/data/multiplayer/maps/2p_Howling_Ghost_Badlands.map
+share/wesnoth/data/multiplayer/maps/2p_Ruined_Passage.map
+share/wesnoth/data/multiplayer/maps/2p_Ruphus_Isle.map
 share/wesnoth/data/multiplayer/maps/2p_Sablestone_Delta.map
 share/wesnoth/data/multiplayer/maps/2p_Silverhead_Crossing.map
 share/wesnoth/data/multiplayer/maps/2p_Sullas_Ruins.map
+share/wesnoth/data/multiplayer/maps/2p_Swamp_of_Dread.map
 share/wesnoth/data/multiplayer/maps/2p_The_Freelands.map
+share/wesnoth/data/multiplayer/maps/2p_The_Walls_of_Pyrennis.map
 share/wesnoth/data/multiplayer/maps/2p_Thousand_Stings_Garrison.map
+share/wesnoth/data/multiplayer/maps/2p_Tombs_of_Kesorak.map
 share/wesnoth/data/multiplayer/maps/2p_Weldyn_Channel.map
 share/wesnoth/data/multiplayer/maps/3p_Alirok_Marsh.map
 share/wesnoth/data/multiplayer/maps/3p_Island_of_the_Horatii.map
 share/wesnoth/data/multiplayer/maps/3p_Morituri.map
 share/wesnoth/data/multiplayer/maps/4p_A_New_Land.map
+share/wesnoth/data/multiplayer/maps/4p_Bath_of_Glory.map
 share/wesnoth/data/multiplayer/maps/4p_Blue_Water_Province.map
 share/wesnoth/data/multiplayer/maps/4p_Castle_Hopping_Isle.map
 share/wesnoth/data/multiplayer/maps/4p_Clash.map
+share/wesnoth/data/multiplayer/maps/4p_Geothermal.map
 share/wesnoth/data/multiplayer/maps/4p_Hamlets.map
 share/wesnoth/data/multiplayer/maps/4p_Isars_Cross.map
 share/wesnoth/data/multiplayer/maps/4p_King_of_the_Hill.map
@@ -12695,43 +14191,53 @@ share/wesnoth/data/multiplayer/maps/5p_F
 share/wesnoth/data/multiplayer/maps/5p_The_Wilderlands.map
 share/wesnoth/data/multiplayer/maps/6p_Crusaders_Field.map
 share/wesnoth/data/multiplayer/maps/6p_Hexcake.map
+share/wesnoth/data/multiplayer/maps/6p_Team_Survival.map
 share/wesnoth/data/multiplayer/maps/6p_The_Manzivan_Traps.map
 share/wesnoth/data/multiplayer/maps/6p_Volcano.map
 share/wesnoth/data/multiplayer/maps/6p_Waterloo_Sunset.map
 share/wesnoth/data/multiplayer/maps/8p_Mokena_Prairie.map
 share/wesnoth/data/multiplayer/maps/8p_Morituri.map
 share/wesnoth/data/multiplayer/maps/9p_Merkwuerdigliebe.map
-share/wesnoth/data/multiplayer/maps/Dark_Forecast.map
-share/wesnoth/data/multiplayer/maps/Dark_Forecast_basic.mask
-share/wesnoth/data/multiplayer/maps/Dark_Forecast_drought.mask
-share/wesnoth/data/multiplayer/maps/Dark_Forecast_firstsnow.mask
-share/wesnoth/data/multiplayer/maps/Dark_Forecast_rain.mask
-share/wesnoth/data/multiplayer/maps/Dark_Forecast_secondsnow.mask
+share/wesnoth/data/multiplayer/maps/Dark_Forecast_basic.map
+share/wesnoth/data/multiplayer/maps/Dark_Forecast_drought.map
+share/wesnoth/data/multiplayer/maps/Dark_Forecast_firstsnow.map
+share/wesnoth/data/multiplayer/maps/Dark_Forecast_rain.map
+share/wesnoth/data/multiplayer/maps/Dark_Forecast_secondsnow.map
 share/wesnoth/data/multiplayer/scenarios/2p_Aethermaw.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Arcanclave_Citadel.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg
+share/wesnoth/data/multiplayer/scenarios/2p_Clearing_Gushes.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Cynsaun_Battlefield.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Dark_Forecast.cfg
+share/wesnoth/data/multiplayer/scenarios/2p_Dark_Forecast.lua
 share/wesnoth/data/multiplayer/scenarios/2p_Den_of_Onis.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Elensefar_Courtyard.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Fallenstar_Lake.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Hamlets.cfg
+share/wesnoth/data/multiplayer/scenarios/2p_Hellhole.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Hornshark_Island.cfg
-share/wesnoth/data/multiplayer/scenarios/2p_Hornshark_Island_lua
+share/wesnoth/data/multiplayer/scenarios/2p_Hornshark_Island.lua
 share/wesnoth/data/multiplayer/scenarios/2p_Howling_Ghost_Badlands.cfg
+share/wesnoth/data/multiplayer/scenarios/2p_Ruined_Passage.cfg
+share/wesnoth/data/multiplayer/scenarios/2p_Ruphus_Isle.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Sablestone_Delta.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Silverhead_Crossing.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Sullas_Ruins.cfg
+share/wesnoth/data/multiplayer/scenarios/2p_Swamp_of_Dread.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_The_Freelands.cfg
+share/wesnoth/data/multiplayer/scenarios/2p_The_Walls_of_Pyrennis.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Thousand_Stings_Garrison.cfg
+share/wesnoth/data/multiplayer/scenarios/2p_Tombs_of_Kesorak.cfg
 share/wesnoth/data/multiplayer/scenarios/2p_Weldyn_Channel.cfg
 share/wesnoth/data/multiplayer/scenarios/3p_Alirok_Marsh.cfg
 share/wesnoth/data/multiplayer/scenarios/3p_Island_of_the_Horatii.cfg
 share/wesnoth/data/multiplayer/scenarios/3p_Morituri.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_A_New_Land.cfg
+share/wesnoth/data/multiplayer/scenarios/4p_Bath_of_Glory.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Blue_Water_Province.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Castle_Hopping_Isle.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Clash.cfg
+share/wesnoth/data/multiplayer/scenarios/4p_Geothermal.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Hamlets.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_Isars_Cross.cfg
 share/wesnoth/data/multiplayer/scenarios/4p_King_of_the_Hill.cfg
@@ -12768,18 +14274,76 @@ share/wesnoth/data/multiplayer/scenarios
 share/wesnoth/data/multiplayer/scenarios/Wesbench_AI.cfg
 share/wesnoth/data/multiplayer/scenarios/Wesbench_Scroll.cfg
 share/wesnoth/data/multiplayer/scenarios/Wesbench_Shroud_Walk.cfg
-share/wesnoth/data/scenario-formula-recruitment.cfg
-share/wesnoth/data/scenario-formula.cfg
 share/wesnoth/data/scenario-leaders.cfg
 share/wesnoth/data/scenario-movethrough.cfg
-share/wesnoth/data/scenario-poisoning.cfg
+share/wesnoth/data/scenario-story.cfg
 share/wesnoth/data/scenario-test.cfg
 share/wesnoth/data/schema-gui.cfg
 share/wesnoth/data/schema.cfg
+share/wesnoth/data/shaders/default.frag
+share/wesnoth/data/shaders/default.vert
 share/wesnoth/data/test/_main.cfg
+share/wesnoth/data/test/macros/pathfind_answers.cfg
 share/wesnoth/data/test/macros/readme.txt
-share/wesnoth/data/test/scenarios/_main.cfg
+share/wesnoth/data/test/macros/test.lua
+share/wesnoth/data/test/macros/wml_unit_test_macros.cfg
+share/wesnoth/data/test/maps/generic_unit_test.map
+share/wesnoth/data/test/maps/move_skip_sighted.map
+share/wesnoth/data/test/maps/pathfind_1.cfg
+share/wesnoth/data/test/maps/sighted_events.map
+share/wesnoth/data/test/maps/test_grunt_tod_damage.map
+share/wesnoth/data/test/multiplayer/_main.cfg
+share/wesnoth/data/test/multiplayer/macros/mp_unit_test_macros.cfg
+share/wesnoth/data/test/multiplayer/scenarios/test1.cfg
+share/wesnoth/data/test/multiplayer/scenarios/test2.cfg
+share/wesnoth/data/test/scenarios/ai/_main.cfg
+share/wesnoth/data/test/scenarios/ai/config/simple_aspect.cfg
+share/wesnoth/data/test/scenarios/ai/modify/aspects.cfg
+share/wesnoth/data/test/scenarios/break_replay_with_lua_random.cfg
+share/wesnoth/data/test/scenarios/characterize_pathfinding.cfg
+share/wesnoth/data/test/scenarios/conditionals.cfg
+share/wesnoth/data/test/scenarios/empty_test.cfg
+share/wesnoth/data/test/scenarios/event_handlers_in_events.cfg
+share/wesnoth/data/test/scenarios/facing.cfg
+share/wesnoth/data/test/scenarios/feeding.cfg
+share/wesnoth/data/test/scenarios/filter_this_unit.cfg
+share/wesnoth/data/test/scenarios/filter_vision.cfg
+share/wesnoth/data/test/scenarios/for-loops.cfg
+share/wesnoth/data/test/scenarios/has_ally.cfg
+share/wesnoth/data/test/scenarios/interrupts.cfg
+share/wesnoth/data/test/scenarios/move_skip_sighted.cfg
+share/wesnoth/data/test/scenarios/order_of_nested_events.cfg
+share/wesnoth/data/test/scenarios/prestart_settings.cfg
 share/wesnoth/data/test/scenarios/readme.txt
+share/wesnoth/data/test/scenarios/recruit_facing.cfg
+share/wesnoth/data/test/scenarios/sighted_events.cfg
+share/wesnoth/data/test/scenarios/store_locations.cfg
+share/wesnoth/data/test/scenarios/test_assert.cfg
+share/wesnoth/data/test/scenarios/test_berzerk_firststrike.cfg
+share/wesnoth/data/test/scenarios/test_check_victory.cfg
+share/wesnoth/data/test/scenarios/test_clear.cfg
+share/wesnoth/data/test/scenarios/test_dofile.cfg
+share/wesnoth/data/test/scenarios/test_end_turn.cfg
+share/wesnoth/data/test/scenarios/test_event_names_and_order.cfg
+share/wesnoth/data/test/scenarios/test_for_tag.cfg
+share/wesnoth/data/test/scenarios/test_grunt_tod_damage.cfg
+share/wesnoth/data/test/scenarios/test_lua.cfg
+share/wesnoth/data/test/scenarios/test_lua_wml.cfg
+share/wesnoth/data/test/scenarios/test_lua_wml_tagnames.cfg
+share/wesnoth/data/test/scenarios/test_max_menu_items.cfg
+share/wesnoth/data/test/scenarios/test_menu_items.cfg
+share/wesnoth/data/test/scenarios/test_move.cfg
+share/wesnoth/data/test/scenarios/test_move_unit.cfg
+share/wesnoth/data/test/scenarios/test_relative_dir.cfg
+share/wesnoth/data/test/scenarios/test_require.cfg
+share/wesnoth/data/test/scenarios/test_return.cfg
+share/wesnoth/data/test/scenarios/test_role_types.cfg
+share/wesnoth/data/test/scenarios/test_unit_map.cfg
+share/wesnoth/data/test/scenarios/test_victory_attacks.cfg
+share/wesnoth/data/test/scenarios/two_plus_two.cfg
+share/wesnoth/data/test/scenarios/unit_spawns_at_nearest_vacant_hex.cfg
+share/wesnoth/data/test/scenarios/units_offmap_goto_recall.cfg
+share/wesnoth/data/test/scenarios/xp_mod.cfg
 share/wesnoth/data/test/test/_main.cfg
 share/wesnoth/data/test/test/filesystem/enum/A1.cfg
 share/wesnoth/data/test/test/filesystem/enum/A2.cfg
@@ -12845,14 +14409,15 @@ share/wesnoth/data/test/test/leading_spa
 share/wesnoth/data/test/test/umc.cfg
 share/wesnoth/data/themes/_initial.cfg
 share/wesnoth/data/themes/classic.cfg
+share/wesnoth/data/themes/cutscene-minimal.cfg
+share/wesnoth/data/themes/cutscene.cfg
 share/wesnoth/data/themes/default.cfg
 share/wesnoth/data/themes/editor.cfg
 share/wesnoth/data/themes/null.cfg
-share/wesnoth/data/themes/pandora.cfg
 share/wesnoth/data/tips.cfg
 share/wesnoth/data/tools/GUI.pyw
 share/wesnoth/data/tools/Makefile
-share/wesnoth/data/tools/README
+share/wesnoth/data/tools/README.md
 share/wesnoth/data/tools/about_cfg_to_wiki
 share/wesnoth/data/tools/addon_manager/COPYING.txt
 share/wesnoth/data/tools/addon_manager/__init__.py
@@ -12864,54 +14429,21 @@ share/wesnoth/data/tools/addon_manager/j
 share/wesnoth/data/tools/addon_manager/style.css
 share/wesnoth/data/tools/addon_manager/tablesorter.js
 share/wesnoth/data/tools/campaign2wiki.py
-share/wesnoth/data/tools/castle-cutter/castle-walls.tmpl
-share/wesnoth/data/tools/castle-cutter/castle.png
-share/wesnoth/data/tools/castle-cutter/castles.xcf
-share/wesnoth/data/tools/castle-cutter/cutout-bg.png
-share/wesnoth/data/tools/castle-cutter/cutout-fg.png
-share/wesnoth/data/tools/castle-cutter/encampment.png
-share/wesnoth/data/tools/castle-cutter/keep1.png
-share/wesnoth/data/tools/castle-cutter/keep1.tmpl
-share/wesnoth/data/tools/castle-cutter/keep2.png
-share/wesnoth/data/tools/castle-cutter/keep2.tmpl
-share/wesnoth/data/tools/castle-cutter/mask.png
-share/wesnoth/data/tools/castle-cutter/mk-all-castles.sh
-share/wesnoth/data/tools/castle-cutter/mk-castle.sh
 share/wesnoth/data/tools/emacs_mode/Makefile
-share/wesnoth/data/tools/emacs_mode/README
+share/wesnoth/data/tools/emacs_mode/README.md
 share/wesnoth/data/tools/emacs_mode/wesnoth-mode.el
 share/wesnoth/data/tools/emacs_mode/wesnoth-mode.texi
 share/wesnoth/data/tools/emacs_mode/wesnoth-update.el
 share/wesnoth/data/tools/emacs_mode/wesnoth-wml-additions.cfg
 share/wesnoth/data/tools/emacs_mode/wesnoth-wml-data.el
 share/wesnoth/data/tools/expand-terrain-macros.py
-share/wesnoth/data/tools/exploder/castle-concave.cfg
-share/wesnoth/data/tools/exploder/castle-convex.cfg
-share/wesnoth/data/tools/exploder/castle-exploded-concave.cfg
-share/wesnoth/data/tools/exploder/castle-exploded-convex.cfg
-share/wesnoth/data/tools/exploder/castle-wall-concave.cfg
-share/wesnoth/data/tools/exploder/castle-wall-convex.cfg
-share/wesnoth/data/tools/exploder/castle-wall-exploded-concave.cfg
-share/wesnoth/data/tools/exploder/castle-wall-exploded-convex.cfg
-share/wesnoth/data/tools/exploder/castle-wall-trans-n-s.cfg
-share/wesnoth/data/tools/exploder/castle-wall-trans-ne-sw.cfg
-share/wesnoth/data/tools/exploder/castle-wall-trans-nw-se.cfg
-share/wesnoth/data/tools/exploder/castle-wall-trans-s-n.cfg
-share/wesnoth/data/tools/exploder/castle-wall-trans-se-nw.cfg
-share/wesnoth/data/tools/exploder/castle-wall-trans-sw-ne.cfg
-share/wesnoth/data/tools/exploder/models/castle.cfg
-share/wesnoth/data/tools/exploder/wall-concave.cfg
-share/wesnoth/data/tools/exploder/wall-convex.cfg
-share/wesnoth/data/tools/exploder/wall-exploded-concave.cfg
-share/wesnoth/data/tools/exploder/wall-exploded-convex.cfg
 share/wesnoth/data/tools/extractbindings
 share/wesnoth/data/tools/helpheader.html
 share/wesnoth/data/tools/helptrailer.html
-share/wesnoth/data/tools/hexometer/alphamask.png
-share/wesnoth/data/tools/hexometer/hexometer
+share/wesnoth/data/tools/hexometer.py
 share/wesnoth/data/tools/imgcheck
 share/wesnoth/data/tools/journeylifter
-share/wesnoth/data/tools/rmtrans/README
+share/wesnoth/data/tools/rmtrans/README.md
 share/wesnoth/data/tools/rmtrans/rmtrans.py
 share/wesnoth/data/tools/scoutDefault.py
 share/wesnoth/data/tools/terrain2wiki.py
@@ -12923,13 +14455,12 @@ share/wesnoth/data/tools/unit_tree/helpe
 share/wesnoth/data/tools/unit_tree/html_output.py
 share/wesnoth/data/tools/unit_tree/menu.js
 share/wesnoth/data/tools/unit_tree/overview.py
-share/wesnoth/data/tools/unit_tree/style.css
 share/wesnoth/data/tools/unit_tree/update-wmlunits
 share/wesnoth/data/tools/unit_tree/wiki_output.py
 share/wesnoth/data/tools/vim/formulaai.vim
 share/wesnoth/data/tools/vim/wesml.vim
 share/wesnoth/data/tools/vim/wmllua.vim
-share/wesnoth/data/tools/wesnoth/README
+share/wesnoth/data/tools/wesnoth/README.md
 share/wesnoth/data/tools/wesnoth/__init__.py
 share/wesnoth/data/tools/wesnoth/campaignserver_client.py
 share/wesnoth/data/tools/wesnoth/libgithub.py
@@ -12937,26 +14468,53 @@ share/wesnoth/data/tools/wesnoth/wescamp
 share/wesnoth/data/tools/wesnoth/wmldata.py
 share/wesnoth/data/tools/wesnoth/wmlgrammar.py
 share/wesnoth/data/tools/wesnoth/wmliterator.py
+share/wesnoth/data/tools/wesnoth/wmliterator3.py
 share/wesnoth/data/tools/wesnoth/wmlparser.py
 share/wesnoth/data/tools/wesnoth/wmlparser2.py
+share/wesnoth/data/tools/wesnoth/wmlparser3.py
 share/wesnoth/data/tools/wesnoth/wmltools.py
+share/wesnoth/data/tools/wesnoth/wmltools3.py
 share/wesnoth/data/tools/wesnoth_addon_manager
 share/wesnoth/data/tools/wmlflip
 share/wesnoth/data/tools/wmlindent
 share/wesnoth/data/tools/wmllint
 share/wesnoth/data/tools/wmllint-1.4
-share/wesnoth/data/tools/wmllint_gui
-share/wesnoth/data/tools/wmlmove
 share/wesnoth/data/tools/wmlscope
 share/wesnoth/data/tools/wmlunits
 share/wesnoth/data/tools/wmlvalidator
 share/wesnoth/fonts/Andagii.ttf
 share/wesnoth/fonts/COPYING
+share/wesnoth/fonts/DejaVuSans-Bold.ttf
+share/wesnoth/fonts/DejaVuSans-Oblique.ttf
 share/wesnoth/fonts/DejaVuSans.ttf
+share/wesnoth/fonts/DejaVuSansMono-Bold.ttf
+share/wesnoth/fonts/DejaVuSansMono.ttf
 share/wesnoth/fonts/DroidSansFallbackFull.ttf
 share/wesnoth/fonts/DroidSansJapanese.ttf
+share/wesnoth/fonts/Lato-Black.ttf
+share/wesnoth/fonts/Lato-BlackItalic.ttf
+share/wesnoth/fonts/Lato-Bold.ttf
+share/wesnoth/fonts/Lato-BoldItalic.ttf
+share/wesnoth/fonts/Lato-Hairline.ttf
+share/wesnoth/fonts/Lato-HairlineItalic.ttf
+share/wesnoth/fonts/Lato-Heavy.ttf
+share/wesnoth/fonts/Lato-HeavyItalic.ttf
+share/wesnoth/fonts/Lato-Italic.ttf
+share/wesnoth/fonts/Lato-Light.ttf
+share/wesnoth/fonts/Lato-LightItalic.ttf
+share/wesnoth/fonts/Lato-Medium.ttf
+share/wesnoth/fonts/Lato-MediumItalic.ttf
+share/wesnoth/fonts/Lato-Regular.ttf
+share/wesnoth/fonts/Lato-Semibold.ttf
+share/wesnoth/fonts/Lato-SemiboldItalic.ttf
+share/wesnoth/fonts/Lato-Thin.ttf
+share/wesnoth/fonts/Lato-ThinItalic.ttf
+share/wesnoth/fonts/OldaniaADFStd-Bold.otf
+share/wesnoth/fonts/OldaniaADFStd-BoldItalic.otf
+share/wesnoth/fonts/OldaniaADFStd-Italic.otf
+share/wesnoth/fonts/OldaniaADFStd-Regular.otf
 share/wesnoth/fonts/fonts.conf
-share/wesnoth/images/README
+share/wesnoth/images/README.md
 share/wesnoth/images/arrows/focus/end-n.png
 share/wesnoth/images/arrows/focus/end-ne.png
 share/wesnoth/images/arrows/focus/end-nw.png
@@ -13197,6 +14755,12 @@ share/wesnoth/images/arrows/standard/tel
 share/wesnoth/images/arrows/standard/teleport-out.png
 share/wesnoth/images/arrows/template.xcf
 share/wesnoth/images/buttons/WML-custom.png
+share/wesnoth/images/buttons/button_dropdown/button_dropdown-pressed.png
+share/wesnoth/images/buttons/button_dropdown/button_dropdown.png
+share/wesnoth/images/buttons/button_menu/menu_blank-active-pressed.png
+share/wesnoth/images/buttons/button_menu/menu_blank-active.png
+share/wesnoth/images/buttons/button_menu/menu_blank-pressed.png
+share/wesnoth/images/buttons/button_menu/menu_blank.png
 share/wesnoth/images/buttons/button_menu/menu_button_copper_H20-active-pressed.png
 share/wesnoth/images/buttons/button_menu/menu_button_copper_H20-active-pressed%2x.png@localhost
 share/wesnoth/images/buttons/button_menu/menu_button_copper_H20-active.png
@@ -13213,6 +14777,9 @@ share/wesnoth/images/buttons/button_menu
 share/wesnoth/images/buttons/button_menu/menu_button_small_copper_H20-pressed%2x.png@localhost
 share/wesnoth/images/buttons/button_menu/menu_button_small_copper_H20.png
 share/wesnoth/images/buttons/button_menu/menu_button_small_copper_H20%2x.png@localhost
+share/wesnoth/images/buttons/button_normal/background-active.png
+share/wesnoth/images/buttons/button_normal/background-pressed.png
+share/wesnoth/images/buttons/button_normal/background.png
 share/wesnoth/images/buttons/button_normal/button_H22-active-pressed.png
 share/wesnoth/images/buttons/button_normal/button_H22-active-pressed%2x.png@localhost
 share/wesnoth/images/buttons/button_normal/button_H22-active.png
@@ -13315,6 +14882,11 @@ share/wesnoth/images/buttons/large-butto
 share/wesnoth/images/buttons/large-button-active.png
 share/wesnoth/images/buttons/large-button-pressed.png
 share/wesnoth/images/buttons/large-button.png
+share/wesnoth/images/buttons/misc/orb-active.png
+share/wesnoth/images/buttons/misc/orb-pressed-bg-active.png
+share/wesnoth/images/buttons/misc/orb-pressed-bg.png
+share/wesnoth/images/buttons/misc/orb-pressed.png
+share/wesnoth/images/buttons/misc/orb.png
 share/wesnoth/images/buttons/radiobox-active-pressed.png
 share/wesnoth/images/buttons/radiobox-active-pressed%2x.png@localhost
 share/wesnoth/images/buttons/radiobox-active.png
@@ -13325,30 +14897,48 @@ share/wesnoth/images/buttons/radiobox-to
 share/wesnoth/images/buttons/radiobox-touched%2x.png@localhost
 share/wesnoth/images/buttons/radiobox.png
 share/wesnoth/images/buttons/radiobox%2x.png@localhost
-share/wesnoth/images/buttons/scrollbottom-active.png
-share/wesnoth/images/buttons/scrollbottom-pressed.png
-share/wesnoth/images/buttons/scrollbottom.png
-share/wesnoth/images/buttons/scrollgroove-bottom.png
-share/wesnoth/images/buttons/scrollgroove-horizontal.png
-share/wesnoth/images/buttons/scrollgroove-left.png
-share/wesnoth/images/buttons/scrollgroove-mid.png
-share/wesnoth/images/buttons/scrollgroove-right.png
-share/wesnoth/images/buttons/scrollgroove-top.png
-share/wesnoth/images/buttons/scrollhorizontal-active.png
-share/wesnoth/images/buttons/scrollhorizontal-pressed.png
-share/wesnoth/images/buttons/scrollhorizontal.png
-share/wesnoth/images/buttons/scrollleft-active.png
-share/wesnoth/images/buttons/scrollleft-pressed.png
-share/wesnoth/images/buttons/scrollleft.png
-share/wesnoth/images/buttons/scrollmid-active.png
-share/wesnoth/images/buttons/scrollmid-pressed.png
-share/wesnoth/images/buttons/scrollmid.png
-share/wesnoth/images/buttons/scrollright-active.png
-share/wesnoth/images/buttons/scrollright-pressed.png
-share/wesnoth/images/buttons/scrollright.png
-share/wesnoth/images/buttons/scrolltop-active.png
-share/wesnoth/images/buttons/scrolltop-pressed.png
-share/wesnoth/images/buttons/scrolltop.png
+share/wesnoth/images/buttons/scrollbars/scrollbottom-active.png
+share/wesnoth/images/buttons/scrollbars/scrollbottom-pressed.png
+share/wesnoth/images/buttons/scrollbars/scrollbottom.png
+share/wesnoth/images/buttons/scrollbars/scrollhorizontal-active.png
+share/wesnoth/images/buttons/scrollbars/scrollhorizontal-pressed.png
+share/wesnoth/images/buttons/scrollbars/scrollhorizontal.png
+share/wesnoth/images/buttons/scrollbars/scrollleft-active.png
+share/wesnoth/images/buttons/scrollbars/scrollleft-pressed.png
+share/wesnoth/images/buttons/scrollbars/scrollleft.png
+share/wesnoth/images/buttons/scrollbars/scrollmid-active.png
+share/wesnoth/images/buttons/scrollbars/scrollmid-pressed.png
+share/wesnoth/images/buttons/scrollbars/scrollmid.png
+share/wesnoth/images/buttons/scrollbars/scrollright-active.png
+share/wesnoth/images/buttons/scrollbars/scrollright-pressed.png
+share/wesnoth/images/buttons/scrollbars/scrollright.png
+share/wesnoth/images/buttons/scrollbars/scrolltop-active.png
+share/wesnoth/images/buttons/scrollbars/scrolltop-pressed.png
+share/wesnoth/images/buttons/scrollbars/scrolltop.png
+share/wesnoth/images/buttons/scrollbars_large/scrollbottom-active.png
+share/wesnoth/images/buttons/scrollbars_large/scrollbottom-pressed.png
+share/wesnoth/images/buttons/scrollbars_large/scrollbottom.png
+share/wesnoth/images/buttons/scrollbars_large/scrollgroove-bottom.png
+share/wesnoth/images/buttons/scrollbars_large/scrollgroove-horizontal.png
+share/wesnoth/images/buttons/scrollbars_large/scrollgroove-left.png
+share/wesnoth/images/buttons/scrollbars_large/scrollgroove-mid.png
+share/wesnoth/images/buttons/scrollbars_large/scrollgroove-right.png
+share/wesnoth/images/buttons/scrollbars_large/scrollgroove-top.png
+share/wesnoth/images/buttons/scrollbars_large/scrollhorizontal-active.png
+share/wesnoth/images/buttons/scrollbars_large/scrollhorizontal-pressed.png
+share/wesnoth/images/buttons/scrollbars_large/scrollhorizontal.png
+share/wesnoth/images/buttons/scrollbars_large/scrollleft-active.png
+share/wesnoth/images/buttons/scrollbars_large/scrollleft-pressed.png
+share/wesnoth/images/buttons/scrollbars_large/scrollleft.png
+share/wesnoth/images/buttons/scrollbars_large/scrollmid-active.png
+share/wesnoth/images/buttons/scrollbars_large/scrollmid-pressed.png
+share/wesnoth/images/buttons/scrollbars_large/scrollmid.png
+share/wesnoth/images/buttons/scrollbars_large/scrollright-active.png
+share/wesnoth/images/buttons/scrollbars_large/scrollright-pressed.png
+share/wesnoth/images/buttons/scrollbars_large/scrollright.png
+share/wesnoth/images/buttons/scrollbars_large/scrolltop-active.png
+share/wesnoth/images/buttons/scrollbars_large/scrolltop-pressed.png
+share/wesnoth/images/buttons/scrollbars_large/scrolltop.png
 share/wesnoth/images/buttons/sliders/slider-active.png
 share/wesnoth/images/buttons/sliders/slider-active%2x.png@localhost
 share/wesnoth/images/buttons/sliders/slider-pressed.png
@@ -13387,15 +14977,25 @@ share/wesnoth/images/cursors-bw/select.p
 share/wesnoth/images/cursors-bw/wait-alt.png
 share/wesnoth/images/cursors-bw/wait.png
 share/wesnoth/images/cursors/attack.png
+share/wesnoth/images/cursors/attack%2x.png@localhost
 share/wesnoth/images/cursors/attack_drag.png
+share/wesnoth/images/cursors/attack_drag%2x.png@localhost
 share/wesnoth/images/cursors/move.png
+share/wesnoth/images/cursors/move%2x.png@localhost
 share/wesnoth/images/cursors/move_drag.png
+share/wesnoth/images/cursors/move_drag%2x.png@localhost
 share/wesnoth/images/cursors/normal.png
+share/wesnoth/images/cursors/normal%2x.png@localhost
 share/wesnoth/images/cursors/select-illegal.png
+share/wesnoth/images/cursors/select-illegal%2x.png@localhost
 share/wesnoth/images/cursors/select-location.png
+share/wesnoth/images/cursors/select-location%2x.png@localhost
 share/wesnoth/images/cursors/select.png
+share/wesnoth/images/cursors/select%2x.png@localhost
 share/wesnoth/images/cursors/wait.png
-share/wesnoth/images/dialogs/README
+share/wesnoth/images/cursors/wait%2x.png@localhost
+share/wesnoth/images/dialogs/README.md
+share/wesnoth/images/dialogs/addon_manager_bg.jpg
 share/wesnoth/images/dialogs/lite_opaque-background.png
 share/wesnoth/images/dialogs/lite_opaque-border-botleft.png
 share/wesnoth/images/dialogs/lite_opaque-border-botright.png
@@ -13423,15 +15023,18 @@ share/wesnoth/images/dialogs/medium_tran
 share/wesnoth/images/dialogs/medium_translucent-border-topleft.png
 share/wesnoth/images/dialogs/medium_translucent-border-topright.png
 share/wesnoth/images/dialogs/medium_translucent-border_bottom.png
-share/wesnoth/images/dialogs/menu2-background.png
-share/wesnoth/images/dialogs/menu2-border-botleft.png
-share/wesnoth/images/dialogs/menu2-border-botright.png
-share/wesnoth/images/dialogs/menu2-border-bottom.png
-share/wesnoth/images/dialogs/menu2-border-left.png
-share/wesnoth/images/dialogs/menu2-border-right.png
-share/wesnoth/images/dialogs/menu2-border-top.png
-share/wesnoth/images/dialogs/menu2-border-topleft.png
-share/wesnoth/images/dialogs/menu2-border-topright.png
+share/wesnoth/images/dialogs/menu-background.png
+share/wesnoth/images/dialogs/menu-border-botleft.png
+share/wesnoth/images/dialogs/menu-border-botright.png
+share/wesnoth/images/dialogs/menu-border-bottom.png
+share/wesnoth/images/dialogs/menu-border-left.png
+share/wesnoth/images/dialogs/menu-border-right.png
+share/wesnoth/images/dialogs/menu-border-top.png
+share/wesnoth/images/dialogs/menu-border-topleft.png
+share/wesnoth/images/dialogs/menu-border-topright.png
+share/wesnoth/images/dialogs/multi_create/background.png
+share/wesnoth/images/dialogs/multi_create/corner.png
+share/wesnoth/images/dialogs/multi_create/decor.png
 share/wesnoth/images/dialogs/opaque-background.png
 share/wesnoth/images/dialogs/opaque-border-botleft.png
 share/wesnoth/images/dialogs/opaque-border-botright.png
@@ -13441,6 +15044,7 @@ share/wesnoth/images/dialogs/opaque-bord
 share/wesnoth/images/dialogs/opaque-border-top.png
 share/wesnoth/images/dialogs/opaque-border-topleft.png
 share/wesnoth/images/dialogs/opaque-border-topright.png
+share/wesnoth/images/dialogs/selection-background-fancy.png
 share/wesnoth/images/dialogs/selection-background.png
 share/wesnoth/images/dialogs/selection-border-botleft.png
 share/wesnoth/images/dialogs/selection-border-botright.png
@@ -13459,6 +15063,7 @@ share/wesnoth/images/dialogs/selection2-
 share/wesnoth/images/dialogs/selection2-border-top.png
 share/wesnoth/images/dialogs/selection2-border-topleft.png
 share/wesnoth/images/dialogs/selection2-border-topright.png
+share/wesnoth/images/dialogs/story_title_decor.png
 share/wesnoth/images/dialogs/strong_opaque-background.png
 share/wesnoth/images/dialogs/strong_opaque-border-botleft.png
 share/wesnoth/images/dialogs/strong_opaque-border-botright.png
@@ -13555,17 +15160,24 @@ share/wesnoth/images/footsteps/foot-slow
 share/wesnoth/images/footsteps/foot-slow-out-se.png
 share/wesnoth/images/footsteps/teleport-in.png
 share/wesnoth/images/footsteps/teleport-out.png
-share/wesnoth/images/game-icon.png
 share/wesnoth/images/help/closed_section.png
-share/wesnoth/images/help/indentation.png
 share/wesnoth/images/help/open_section.png
 share/wesnoth/images/help/topic.png
+share/wesnoth/images/icons/action/about_25-active.png
+share/wesnoth/images/icons/action/about_25-pressed.png
+share/wesnoth/images/icons/action/about_25.png
 share/wesnoth/images/icons/action/add_25-active.png
 share/wesnoth/images/icons/action/add_25-pressed.png
 share/wesnoth/images/icons/action/add_25.png
 share/wesnoth/images/icons/action/add_30-active.png
 share/wesnoth/images/icons/action/add_30-pressed.png
 share/wesnoth/images/icons/action/add_30.png
+share/wesnoth/images/icons/action/browse_25-active.png
+share/wesnoth/images/icons/action/browse_25-pressed.png
+share/wesnoth/images/icons/action/browse_25.png
+share/wesnoth/images/icons/action/close_25-active.png
+share/wesnoth/images/icons/action/close_25-pressed.png
+share/wesnoth/images/icons/action/close_25.png
 share/wesnoth/images/icons/action/copy_25-active.png
 share/wesnoth/images/icons/action/copy_25-pressed.png
 share/wesnoth/images/icons/action/copy_25.png
@@ -13653,6 +15265,12 @@ share/wesnoth/images/icons/action/editor
 share/wesnoth/images/icons/action/editor-draw-coordinates_30-active.png
 share/wesnoth/images/icons/action/editor-draw-coordinates_30-pressed.png
 share/wesnoth/images/icons/action/editor-draw-coordinates_30.png
+share/wesnoth/images/icons/action/editor-draw-num-of-bitmaps_25-active.png
+share/wesnoth/images/icons/action/editor-draw-num-of-bitmaps_25-pressed.png
+share/wesnoth/images/icons/action/editor-draw-num-of-bitmaps_25.png
+share/wesnoth/images/icons/action/editor-draw-num-of-bitmaps_30-active.png
+share/wesnoth/images/icons/action/editor-draw-num-of-bitmaps_30-pressed.png
+share/wesnoth/images/icons/action/editor-draw-num-of-bitmaps_30.png
 share/wesnoth/images/icons/action/editor-draw-terrain-codes_25-active.png
 share/wesnoth/images/icons/action/editor-draw-terrain-codes_25-normal.png
 share/wesnoth/images/icons/action/editor-draw-terrain-codes_25-pressed.png
@@ -13805,6 +15423,12 @@ share/wesnoth/images/icons/action/editor
 share/wesnoth/images/icons/action/editor-tool-village_30-pressed.png
 share/wesnoth/images/icons/action/editor-tool-village_30.png
 share/wesnoth/images/icons/action/editor-tool-village_60.png
+share/wesnoth/images/icons/action/help_25-active.png
+share/wesnoth/images/icons/action/help_25-pressed.png
+share/wesnoth/images/icons/action/help_25.png
+share/wesnoth/images/icons/action/help_30-active.png
+share/wesnoth/images/icons/action/help_30-pressed.png
+share/wesnoth/images/icons/action/help_30.png
 share/wesnoth/images/icons/action/minimap-draw-terrain_25-active.png
 share/wesnoth/images/icons/action/minimap-draw-terrain_25-pressed.png
 share/wesnoth/images/icons/action/minimap-draw-terrain_25.png
@@ -13868,6 +15492,9 @@ share/wesnoth/images/icons/action/play_2
 share/wesnoth/images/icons/action/play_30-active.png
 share/wesnoth/images/icons/action/play_30-pressed.png
 share/wesnoth/images/icons/action/play_30.png
+share/wesnoth/images/icons/action/play_move_30-active.png
+share/wesnoth/images/icons/action/play_move_30-pressed.png
+share/wesnoth/images/icons/action/play_move_30.png
 share/wesnoth/images/icons/action/play_side_25-active.png
 share/wesnoth/images/icons/action/play_side_25-pressed.png
 share/wesnoth/images/icons/action/play_side_25.png
@@ -13892,6 +15519,9 @@ share/wesnoth/images/icons/action/redo_2
 share/wesnoth/images/icons/action/redo_30-active.png
 share/wesnoth/images/icons/action/redo_30-pressed.png
 share/wesnoth/images/icons/action/redo_30.png
+share/wesnoth/images/icons/action/settings-active.png
+share/wesnoth/images/icons/action/settings-pressed.png
+share/wesnoth/images/icons/action/settings.png
 share/wesnoth/images/icons/action/stop_25-active.png
 share/wesnoth/images/icons/action/stop_25-pressed.png
 share/wesnoth/images/icons/action/stop_25.png
@@ -13904,6 +15534,9 @@ share/wesnoth/images/icons/action/toggle
 share/wesnoth/images/icons/action/togglegrid_30-active.png
 share/wesnoth/images/icons/action/togglegrid_30-pressed.png
 share/wesnoth/images/icons/action/togglegrid_30.png
+share/wesnoth/images/icons/action/trash_25-active.png
+share/wesnoth/images/icons/action/trash_25-pressed.png
+share/wesnoth/images/icons/action/trash_25.png
 share/wesnoth/images/icons/action/undo_25-active.png
 share/wesnoth/images/icons/action/undo_25-pressed.png
 share/wesnoth/images/icons/action/undo_25.png
@@ -13931,6 +15564,61 @@ share/wesnoth/images/icons/action/zoomou
 share/wesnoth/images/icons/action/zoomout_30-active.png
 share/wesnoth/images/icons/action/zoomout_30-pressed.png
 share/wesnoth/images/icons/action/zoomout_30.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/install2-active.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/install2-pressed.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/install2.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/publish2-active.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/publish2-pressed.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/publish2.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/uninstall2-active.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/uninstall2-pressed.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/uninstall2.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/update2-active.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/update2-pressed.png
+share/wesnoth/images/icons/addons_manager/alt_small_styles/update2.png
+share/wesnoth/images/icons/addons_manager/delete-large-active.png
+share/wesnoth/images/icons/addons_manager/delete-large-pressed.png
+share/wesnoth/images/icons/addons_manager/delete-large.png
+share/wesnoth/images/icons/addons_manager/install-large-active.png
+share/wesnoth/images/icons/addons_manager/install-large-pressed.png
+share/wesnoth/images/icons/addons_manager/install-large.png
+share/wesnoth/images/icons/addons_manager/install-small-active.png
+share/wesnoth/images/icons/addons_manager/install-small-pressed.png
+share/wesnoth/images/icons/addons_manager/install-small.png
+share/wesnoth/images/icons/addons_manager/publish-large-active.png
+share/wesnoth/images/icons/addons_manager/publish-large-pressed.png
+share/wesnoth/images/icons/addons_manager/publish-large.png
+share/wesnoth/images/icons/addons_manager/publish-small-active.png
+share/wesnoth/images/icons/addons_manager/publish-small-pressed.png
+share/wesnoth/images/icons/addons_manager/publish-small.png
+share/wesnoth/images/icons/addons_manager/uninstall-large-active.png
+share/wesnoth/images/icons/addons_manager/uninstall-large-pressed.png
+share/wesnoth/images/icons/addons_manager/uninstall-large.png
+share/wesnoth/images/icons/addons_manager/uninstall-small-active.png
+share/wesnoth/images/icons/addons_manager/uninstall-small-pressed.png
+share/wesnoth/images/icons/addons_manager/uninstall-small.png
+share/wesnoth/images/icons/addons_manager/update-large-active.png
+share/wesnoth/images/icons/addons_manager/update-large-pressed.png
+share/wesnoth/images/icons/addons_manager/update-large.png
+share/wesnoth/images/icons/addons_manager/update-small-active.png
+share/wesnoth/images/icons/addons_manager/update-small-pressed.png
+share/wesnoth/images/icons/addons_manager/update-small.png
+share/wesnoth/images/icons/alignments/alignment_chaotic_30-pressed.png
+share/wesnoth/images/icons/alignments/alignment_chaotic_30-pressed%2x.png@localhost
+share/wesnoth/images/icons/alignments/alignment_chaotic_30.png
+share/wesnoth/images/icons/alignments/alignment_chaotic_30%2x.png@localhost
+share/wesnoth/images/icons/alignments/alignment_lawful_30-pressed.png
+share/wesnoth/images/icons/alignments/alignment_lawful_30-pressed%2x.png@localhost
+share/wesnoth/images/icons/alignments/alignment_lawful_30.png
+share/wesnoth/images/icons/alignments/alignment_lawful_30%2x.png@localhost
+share/wesnoth/images/icons/alignments/alignment_liminal_30-pressed.png
+share/wesnoth/images/icons/alignments/alignment_liminal_30-pressed%2x.png@localhost
+share/wesnoth/images/icons/alignments/alignment_liminal_30.png
+share/wesnoth/images/icons/alignments/alignment_liminal_30%2x.png@localhost
+share/wesnoth/images/icons/alignments/alignment_neutral_30-pressed.png
+share/wesnoth/images/icons/alignments/alignment_neutral_30-pressed%2x.png@localhost
+share/wesnoth/images/icons/alignments/alignment_neutral_30.png
+share/wesnoth/images/icons/alignments/alignment_neutral_30%2x.png@localhost
 share/wesnoth/images/icons/arrows/arrows_blank_bottomleft_25.png
 share/wesnoth/images/icons/arrows/arrows_blank_bottomleft_30.png
 share/wesnoth/images/icons/arrows/arrows_blank_bottomright_25.png
@@ -14059,6 +15747,9 @@ share/wesnoth/images/icons/arrows/arrows
 share/wesnoth/images/icons/arrows/arrows_up_30-active.png
 share/wesnoth/images/icons/arrows/arrows_up_30-pressed.png
 share/wesnoth/images/icons/arrows/arrows_up_30.png
+share/wesnoth/images/icons/arrows/double_arrow_right_30-active.png
+share/wesnoth/images/icons/arrows/double_arrow_right_30-pressed.png
+share/wesnoth/images/icons/arrows/double_arrow_right_30.png
 share/wesnoth/images/icons/arrows/long_arrow_ornate_left-active.png
 share/wesnoth/images/icons/arrows/long_arrow_ornate_left-active%2x.png@localhost
 share/wesnoth/images/icons/arrows/long_arrow_ornate_left-pressed.png
@@ -14101,12 +15792,18 @@ share/wesnoth/images/icons/icon-advanced
 share/wesnoth/images/icons/icon-ai.png
 share/wesnoth/images/icons/icon-display.png
 share/wesnoth/images/icons/icon-editor.png
+share/wesnoth/images/icons/icon-female.png
 share/wesnoth/images/icons/icon-game.png
 share/wesnoth/images/icons/icon-general.png
 share/wesnoth/images/icons/icon-hostgame.png
+share/wesnoth/images/icons/icon-hotkeys.png
 share/wesnoth/images/icons/icon-hotseat.png
+share/wesnoth/images/icons/icon-info-error.png
+share/wesnoth/images/icons/icon-info.png
+share/wesnoth/images/icons/icon-male.png
 share/wesnoth/images/icons/icon-multiplayer.png
 share/wesnoth/images/icons/icon-music.png
+share/wesnoth/images/icons/icon-random.png
 share/wesnoth/images/icons/icon-server.png
 share/wesnoth/images/icons/icon-serverother.png
 share/wesnoth/images/icons/icon-titlescreen.png
@@ -14278,6 +15975,8 @@ share/wesnoth/images/icons/unit-groups/e
 share/wesnoth/images/icons/unit-groups/era_custom_10_30.png
 share/wesnoth/images/icons/unit-groups/era_default_drakes_30-pressed.png
 share/wesnoth/images/icons/unit-groups/era_default_drakes_30.png
+share/wesnoth/images/icons/unit-groups/era_default_dunefolk_30-pressed.png
+share/wesnoth/images/icons/unit-groups/era_default_dunefolk_30.png
 share/wesnoth/images/icons/unit-groups/era_default_khalifate_30-pressed.png
 share/wesnoth/images/icons/unit-groups/era_default_khalifate_30.png
 share/wesnoth/images/icons/unit-groups/era_default_knalgan_alliance_30-pressed.png
@@ -14302,6 +16001,8 @@ share/wesnoth/images/icons/unit-groups/r
 share/wesnoth/images/icons/unit-groups/race_custom_30.png
 share/wesnoth/images/icons/unit-groups/race_drake_30-pressed.png
 share/wesnoth/images/icons/unit-groups/race_drake_30.png
+share/wesnoth/images/icons/unit-groups/race_dunefolk_30-pressed.png
+share/wesnoth/images/icons/unit-groups/race_dunefolk_30.png
 share/wesnoth/images/icons/unit-groups/race_dwarf_30-pressed.png
 share/wesnoth/images/icons/unit-groups/race_dwarf_30.png
 share/wesnoth/images/icons/unit-groups/race_elf_30-pressed.png
@@ -14387,6 +16088,7 @@ share/wesnoth/images/misc/ellipse-select
 share/wesnoth/images/misc/ellipse-selected-top.png
 share/wesnoth/images/misc/ellipse-top.png
 share/wesnoth/images/misc/eye.png
+share/wesnoth/images/misc/folder-bookmark-icon.png
 share/wesnoth/images/misc/folder-icon.png
 share/wesnoth/images/misc/font8x8.png
 share/wesnoth/images/misc/hidden.png
@@ -14401,28 +16103,54 @@ share/wesnoth/images/misc/icon-advance.p
 share/wesnoth/images/misc/icon-ellipsis.png
 share/wesnoth/images/misc/invisible.png
 share/wesnoth/images/misc/jewel-tc.png
+share/wesnoth/images/misc/l10n/af/logo.png
+share/wesnoth/images/misc/l10n/ang/logo.png
+share/wesnoth/images/misc/l10n/ang@latin/logo.png
+share/wesnoth/images/misc/l10n/bg/logo.png
+share/wesnoth/images/misc/l10n/ca/logo.png
+share/wesnoth/images/misc/l10n/cs/logo.png
+share/wesnoth/images/misc/l10n/da/logo.png
+share/wesnoth/images/misc/l10n/el/logo.png
+share/wesnoth/images/misc/l10n/en/logo.png
 share/wesnoth/images/misc/l10n/en@shaw/logo.png
+share/wesnoth/images/misc/l10n/eo/logo.png
 share/wesnoth/images/misc/l10n/es/logo.png
+share/wesnoth/images/misc/l10n/et/logo.png
+share/wesnoth/images/misc/l10n/eu/logo.png
+share/wesnoth/images/misc/l10n/fi/logo.png
 share/wesnoth/images/misc/l10n/fr/logo.png
+share/wesnoth/images/misc/l10n/ga/logo.png
 share/wesnoth/images/misc/l10n/gd/logo.png
 share/wesnoth/images/misc/l10n/gl/logo.png
+share/wesnoth/images/misc/l10n/he/logo.png
+share/wesnoth/images/misc/l10n/hr/logo.png
 share/wesnoth/images/misc/l10n/hu/logo.png
+share/wesnoth/images/misc/l10n/id/logo.png
+share/wesnoth/images/misc/l10n/is/logo.png
 share/wesnoth/images/misc/l10n/la/logo.png
 share/wesnoth/images/misc/l10n/lt/logo.png
+share/wesnoth/images/misc/l10n/lv/logo.png
+share/wesnoth/images/misc/l10n/mk/logo.png
+share/wesnoth/images/misc/l10n/mr/logo.png
 share/wesnoth/images/misc/l10n/nl/logo.png
+share/wesnoth/images/misc/l10n/pl/logo.png
 share/wesnoth/images/misc/l10n/pt/logo.png
+share/wesnoth/images/misc/l10n/ru/logo.png
+share/wesnoth/images/misc/l10n/sk/logo.png
 share/wesnoth/images/misc/l10n/sr/logo.png
 share/wesnoth/images/misc/l10n/sr@latin/logo.png
+share/wesnoth/images/misc/l10n/tr/logo.png
 share/wesnoth/images/misc/l10n/vi/logo.png
 share/wesnoth/images/misc/l10n/zh_CN/logo.png
+share/wesnoth/images/misc/l10n/zh_TW/logo.png
 share/wesnoth/images/misc/leader-crown-alt.png
 share/wesnoth/images/misc/leader-crown.png
-share/wesnoth/images/misc/lobby.png
+share/wesnoth/images/misc/loadscreen_decor.png
+share/wesnoth/images/misc/logo-bg.png
 share/wesnoth/images/misc/logo.png
 share/wesnoth/images/misc/map.png
 share/wesnoth/images/misc/missing-image.png
 share/wesnoth/images/misc/no_observer.png
-share/wesnoth/images/misc/orb-enemy.png
 share/wesnoth/images/misc/orb.png
 share/wesnoth/images/misc/orb%2x.png@localhost
 share/wesnoth/images/misc/petrified.png
@@ -14438,19 +16166,12 @@ share/wesnoth/images/misc/status-friend.
 share/wesnoth/images/misc/status-ignore.png
 share/wesnoth/images/misc/status-neutral.png
 share/wesnoth/images/misc/status-self.png
+share/wesnoth/images/misc/status.png
 share/wesnoth/images/misc/tod-bright.png
 share/wesnoth/images/misc/tod-dark.png
 share/wesnoth/images/misc/visibility.png
 share/wesnoth/images/misc/waypoint.png
 share/wesnoth/images/misc/zoc.png
-share/wesnoth/images/tools/chasm-convex.png
-share/wesnoth/images/tools/chasm-exploded-concave.png
-share/wesnoth/images/tools/exploder/mask-castle-e.png
-share/wesnoth/images/tools/exploder/mask-castle-ne.png
-share/wesnoth/images/tools/exploder/mask-castle-nw.png
-share/wesnoth/images/tools/exploder/mask-castle-se.png
-share/wesnoth/images/tools/exploder/mask-castle-sw.png
-share/wesnoth/images/tools/exploder/mask-castle-w.png
 share/wesnoth/images/tools/magenta_team_color_palette.png
 share/wesnoth/images/whiteboard/attack-indicator-dst-n.png
 share/wesnoth/images/whiteboard/attack-indicator-dst-ne.png
@@ -14466,7 +16187,7 @@ share/wesnoth/images/whiteboard/attack-i
 share/wesnoth/images/whiteboard/attack-indicator-src-sw.png
 share/wesnoth/images/whiteboard/suppose_dead.png
 share/wesnoth/l10n-track
-share/wesnoth/sounds/README
+share/wesnoth/sounds/README.md
 share/wesnoth/sounds/arrive.wav
 share/wesnoth/sounds/bell.wav
 share/wesnoth/sounds/button.wav
@@ -14504,6 +16225,7 @@ share/wesnoth/translations/af/LC_MESSAGE
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/af/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/af/LC_MESSAGES/wesnoth-test.mo
@@ -14532,6 +16254,7 @@ share/wesnoth/translations/ang/LC_MESSAG
 share/wesnoth/translations/ang/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/ang/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/ang/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ang/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/ang/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/ang/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/ang/LC_MESSAGES/wesnoth-test.mo
@@ -14560,6 +16283,7 @@ share/wesnoth/translations/ang@latin/LC_
 share/wesnoth/translations/ang@latin/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/ang@latin/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/ang@latin/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ang@latin/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/ang@latin/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/ang@latin/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/ang@latin/LC_MESSAGES/wesnoth-test.mo
@@ -14588,6 +16312,7 @@ share/wesnoth/translations/ar/LC_MESSAGE
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-test.mo
@@ -14598,6 +16323,35 @@ share/wesnoth/translations/ar/LC_MESSAGE
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-units.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth-utbs.mo
 share/wesnoth/translations/ar/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-ai.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-anl.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-aoi.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-did.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-dm.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-dw.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-help.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-l.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-low.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-manpages.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-manual.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-multiplayer.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-nr.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-sota.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-tb.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-test.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-thot.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-tsg.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-tutorial.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-units.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth-utbs.mo
+share/wesnoth/translations/ast/LC_MESSAGES/wesnoth.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-ai.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-anl.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-aoi.mo
@@ -14616,6 +16370,7 @@ share/wesnoth/translations/bg/LC_MESSAGE
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/bg/LC_MESSAGES/wesnoth-test.mo
@@ -14644,6 +16399,7 @@ share/wesnoth/translations/ca/LC_MESSAGE
 share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-test.mo
@@ -14672,6 +16428,7 @@ share/wesnoth/translations/ca_ES@valenci
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/ca_ES@valencia/LC_MESSAGES/wesnoth-test.mo
@@ -14700,6 +16457,7 @@ share/wesnoth/translations/cs/LC_MESSAGE
 share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-test.mo
@@ -14728,6 +16486,7 @@ share/wesnoth/translations/da/LC_MESSAGE
 share/wesnoth/translations/da/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/da/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/da/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/da/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/da/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/da/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/da/LC_MESSAGES/wesnoth-test.mo
@@ -14756,6 +16515,7 @@ share/wesnoth/translations/de/LC_MESSAGE
 share/wesnoth/translations/de/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/de/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/de/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/de/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/de/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/de/LC_MESSAGES/wesnoth-test.mo
@@ -14784,6 +16544,7 @@ share/wesnoth/translations/el/LC_MESSAGE
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/el/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/el/LC_MESSAGES/wesnoth-test.mo
@@ -14812,6 +16573,7 @@ share/wesnoth/translations/en@shaw/LC_ME
 share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/en@shaw/LC_MESSAGES/wesnoth-test.mo
@@ -14840,6 +16602,7 @@ share/wesnoth/translations/en_GB/LC_MESS
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/en_GB/LC_MESSAGES/wesnoth-test.mo
@@ -14868,6 +16631,7 @@ share/wesnoth/translations/eo/LC_MESSAGE
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/eo/LC_MESSAGES/wesnoth-test.mo
@@ -14896,6 +16660,7 @@ share/wesnoth/translations/es/LC_MESSAGE
 share/wesnoth/translations/es/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/es/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/es/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/es/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/es/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/es/LC_MESSAGES/wesnoth-test.mo
@@ -14924,6 +16689,7 @@ share/wesnoth/translations/et/LC_MESSAGE
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/et/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/et/LC_MESSAGES/wesnoth-test.mo
@@ -14952,6 +16718,7 @@ share/wesnoth/translations/eu/LC_MESSAGE
 share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-test.mo
@@ -14980,6 +16747,7 @@ share/wesnoth/translations/fi/LC_MESSAGE
 share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-test.mo
@@ -15008,6 +16776,7 @@ share/wesnoth/translations/fr/LC_MESSAGE
 share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-test.mo
@@ -15036,6 +16805,7 @@ share/wesnoth/translations/fur_IT/LC_MES
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/fur_IT/LC_MESSAGES/wesnoth-test.mo
@@ -15064,6 +16834,7 @@ share/wesnoth/translations/ga/LC_MESSAGE
 share/wesnoth/translations/ga/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/ga/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/ga/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ga/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/ga/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/ga/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/ga/LC_MESSAGES/wesnoth-test.mo
@@ -15092,6 +16863,7 @@ share/wesnoth/translations/gd/LC_MESSAGE
 share/wesnoth/translations/gd/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/gd/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/gd/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/gd/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/gd/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/gd/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/gd/LC_MESSAGES/wesnoth-test.mo
@@ -15120,6 +16892,7 @@ share/wesnoth/translations/gl/LC_MESSAGE
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/gl/LC_MESSAGES/wesnoth-test.mo
@@ -15148,6 +16921,7 @@ share/wesnoth/translations/he/LC_MESSAGE
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/he/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/he/LC_MESSAGES/wesnoth-test.mo
@@ -15176,6 +16950,7 @@ share/wesnoth/translations/hr/LC_MESSAGE
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/hr/LC_MESSAGES/wesnoth-test.mo
@@ -15204,6 +16979,7 @@ share/wesnoth/translations/hu/LC_MESSAGE
 share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-test.mo
@@ -15232,6 +17008,7 @@ share/wesnoth/translations/id/LC_MESSAGE
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/id/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/id/LC_MESSAGES/wesnoth-test.mo
@@ -15260,6 +17037,7 @@ share/wesnoth/translations/is/LC_MESSAGE
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/is/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/is/LC_MESSAGES/wesnoth-test.mo
@@ -15288,6 +17066,7 @@ share/wesnoth/translations/it/LC_MESSAGE
 share/wesnoth/translations/it/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/it/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/it/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/it/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/it/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/it/LC_MESSAGES/wesnoth-test.mo
@@ -15316,6 +17095,7 @@ share/wesnoth/translations/ja/LC_MESSAGE
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/ja/LC_MESSAGES/wesnoth-test.mo
@@ -15344,6 +17124,7 @@ share/wesnoth/translations/ko/LC_MESSAGE
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/ko/LC_MESSAGES/wesnoth-test.mo
@@ -15372,6 +17153,7 @@ share/wesnoth/translations/la/LC_MESSAGE
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/la/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/la/LC_MESSAGES/wesnoth-test.mo
@@ -15400,6 +17182,7 @@ share/wesnoth/translations/lt/LC_MESSAGE
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/lt/LC_MESSAGES/wesnoth-test.mo
@@ -15428,6 +17211,7 @@ share/wesnoth/translations/lv/LC_MESSAGE
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/lv/LC_MESSAGES/wesnoth-test.mo
@@ -15456,6 +17240,7 @@ share/wesnoth/translations/mk/LC_MESSAGE
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/mk/LC_MESSAGES/wesnoth-test.mo
@@ -15484,6 +17269,7 @@ share/wesnoth/translations/mr/LC_MESSAGE
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/mr/LC_MESSAGES/wesnoth-test.mo
@@ -15512,6 +17298,7 @@ share/wesnoth/translations/nb_NO/LC_MESS
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/nb_NO/LC_MESSAGES/wesnoth-test.mo
@@ -15540,6 +17327,7 @@ share/wesnoth/translations/nl/LC_MESSAGE
 share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-test.mo
@@ -15568,6 +17356,7 @@ share/wesnoth/translations/pl/LC_MESSAGE
 share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-test.mo
@@ -15596,6 +17385,7 @@ share/wesnoth/translations/pt/LC_MESSAGE
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/pt/LC_MESSAGES/wesnoth-test.mo
@@ -15624,6 +17414,7 @@ share/wesnoth/translations/pt_BR/LC_MESS
 share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-test.mo
@@ -15652,6 +17443,7 @@ share/wesnoth/translations/racv/LC_MESSA
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/racv/LC_MESSAGES/wesnoth-test.mo
@@ -15680,6 +17472,7 @@ share/wesnoth/translations/ro/LC_MESSAGE
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/ro/LC_MESSAGES/wesnoth-test.mo
@@ -15708,6 +17501,7 @@ share/wesnoth/translations/ru/LC_MESSAGE
 share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-test.mo
@@ -15736,6 +17530,7 @@ share/wesnoth/translations/sk/LC_MESSAGE
 share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-test.mo
@@ -15764,6 +17559,7 @@ share/wesnoth/translations/sl/LC_MESSAGE
 share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-test.mo
@@ -15792,6 +17588,7 @@ share/wesnoth/translations/sr/LC_MESSAGE
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/sr/LC_MESSAGES/wesnoth-test.mo
@@ -15820,6 +17617,7 @@ share/wesnoth/translations/sr@ijekavian/
 share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/sr@ijekavian/LC_MESSAGES/wesnoth-test.mo
@@ -15848,6 +17646,7 @@ share/wesnoth/translations/sr@ijekavianl
 share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/sr@ijekavianlatin/LC_MESSAGES/wesnoth-test.mo
@@ -15876,6 +17675,7 @@ share/wesnoth/translations/sr@latin/LC_M
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/sr@latin/LC_MESSAGES/wesnoth-test.mo
@@ -15904,6 +17704,7 @@ share/wesnoth/translations/sv/LC_MESSAGE
 share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-test.mo
@@ -15932,6 +17733,7 @@ share/wesnoth/translations/tl/LC_MESSAGE
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/tl/LC_MESSAGES/wesnoth-test.mo
@@ -15960,6 +17762,7 @@ share/wesnoth/translations/tr/LC_MESSAGE
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/tr/LC_MESSAGES/wesnoth-test.mo
@@ -15988,6 +17791,7 @@ share/wesnoth/translations/uk/LC_MESSAGE
 share/wesnoth/translations/uk/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/uk/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/uk/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/uk/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/uk/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/uk/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/uk/LC_MESSAGES/wesnoth-test.mo
@@ -16016,6 +17820,7 @@ share/wesnoth/translations/vi/LC_MESSAGE
 share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/vi/LC_MESSAGES/wesnoth-test.mo
@@ -16044,6 +17849,7 @@ share/wesnoth/translations/zh_CN/LC_MESS
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/zh_CN/LC_MESSAGES/wesnoth-test.mo
@@ -16072,6 +17878,7 @@ share/wesnoth/translations/zh_TW/LC_MESS
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-multiplayer.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-nr.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-sof.mo
+share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-sota.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-sotbe.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-tb.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-test.mo

Index: pkgsrc/games/wesnoth/distinfo
diff -u pkgsrc/games/wesnoth/distinfo:1.58 pkgsrc/games/wesnoth/distinfo:1.59
--- pkgsrc/games/wesnoth/distinfo:1.58  Sat Jun 18 21:18:16 2016
+++ pkgsrc/games/wesnoth/distinfo       Sun Jun 24 16:02:50 2018
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.58 2016/06/18 21:18:16 leot Exp $
+$NetBSD: distinfo,v 1.59 2018/06/24 16:02:50 adam Exp $
 
-SHA1 (wesnoth-1.12.6.tar.bz2) = 225b018d9e61191d3c48663a515ecca82c4d8995
-RMD160 (wesnoth-1.12.6.tar.bz2) = 8a097e8b711e428799ebc0b95e8d771d83035db6
-SHA512 (wesnoth-1.12.6.tar.bz2) = 12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a
-Size (wesnoth-1.12.6.tar.bz2) = 387869758 bytes
-SHA1 (patch-CMakeLists.txt) = 1f17a95793db0d311508f1ff93f9aacedc7782f9
-SHA1 (patch-ae) = 17c9f08bbe2aeb12771fc1c3430b1cf84ee75e15
-SHA1 (patch-af) = ed3ef2d26a33b87e42e8c820c669315b81bf7938
-SHA1 (patch-ah) = b63017ae43c4748aced31ab64dc141682e535ff2
-SHA1 (patch-data_tools_addon__manager_html_py) = 5cacb24b3441916d3e8832f9d9a6e96d2e1c63a8
-SHA1 (patch-data_tools_castle-clutter_mk_all-castles_sh) = 0c05566e6cf361199031d2104608e5e78e807a9e
-SHA1 (patch-data_tools_unit__tree_helpers_py) = 79de075b33eb7d6d30a8d69635de7f48c19a8c30
-SHA1 (patch-data_tools_wesnoth_campaignserver__client_py) = b7591e23b4c049ee22e080ea20160d82dd631722
+SHA1 (wesnoth-1.14.3.tar.bz2) = 41e1c9aef297f76b443c9566bdbb2a352dead83f
+RMD160 (wesnoth-1.14.3.tar.bz2) = fd3db82d975ec18a91d1c791d8289af9c356ca14
+SHA512 (wesnoth-1.14.3.tar.bz2) = da9343e7a83f183bba5f8cad6397745370b64de2e8e319eae256097d27bba536b871d1899f472685e74584bc601f59d16da8c14359c74eea0a6fb074c078bb9d
+Size (wesnoth-1.14.3.tar.bz2) = 450194119 bytes
+SHA1 (patch-CMakeLists.txt) = 116bb4eb53408f04223c26c81efead19edb58fe6
+SHA1 (patch-src_CMakeLists.txt) = 5839663ab11a9fdc31e89b74ce2708a251155d9f
+SHA1 (patch-src_wesnoth.cpp) = 73fa69b47de231c5ce16f66a52b449d5242ffe67

Index: pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt
diff -u pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt:1.1 pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt:1.1       Wed Jul 18 06:37:41 2012
+++ pkgsrc/games/wesnoth/patches/patch-CMakeLists.txt   Sun Jun 24 16:02:50 2018
@@ -1,35 +1,40 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2012/07/18 06:37:41 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2018/06/24 16:02:50 adam Exp $
 
-Don't look for X11 on Mac OS X
-Fix MANDIR
+Do not look for X11 on macOS.
+Remove -O3.
+Do not bother with uninstaller.
 
---- CMakeLists.txt.orig        2012-05-01 21:08:26.000000000 +0000
+--- CMakeLists.txt.orig        2018-06-10 00:02:23.000000000 +0000
 +++ CMakeLists.txt
-@@ -27,7 +27,9 @@ find_package(Gettext)
- # src/gettext.cpp since it includes libintl.h)
- find_package(Libintl REQUIRED)
+@@ -68,7 +68,9 @@ find_package(Boost 1.50 REQUIRED COMPONE
+ # no, gettext executables are not required when NLS is deactivated
+ find_package(Gettext)
  
 +if(NOT APPLE)
  find_package(X11)
 +endif(NOT APPLE)
  
- if(NOT MSVC)
-       #needed to get some SDL defines in... (as of rev31694 -D_GNU_SOURCE=1 is required!)
-@@ -55,7 +57,7 @@ include(SearchForStuff)
- set(BINDIR "bin" CACHE STRING "Where to install binaries")
- set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location")
- set(DOCDIR "${DATAROOTDIR}/doc/wesnoth" CACHE STRING "Sets the doc directory to a non-default location.")
--set(MANDIR "${DATAROOTDIR}/man" CACHE STRING "Where to install manpages")
-+set(MANDIR "man" CACHE STRING "Where to install manpages")
- set(DATADIRNAME "wesnoth" CACHE STRING "change the name of the directory for the read-only architecture-independent game data")
- set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}" CACHE STRING "change the dir where binaries are placed right at compile time")
- set(LOCALEDIR "translations" CACHE STRING "change the name of the locale data directory to a non-default name")
-@@ -307,11 +309,6 @@ install(FILES l10n-track DESTINATION ${D
+ # needed to get some SDL2 defines in... (as of rev31694 -D_GNU_SOURCE=1 is required!)
+ set(SDL2_CONFIG "sdl2-config" CACHE STRING "Path to sdl2-config script")
+@@ -258,9 +260,9 @@ RemoveFlag(CMAKE_SHARED_LIBRARY_LINK_C_F
+ # #
+ 
+ # reset the base Release build option
+-MESSAGE("Replacing default flags used for Release build with -O3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}")
+-set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
+-set(CMAKE_C_FLAGS_RELEASE "-O3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
++MESSAGE("Replacing default flags used for Release build with ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}")
++set(CMAKE_CXX_FLAGS_RELEASE "${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
++set(CMAKE_C_FLAGS_RELEASE "${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "" CACHE STRING "" FORCE)
+ # set the arch to use for Release build if provided
+ if(ARCH)
+@@ -557,11 +559,6 @@ endif(ENABLE_GAME)
  # uninstall
  #
  
 -configure_file(
--      "${CMAKE_MODULE_PATH}/uninstall.cmake.in"
+-      "${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in"
 -      "${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake"
 -      IMMEDIATE @ONLY
 -)

Added files:

Index: pkgsrc/games/wesnoth/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Sun Jun 24 16:02:50 2018
+++ pkgsrc/games/wesnoth/patches/patch-src_CMakeLists.txt       Sun Jun 24 16:02:50 2018
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2018/06/24 16:02:50 adam Exp $
+
+On macOS, do not build SDLMain.mm; only needed for app bundle.
+
+--- src/CMakeLists.txt.orig    2018-06-10 00:02:23.000000000 +0000
++++ src/CMakeLists.txt
+@@ -285,11 +285,7 @@ add_library(wesnoth-game ${LIBRARY_TYPE}
+ ########### Wesnoth ###############
+ 
+ if(ENABLE_GAME)
+-      if(NOT APPLE)
+-              add_executable(wesnoth WIN32 wesnoth.cpp)
+-      else()
+-              add_executable(wesnoth WIN32 wesnoth.cpp macosx/SDLMain.mm)
+-      endif(NOT APPLE)
++      add_executable(wesnoth WIN32 wesnoth.cpp)
+ 
+       target_link_libraries(wesnoth
+               wesnoth-client
Index: pkgsrc/games/wesnoth/patches/patch-src_wesnoth.cpp
diff -u /dev/null pkgsrc/games/wesnoth/patches/patch-src_wesnoth.cpp:1.1
--- /dev/null   Sun Jun 24 16:02:50 2018
+++ pkgsrc/games/wesnoth/patches/patch-src_wesnoth.cpp  Sun Jun 24 16:02:50 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_wesnoth.cpp,v 1.1 2018/06/24 16:02:50 adam Exp $
+
+On macOS, use regular (); wesnoth_main() only needed for app bundle.
+
+--- src/wesnoth.cpp.orig       2018-06-24 12:26:22.000000000 +0000
++++ src/wesnoth.cpp
+@@ -1012,7 +1012,7 @@ static void restart_process()
+ #define error_exit(res) return res
+ #endif
+ 
+-#ifdef __APPLE__
++#if 0
+ extern "C" int wesnoth_main(int argc, char** argv);
+ int wesnoth_main(int argc, char** argv)
+ #else