CVS commit: pkgsrc/games

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 30 14:57:31 UTC 2020

Modified Files:
        pkgsrc/games/cataclysm-dda: Makefile Makefile.common PLIST distinfo
        pkgsrc/games/cataclysm-dda-sdl: Makefile PLIST
Added Files:
        pkgsrc/games/cataclysm-dda/patches: patch-lang_compile__mo.sh
            patch-src_translations.cpp patch-src_translations.h

Log Message:
cataclysm-dda: Update to 0.E

Highlights:

Long distance automove feature for walking, driving and boating.
Extensive bugfixes to inter-level interactivity, on by default.
Riding animals and animal-pulled vehicles.
More flexible Basecamp construction options.
Default starting date changed to mid-spring for better survivability.
Time advancement is rationalized, a turn is now one second.
Extensive river and lake systems, and boat support for navigating them.
Expanded NPC usefulness and interactivity.
Massive increases in location variety and consistency, especially rooftops.
Expansion of mi-go faction with new enemies and locations.
Batteries now store charge instead of being pseudo-items.
Overhaul and rebalance of martial arts.
Zombie grabbing and biting more manageable and predictable.
Overhauled stamina and damage recovery for grittier gameplay.
Crouching movement mode allows hiding.
Magiclysm and Aftershock mods have first class support within the game.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/cataclysm-dda/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/cataclysm-dda/Makefile.common \
    pkgsrc/games/cataclysm-dda/PLIST pkgsrc/games/cataclysm-dda/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/cataclysm-dda-sdl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/cataclysm-dda-sdl/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/cataclysm-dda/patches/patch-lang_compile__mo.sh \
    pkgsrc/games/cataclysm-dda/patches/patch-src_translations.cpp \
    pkgsrc/games/cataclysm-dda/patches/patch-src_translations.h

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

Modified files:

Index: pkgsrc/games/cataclysm-dda/Makefile
diff -u pkgsrc/games/cataclysm-dda/Makefile:1.2 pkgsrc/games/cataclysm-dda/Makefile:1.3
--- pkgsrc/games/cataclysm-dda/Makefile:1.2     Fri Sep 20 15:05:01 2019
+++ pkgsrc/games/cataclysm-dda/Makefile Thu Apr 30 14:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/09/20 15:05:01 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/04/30 14:57:30 nia Exp $
 
 .include "Makefile.common"
 
@@ -15,12 +15,6 @@ do-install:
        cd ${WRKSRC}/data && ${PAX} -rw -pp ${target} \
            ${DESTDIR}${PREFIX}/share/cataclysm-dda
 .endfor
-       ${INSTALL_DATA} ${WRKSRC}/lua/autoexec.lua \
-           ${DESTDIR}${PREFIX}/share/cataclysm-dda/lua
-       ${INSTALL_DATA} ${WRKSRC}/lua/log.lua \
-           ${DESTDIR}${PREFIX}/share/cataclysm-dda/lua
-       ${INSTALL_DATA} ${WRKSRC}/lua/class_definitions.lua \
-           ${DESTDIR}${PREFIX}/share/cataclysm-dda/lua
        ${INSTALL_DATA} ${WRKSRC}/data/changelog.txt \
            ${DESTDIR}${PREFIX}/share/cataclysm-dda
        ${INSTALL_DATA} ${WRKSRC}/data/cataicon.ico \

Index: pkgsrc/games/cataclysm-dda/Makefile.common
diff -u pkgsrc/games/cataclysm-dda/Makefile.common:1.1 pkgsrc/games/cataclysm-dda/Makefile.common:1.2
--- pkgsrc/games/cataclysm-dda/Makefile.common:1.1      Wed Aug  7 18:05:25 2019
+++ pkgsrc/games/cataclysm-dda/Makefile.common  Thu Apr 30 14:57:30 2020
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.1 2019/08/07 18:05:25 nia Exp $
+# $NetBSD: Makefile.common,v 1.2 2020/04/30 14:57:30 nia Exp $
 # used by games/cataclysm-dda/Makefile
 # used by games/cataclysm-dda-sdl/Makefile
 
-DISTNAME=      cataclysm-dda-0.D
+DISTNAME=      cataclysm-dda-0.E
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=CleverRaven/}
 GITHUB_PROJECT=        Cataclysm-DDA
-GITHUB_TAG=    0.D
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 HOMEPAGE=      https://cataclysmdda.org/
 LICENSE=       cc-by-sa-v3.0
@@ -15,10 +15,11 @@ USE_LANGUAGES=      c c++11
 USE_TOOLS+=    gmake msgfmt pkg-config
 USE_TOOLS+=    pax
 
-# C++11
-GCC_REQD+=     4.8
+# C++14
+GCC_REQD+=     5
 
 DISTINFO_FILE= ${.CURDIR}/../../games/cataclysm-dda/distinfo
+PATCHDIR=      ${.CURDIR}/../../games/cataclysm-dda/patches
 
 CFLAGS+=       -DCATA_NO_CPP11_STRING_CONVERSIONS
 CXXFLAGS+=     -DCATA_NO_CPP11_STRING_CONVERSIONS
@@ -35,13 +36,9 @@ MAKE_FLAGS+= USE_XDG_DIR=1
 
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
-LUA_VERSIONS_INCOMPATIBLE=     51
-
 INSTALLATION_DIRS+=    bin
 INSTALLATION_DIRS+=    share/cataclysm-dda
-INSTALLATION_DIRS+=    share/cataclysm-dda/lua
 INSTALLATION_DIRS+=    share/locale
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
Index: pkgsrc/games/cataclysm-dda/PLIST
diff -u pkgsrc/games/cataclysm-dda/PLIST:1.1 pkgsrc/games/cataclysm-dda/PLIST:1.2
--- pkgsrc/games/cataclysm-dda/PLIST:1.1        Wed Aug  7 18:05:25 2019
+++ pkgsrc/games/cataclysm-dda/PLIST    Thu Apr 30 14:57:30 2020
@@ -1,84 +1,165 @@
-@comment $NetBSD: PLIST,v 1.1 2019/08/07 18:05:25 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/04/30 14:57:30 nia Exp $
 bin/cataclysm
 share/cataclysm-dda/LICENSE.txt
 share/cataclysm-dda/cataicon.ico
 share/cataclysm-dda/changelog.txt
 share/cataclysm-dda/core/basic.json
 share/cataclysm-dda/core/tips.json
-share/cataclysm-dda/credits/de.credits
 share/cataclysm-dda/credits/en.credits
-share/cataclysm-dda/credits/es_AR.credits
-share/cataclysm-dda/credits/es_ES.credits
-share/cataclysm-dda/credits/it_IT.credits
-share/cataclysm-dda/credits/ko.credits
-share/cataclysm-dda/credits/pt_BR.credits
 share/cataclysm-dda/credits/ru.credits
-share/cataclysm-dda/credits/zh_CN.credits
-share/cataclysm-dda/credits/zh_TW.credits
-share/cataclysm-dda/font/Square-Smallcaps.ttf
-share/cataclysm-dda/font/fixedsys.ttf
-share/cataclysm-dda/font/square.ttf
+share/cataclysm-dda/font/map_font_LARWICK.png
 share/cataclysm-dda/font/terminus.fon
 share/cataclysm-dda/font/unifont.ttf
 share/cataclysm-dda/fontdata.json
 share/cataclysm-dda/json/LOADING_ORDER.md
+share/cataclysm-dda/json/ammo_effects.json
 share/cataclysm-dda/json/anatomy.json
 share/cataclysm-dda/json/bionics.json
 share/cataclysm-dda/json/body_parts.json
+share/cataclysm-dda/json/clothing_mods.json
 share/cataclysm-dda/json/construction.json
-share/cataclysm-dda/json/corpses.json
+share/cataclysm-dda/json/construction_category.json
 share/cataclysm-dda/json/default_blacklist.json
-share/cataclysm-dda/json/doll_speech.json
 share/cataclysm-dda/json/dreams.json
 share/cataclysm-dda/json/effects.json
 share/cataclysm-dda/json/emit.json
+share/cataclysm-dda/json/field_type.json
 share/cataclysm-dda/json/flags.json
-share/cataclysm-dda/json/furniture.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-appliances.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-barriers.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-decorative.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-domestic_plants.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-eggs.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-emitters.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-fakes.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-fireplaces.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-flora.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-fungal.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-graves.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-industrial.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-medical.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-migo.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-plumbing.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-recreation.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-regional-pseudo.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-roof.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-rural.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-seats.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-signs.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-sleep.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-storage.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-surfaces.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-terrains.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-tools.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-bridges-docks.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-doors.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-fences-gates.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-floors-outdoors.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-floors_indoor.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-flora.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-fungal.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-liquids.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-manufactured.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-mechanisms.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-migo.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-railroads.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-recreational.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-regional-pseudo.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-roofs.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-traps.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-walls.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-windows.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-zlevel-transitions.json
 share/cataclysm-dda/json/game_balance.json
 share/cataclysm-dda/json/gates.json
 share/cataclysm-dda/json/harvest.json
-share/cataclysm-dda/json/health_msgs.json
+share/cataclysm-dda/json/hit_range.json
 share/cataclysm-dda/json/item_actions.json
 share/cataclysm-dda/json/item_category.json
-share/cataclysm-dda/json/item_groups.json
-share/cataclysm-dda/json/itemgroups/ammo.json
+share/cataclysm-dda/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
+share/cataclysm-dda/json/itemgroups/Agriculture_Forage_Excavation/forage.json
+share/cataclysm-dda/json/itemgroups/Clothing_Gear/clothing.json
+share/cataclysm-dda/json/itemgroups/Clothing_Gear/gear.json
+share/cataclysm-dda/json/itemgroups/Clothing_Gear/gear_civilian.json
+share/cataclysm-dda/json/itemgroups/Clothing_Gear/jewellery_gems.json
+share/cataclysm-dda/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
+share/cataclysm-dda/json/itemgroups/Food/food.json
+share/cataclysm-dda/json/itemgroups/Food/irradiated.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/locations.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/locations_commercial.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/locations_mapextras.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/mall_item_groups.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/mansion.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/map_extras.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/private_resort_item_groups.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/robofac_trade.json
+share/cataclysm-dda/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json
+share/cataclysm-dda/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
+share/cataclysm-dda/json/itemgroups/SUS/clothes_store.json
+share/cataclysm-dda/json/itemgroups/SUS/domestic.json
+share/cataclysm-dda/json/itemgroups/SUS/evac_shelter.json
+share/cataclysm-dda/json/itemgroups/SUS/garage.json
+share/cataclysm-dda/json/itemgroups/SUS/library.json
+share/cataclysm-dda/json/itemgroups/SUS/office.json
+share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/ammo.json
+share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
+share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/guns.json
+share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json
+share/cataclysm-dda/json/itemgroups/activities_hobbies.json
+share/cataclysm-dda/json/itemgroups/art_antiques_crafts.json
+share/cataclysm-dda/json/itemgroups/bionics.json
 share/cataclysm-dda/json/itemgroups/books.json
-share/cataclysm-dda/json/itemgroups/clothing.json
+share/cataclysm-dda/json/itemgroups/collections_domestic.json
+share/cataclysm-dda/json/itemgroups/collections_trades.json
+share/cataclysm-dda/json/itemgroups/corpses.json
 share/cataclysm-dda/json/itemgroups/defense_mode.json
-share/cataclysm-dda/json/itemgroups/drugs.json
+share/cataclysm-dda/json/itemgroups/electronics.json
 share/cataclysm-dda/json/itemgroups/faction_camps.json
-share/cataclysm-dda/json/itemgroups/forage.json
-share/cataclysm-dda/json/itemgroups/gear.json
-share/cataclysm-dda/json/itemgroups/gunmod.json
-share/cataclysm-dda/json/itemgroups/guns.json
-share/cataclysm-dda/json/itemgroups/locations.json
-share/cataclysm-dda/json/itemgroups/magazines.json
+share/cataclysm-dda/json/itemgroups/food_service.json
+share/cataclysm-dda/json/itemgroups/furniture.json
 share/cataclysm-dda/json/itemgroups/main.json
-share/cataclysm-dda/json/itemgroups/mansion.json
-share/cataclysm-dda/json/itemgroups/map_extras.json
+share/cataclysm-dda/json/itemgroups/military.json
 share/cataclysm-dda/json/itemgroups/misc.json
-share/cataclysm-dda/json/itemgroups/monster_drops.json
+share/cataclysm-dda/json/itemgroups/oa_shared_item_groups.json
+share/cataclysm-dda/json/itemgroups/obsolete.json
+share/cataclysm-dda/json/itemgroups/roof.json
+share/cataclysm-dda/json/itemgroups/science_and_tech.json
+share/cataclysm-dda/json/itemgroups/shops_trades.json
+share/cataclysm-dda/json/itemgroups/stashes.json
 share/cataclysm-dda/json/itemgroups/supplies.json
 share/cataclysm-dda/json/itemgroups/tools.json
+share/cataclysm-dda/json/itemgroups/trash_and_debris.json
+share/cataclysm-dda/json/itemgroups/vehicles_fuel_related.json
 share/cataclysm-dda/json/itemgroups/vending_machines.json
 share/cataclysm-dda/json/items/ammo.json
+share/cataclysm-dda/json/items/ammo/10mm.json
 share/cataclysm-dda/json/items/ammo/12mm.json
 share/cataclysm-dda/json/items/ammo/20x66mm.json
 share/cataclysm-dda/json/items/ammo/22.json
 share/cataclysm-dda/json/items/ammo/223.json
+share/cataclysm-dda/json/items/ammo/270win.json
 share/cataclysm-dda/json/items/ammo/300.json
 share/cataclysm-dda/json/items/ammo/3006.json
+share/cataclysm-dda/json/items/ammo/300blk.json
 share/cataclysm-dda/json/items/ammo/308.json
 share/cataclysm-dda/json/items/ammo/32.json
-share/cataclysm-dda/json/items/ammo/357.json
+share/cataclysm-dda/json/items/ammo/357mag.json
+share/cataclysm-dda/json/items/ammo/357sig.json
 share/cataclysm-dda/json/items/ammo/36paper.json
 share/cataclysm-dda/json/items/ammo/38.json
+share/cataclysm-dda/json/items/ammo/380.json
+share/cataclysm-dda/json/items/ammo/38super.json
 share/cataclysm-dda/json/items/ammo/40.json
-share/cataclysm-dda/json/items/ammo/40mm.json
+share/cataclysm-dda/json/items/ammo/40x46mm.json
+share/cataclysm-dda/json/items/ammo/40x53mm.json
+share/cataclysm-dda/json/items/ammo/410shot.json
 share/cataclysm-dda/json/items/ammo/44.json
 share/cataclysm-dda/json/items/ammo/44paper.json
 share/cataclysm-dda/json/items/ammo/45.json
 share/cataclysm-dda/json/items/ammo/454.json
+share/cataclysm-dda/json/items/ammo/4570.json
+share/cataclysm-dda/json/items/ammo/45colt.json
 share/cataclysm-dda/json/items/ammo/46.json
 share/cataclysm-dda/json/items/ammo/460.json
 share/cataclysm-dda/json/items/ammo/50.json
@@ -86,6 +167,7 @@ share/cataclysm-dda/json/items/ammo/500.
 share/cataclysm-dda/json/items/ammo/545x39.json
 share/cataclysm-dda/json/items/ammo/57.json
 share/cataclysm-dda/json/items/ammo/5x50.json
+share/cataclysm-dda/json/items/ammo/66mm.json
 share/cataclysm-dda/json/items/ammo/700nx.json
 share/cataclysm-dda/json/items/ammo/762.json
 share/cataclysm-dda/json/items/ammo/762R.json
@@ -94,20 +176,52 @@ share/cataclysm-dda/json/items/ammo/84x2
 share/cataclysm-dda/json/items/ammo/8x40mm.json
 share/cataclysm-dda/json/items/ammo/9mm.json
 share/cataclysm-dda/json/items/ammo/9x18.json
+share/cataclysm-dda/json/items/ammo/atgm.json
+share/cataclysm-dda/json/items/ammo/barb.json
+share/cataclysm-dda/json/items/ammo/chemical_spray.json
 share/cataclysm-dda/json/items/ammo/flintlock.json
 share/cataclysm-dda/json/items/ammo/metal_rail.json
 share/cataclysm-dda/json/items/ammo/nail.json
 share/cataclysm-dda/json/items/ammo/paintball.json
 share/cataclysm-dda/json/items/ammo/shot.json
+share/cataclysm-dda/json/items/ammo/shotcanister.json
+share/cataclysm-dda/json/items/ammo/shotpaper.json
 share/cataclysm-dda/json/items/ammo/signal_flare.json
 share/cataclysm-dda/json/items/ammo/weldgas.json
 share/cataclysm-dda/json/items/ammo_types.json
-share/cataclysm-dda/json/items/archery.json
-share/cataclysm-dda/json/items/armor.json
 share/cataclysm-dda/json/items/armor/ammo_pouch.json
+share/cataclysm-dda/json/items/armor/arms_armor.json
+share/cataclysm-dda/json/items/armor/ballistic_armor.json
 share/cataclysm-dda/json/items/armor/bandolier.json
+share/cataclysm-dda/json/items/armor/belts.json
 share/cataclysm-dda/json/items/armor/boots.json
+share/cataclysm-dda/json/items/armor/cloaks.json
+share/cataclysm-dda/json/items/armor/coats.json
+share/cataclysm-dda/json/items/armor/eyewear.json
+share/cataclysm-dda/json/items/armor/gloves.json
+share/cataclysm-dda/json/items/armor/hats.json
+share/cataclysm-dda/json/items/armor/helmets.json
 share/cataclysm-dda/json/items/armor/holster.json
+share/cataclysm-dda/json/items/armor/hoods.json
+share/cataclysm-dda/json/items/armor/jewelry.json
+share/cataclysm-dda/json/items/armor/legs_armor.json
+share/cataclysm-dda/json/items/armor/legs_clothes.json
+share/cataclysm-dda/json/items/armor/masks.json
+share/cataclysm-dda/json/items/armor/misc.json
+share/cataclysm-dda/json/items/armor/pets_dog_armor.json
+share/cataclysm-dda/json/items/armor/pets_horse_armor.json
+share/cataclysm-dda/json/items/armor/power_armor.json
+share/cataclysm-dda/json/items/armor/scarfs.json
+share/cataclysm-dda/json/items/armor/sheath.json
+share/cataclysm-dda/json/items/armor/storage.json
+share/cataclysm-dda/json/items/armor/suits_clothes.json
+share/cataclysm-dda/json/items/armor/suits_protection.json
+share/cataclysm-dda/json/items/armor/swimming.json
+share/cataclysm-dda/json/items/armor/torso_armor.json
+share/cataclysm-dda/json/items/armor/torso_clothes.json
+share/cataclysm-dda/json/items/armor/undergarment.json
+share/cataclysm-dda/json/items/basecamp.json
+share/cataclysm-dda/json/items/battery.json
 share/cataclysm-dda/json/items/bionics.json
 share/cataclysm-dda/json/items/biosignatures.json
 share/cataclysm-dda/json/items/book/archery.json
@@ -159,7 +273,6 @@ share/cataclysm-dda/json/items/comestibl
 share/cataclysm-dda/json/items/comestibles/irradiated_veggy.json
 share/cataclysm-dda/json/items/comestibles/junkfood.json
 share/cataclysm-dda/json/items/comestibles/meat_dishes.json
-share/cataclysm-dda/json/items/comestibles/meat_dishes_human.json
 share/cataclysm-dda/json/items/comestibles/med.json
 share/cataclysm-dda/json/items/comestibles/mre.json
 share/cataclysm-dda/json/items/comestibles/mushroom.json
@@ -177,34 +290,49 @@ share/cataclysm-dda/json/items/comestibl
 share/cataclysm-dda/json/items/comestibles/veggy_dishes.json
 share/cataclysm-dda/json/items/comestibles/wheat.json
 share/cataclysm-dda/json/items/containers.json
-share/cataclysm-dda/json/items/crossbows.json
+share/cataclysm-dda/json/items/corpses/corpses.json
+share/cataclysm-dda/json/items/corpses/inactive_bots.json
+share/cataclysm-dda/json/items/electronics.json
 share/cataclysm-dda/json/items/fake.json
+share/cataclysm-dda/json/items/faults_bionic.json
 share/cataclysm-dda/json/items/fluff.json
 share/cataclysm-dda/json/items/fuel.json
 share/cataclysm-dda/json/items/generic.json
 share/cataclysm-dda/json/items/generic/ammolink.json
+share/cataclysm-dda/json/items/generic/bathroom_house.json
+share/cataclysm-dda/json/items/generic/bedding.json
 share/cataclysm-dda/json/items/generic/casing.json
 share/cataclysm-dda/json/items/generic/currency.json
+share/cataclysm-dda/json/items/generic/dining_kitchen.json
 share/cataclysm-dda/json/items/generic/spares.json
+share/cataclysm-dda/json/items/generic/storage.json
 share/cataclysm-dda/json/items/generic/string.json
-share/cataclysm-dda/json/items/grenades.json
+share/cataclysm-dda/json/items/generic/toys_and_sports.json
 share/cataclysm-dda/json/items/gun/12mm.json
 share/cataclysm-dda/json/items/gun/20x66mm.json
 share/cataclysm-dda/json/items/gun/22.json
 share/cataclysm-dda/json/items/gun/223.json
+share/cataclysm-dda/json/items/gun/270win.json
 share/cataclysm-dda/json/items/gun/300.json
 share/cataclysm-dda/json/items/gun/3006.json
+share/cataclysm-dda/json/items/gun/300BLK.json
 share/cataclysm-dda/json/items/gun/308.json
 share/cataclysm-dda/json/items/gun/32.json
-share/cataclysm-dda/json/items/gun/357.json
+share/cataclysm-dda/json/items/gun/357sig.json
 share/cataclysm-dda/json/items/gun/36paper.json
 share/cataclysm-dda/json/items/gun/38.json
+share/cataclysm-dda/json/items/gun/380.json
+share/cataclysm-dda/json/items/gun/38super.json
 share/cataclysm-dda/json/items/gun/40.json
-share/cataclysm-dda/json/items/gun/40mm.json
+share/cataclysm-dda/json/items/gun/40x46mm.json
+share/cataclysm-dda/json/items/gun/40x53mm.json
+share/cataclysm-dda/json/items/gun/410shot.json
 share/cataclysm-dda/json/items/gun/44.json
 share/cataclysm-dda/json/items/gun/44paper.json
 share/cataclysm-dda/json/items/gun/45.json
 share/cataclysm-dda/json/items/gun/454.json
+share/cataclysm-dda/json/items/gun/4570.json
+share/cataclysm-dda/json/items/gun/45colt.json
 share/cataclysm-dda/json/items/gun/46.json
 share/cataclysm-dda/json/items/gun/460.json
 share/cataclysm-dda/json/items/gun/50.json
@@ -212,6 +340,7 @@ share/cataclysm-dda/json/items/gun/500.j
 share/cataclysm-dda/json/items/gun/545x39.json
 share/cataclysm-dda/json/items/gun/57.json
 share/cataclysm-dda/json/items/gun/5x50.json
+share/cataclysm-dda/json/items/gun/66mm.json
 share/cataclysm-dda/json/items/gun/700nx.json
 share/cataclysm-dda/json/items/gun/762.json
 share/cataclysm-dda/json/items/gun/762R.json
@@ -220,11 +349,16 @@ share/cataclysm-dda/json/items/gun/84x24
 share/cataclysm-dda/json/items/gun/8x40mm.json
 share/cataclysm-dda/json/items/gun/9mm.json
 share/cataclysm-dda/json/items/gun/9x18.json
+share/cataclysm-dda/json/items/gun/atgm.json
 share/cataclysm-dda/json/items/gun/bio.json
 share/cataclysm-dda/json/items/gun/blunderbuss.json
+share/cataclysm-dda/json/items/gun/chemical_spray.json
+share/cataclysm-dda/json/items/gun/combination.json
+share/cataclysm-dda/json/items/gun/faults_gun.json
 share/cataclysm-dda/json/items/gun/flammable.json
 share/cataclysm-dda/json/items/gun/flintlock.json
 share/cataclysm-dda/json/items/gun/metal_rail.json
+share/cataclysm-dda/json/items/gun/monster_gun.json
 share/cataclysm-dda/json/items/gun/nail.json
 share/cataclysm-dda/json/items/gun/paintball.json
 share/cataclysm-dda/json/items/gun/shot.json
@@ -232,16 +366,22 @@ share/cataclysm-dda/json/items/gun/signa
 share/cataclysm-dda/json/items/gun/ups.json
 share/cataclysm-dda/json/items/gunmod/accessories.json
 share/cataclysm-dda/json/items/gunmod/barrel.json
+share/cataclysm-dda/json/items/gunmod/bionicmods.json
+share/cataclysm-dda/json/items/gunmod/brass_catcher.json
+share/cataclysm-dda/json/items/gunmod/conversions.json
 share/cataclysm-dda/json/items/gunmod/grip.json
 share/cataclysm-dda/json/items/gunmod/laser_gunmods.json
-share/cataclysm-dda/json/items/gunmod/magazine.json
+share/cataclysm-dda/json/items/gunmod/loading_port.json
 share/cataclysm-dda/json/items/gunmod/mechanism.json
+share/cataclysm-dda/json/items/gunmod/mount.json
 share/cataclysm-dda/json/items/gunmod/muzzle.json
 share/cataclysm-dda/json/items/gunmod/rail.json
 share/cataclysm-dda/json/items/gunmod/sights.json
+share/cataclysm-dda/json/items/gunmod/sling.json
 share/cataclysm-dda/json/items/gunmod/stock.json
 share/cataclysm-dda/json/items/gunmod/underbarrel.json
 share/cataclysm-dda/json/items/handloaded_bullets.json
+share/cataclysm-dda/json/items/items_holiday.json
 share/cataclysm-dda/json/items/magazine/12mm.json
 share/cataclysm-dda/json/items/magazine/20x60mm.json
 share/cataclysm-dda/json/items/magazine/22.json
@@ -250,65 +390,142 @@ share/cataclysm-dda/json/items/magazine/
 share/cataclysm-dda/json/items/magazine/3006.json
 share/cataclysm-dda/json/items/magazine/308.json
 share/cataclysm-dda/json/items/magazine/32.json
-share/cataclysm-dda/json/items/magazine/357.json
+share/cataclysm-dda/json/items/magazine/357sig.json
 share/cataclysm-dda/json/items/magazine/38.json
+share/cataclysm-dda/json/items/magazine/380.json
+share/cataclysm-dda/json/items/magazine/38super.json
 share/cataclysm-dda/json/items/magazine/40.json
 share/cataclysm-dda/json/items/magazine/40mm.json
+share/cataclysm-dda/json/items/magazine/410shot.json
 share/cataclysm-dda/json/items/magazine/44.json
 share/cataclysm-dda/json/items/magazine/45.json
+share/cataclysm-dda/json/items/magazine/454.json
 share/cataclysm-dda/json/items/magazine/46.json
 share/cataclysm-dda/json/items/magazine/460.json
 share/cataclysm-dda/json/items/magazine/50.json
+share/cataclysm-dda/json/items/magazine/500.json
 share/cataclysm-dda/json/items/magazine/545x39.json
 share/cataclysm-dda/json/items/magazine/57.json
 share/cataclysm-dda/json/items/magazine/5x50.json
+share/cataclysm-dda/json/items/magazine/66mm.json
 share/cataclysm-dda/json/items/magazine/762.json
 share/cataclysm-dda/json/items/magazine/762R.json
 share/cataclysm-dda/json/items/magazine/762x25.json
 share/cataclysm-dda/json/items/magazine/8x40mm.json
 share/cataclysm-dda/json/items/magazine/9mm.json
 share/cataclysm-dda/json/items/magazine/9x18.json
+share/cataclysm-dda/json/items/magazine/chemical_spray.json
 share/cataclysm-dda/json/items/magazine/liquid.json
 share/cataclysm-dda/json/items/magazine/nail.json
 share/cataclysm-dda/json/items/magazine/shot.json
 share/cataclysm-dda/json/items/magazine/weldgas.json
-share/cataclysm-dda/json/items/melee.json
+share/cataclysm-dda/json/items/melee/bludgeons.json
+share/cataclysm-dda/json/items/melee/fake.json
+share/cataclysm-dda/json/items/melee/knives_kitchen.json
+share/cataclysm-dda/json/items/melee/misc.json
+share/cataclysm-dda/json/items/melee/spears_and_polearms.json
+share/cataclysm-dda/json/items/melee/swords_and_blades.json
+share/cataclysm-dda/json/items/melee/unarmed_weapons.json
 share/cataclysm-dda/json/items/migration.json
 share/cataclysm-dda/json/items/newspaper.json
 share/cataclysm-dda/json/items/obsolete.json
-share/cataclysm-dda/json/items/ranged.json
-share/cataclysm-dda/json/items/resources/metals.json
+share/cataclysm-dda/json/items/ranged/archery.json
+share/cataclysm-dda/json/items/ranged/crossbows.json
+share/cataclysm-dda/json/items/ranged/energy.json
+share/cataclysm-dda/json/items/ranged/launchers.json
+share/cataclysm-dda/json/items/ranged/pneumatic.json
+share/cataclysm-dda/json/items/ranged/slings.json
+share/cataclysm-dda/json/items/ranged/spearguns.json
+share/cataclysm-dda/json/items/ranged/throwing.json
+share/cataclysm-dda/json/items/resources/alien.json
+share/cataclysm-dda/json/items/resources/chemicals.json
+share/cataclysm-dda/json/items/resources/fasteners.json
+share/cataclysm-dda/json/items/resources/glass.json
+share/cataclysm-dda/json/items/resources/home_improvement.json
+share/cataclysm-dda/json/items/resources/metal.json
 share/cataclysm-dda/json/items/resources/misc.json
+share/cataclysm-dda/json/items/resources/plastic.json
+share/cataclysm-dda/json/items/resources/tailoring.json
+share/cataclysm-dda/json/items/resources/wood.json
+share/cataclysm-dda/json/items/robot_parts.json
 share/cataclysm-dda/json/items/software.json
+share/cataclysm-dda/json/items/tool/container.json
+share/cataclysm-dda/json/items/tool/cooking.json
 share/cataclysm-dda/json/items/tool/deployable.json
+share/cataclysm-dda/json/items/tool/electronics.json
+share/cataclysm-dda/json/items/tool/entry_tools.json
+share/cataclysm-dda/json/items/tool/explosives.json
+share/cataclysm-dda/json/items/tool/fire.json
+share/cataclysm-dda/json/items/tool/firefighting.json
+share/cataclysm-dda/json/items/tool/fishing.json
+share/cataclysm-dda/json/items/tool/handloading.json
+share/cataclysm-dda/json/items/tool/knives.json
+share/cataclysm-dda/json/items/tool/landscaping.json
 share/cataclysm-dda/json/items/tool/lighting.json
 share/cataclysm-dda/json/items/tool/med.json
+share/cataclysm-dda/json/items/tool/metalworking.json
+share/cataclysm-dda/json/items/tool/misc.json
+share/cataclysm-dda/json/items/tool/musical_instruments.json
+share/cataclysm-dda/json/items/tool/pets.json
 share/cataclysm-dda/json/items/tool/radio_tools.json
+share/cataclysm-dda/json/items/tool/raincatchers.json
 share/cataclysm-dda/json/items/tool/science.json
+share/cataclysm-dda/json/items/tool/shelters.json
+share/cataclysm-dda/json/items/tool/smoking.json
+share/cataclysm-dda/json/items/tool/stationary.json
+share/cataclysm-dda/json/items/tool/tailoring.json
+share/cataclysm-dda/json/items/tool/toileteries.json
+share/cataclysm-dda/json/items/tool/traps.json
+share/cataclysm-dda/json/items/tool/woodworking.json
 share/cataclysm-dda/json/items/tool/workshop.json
 share/cataclysm-dda/json/items/tool_armor.json
 share/cataclysm-dda/json/items/toolmod.json
-share/cataclysm-dda/json/items/tools.json
 share/cataclysm-dda/json/items/vehicle/alternator.json
+share/cataclysm-dda/json/items/vehicle/animals.json
 share/cataclysm-dda/json/items/vehicle/armor.json
 share/cataclysm-dda/json/items/vehicle/battery.json
+share/cataclysm-dda/json/items/vehicle/boat.json
+share/cataclysm-dda/json/items/vehicle/cables.json
+share/cataclysm-dda/json/items/vehicle/cargo.json
+share/cataclysm-dda/json/items/vehicle/controls.json
 share/cataclysm-dda/json/items/vehicle/engine.json
 share/cataclysm-dda/json/items/vehicle/engineering.json
+share/cataclysm-dda/json/items/vehicle/farming.json
+share/cataclysm-dda/json/items/vehicle/frames.json
+share/cataclysm-dda/json/items/vehicle/fuel_storage.json
+share/cataclysm-dda/json/items/vehicle/lights.json
+share/cataclysm-dda/json/items/vehicle/manual.json
+share/cataclysm-dda/json/items/vehicle/mills.json
+share/cataclysm-dda/json/items/vehicle/motors.json
+share/cataclysm-dda/json/items/vehicle/noise.json
+share/cataclysm-dda/json/items/vehicle/plating.json
 share/cataclysm-dda/json/items/vehicle/rams.json
 share/cataclysm-dda/json/items/vehicle/rigs.json
+share/cataclysm-dda/json/items/vehicle/seating.json
+share/cataclysm-dda/json/items/vehicle/solar.json
+share/cataclysm-dda/json/items/vehicle/tables.json
+share/cataclysm-dda/json/items/vehicle/turrets.json
+share/cataclysm-dda/json/items/vehicle/utilities.json
 share/cataclysm-dda/json/items/vehicle/wheel.json
-share/cataclysm-dda/json/items/vehicle_parts.json
-share/cataclysm-dda/json/lab_notes.json
+share/cataclysm-dda/json/legacy_artifact_active.json
+share/cataclysm-dda/json/legacy_artifact_passive.json
+share/cataclysm-dda/json/loot_zones.json
+share/cataclysm-dda/json/mapgen/Glassblower.json
+share/cataclysm-dda/json/mapgen/Metalworker.json
+share/cataclysm-dda/json/mapgen/Pottery_Sewing_Shops.json
 share/cataclysm-dda/json/mapgen/abandoned01.json
 share/cataclysm-dda/json/mapgen/abandoned_barn.json
 share/cataclysm-dda/json/mapgen/abandoned_shopping_plaza.json
 share/cataclysm-dda/json/mapgen/abandoned_warehouse.json
 share/cataclysm-dda/json/mapgen/abstorefront.json
+share/cataclysm-dda/json/mapgen/airliner.json
 share/cataclysm-dda/json/mapgen/animalpound.json
 share/cataclysm-dda/json/mapgen/animalshelter.json
 share/cataclysm-dda/json/mapgen/antique_store.json
 share/cataclysm-dda/json/mapgen/apartment_con.json
+share/cataclysm-dda/json/mapgen/apartment_con_new.json
 share/cataclysm-dda/json/mapgen/apartment_mod.json
+share/cataclysm-dda/json/mapgen/apartment_mod_new.json
 share/cataclysm-dda/json/mapgen/arcade.json
 share/cataclysm-dda/json/mapgen/art_gallery.json
 share/cataclysm-dda/json/mapgen/bakery.json
@@ -317,45 +534,190 @@ share/cataclysm-dda/json/mapgen/bandit_c
 share/cataclysm-dda/json/mapgen/bandit_garage.json
 share/cataclysm-dda/json/mapgen/bank.json
 share/cataclysm-dda/json/mapgen/bar.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_defenses.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_tent.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_firestation1.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_standard.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_standard.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/primitive_field.json
 share/cataclysm-dda/json/mapgen/basement/basement_bionic.json
 share/cataclysm-dda/json/mapgen/basement/basement_chem.json
 share/cataclysm-dda/json/mapgen/basement/basement_game.json
 share/cataclysm-dda/json/mapgen/basement/basement_guns.json
 share/cataclysm-dda/json/mapgen/basement/basement_lab_stairs.json
+share/cataclysm-dda/json/mapgen/basement/basement_messed.json
+share/cataclysm-dda/json/mapgen/basement/basement_meth.json
 share/cataclysm-dda/json/mapgen/basement/basement_survival.json
 share/cataclysm-dda/json/mapgen/basement/basement_weed.json
+share/cataclysm-dda/json/mapgen/basement/basements.json
 share/cataclysm-dda/json/mapgen/bike_shop.json
 share/cataclysm-dda/json/mapgen/bowling_alley.json
 share/cataclysm-dda/json/mapgen/boxing.json
 share/cataclysm-dda/json/mapgen/bunker.json
+share/cataclysm-dda/json/mapgen/bus_station.json
 share/cataclysm-dda/json/mapgen/butcher.json
 share/cataclysm-dda/json/mapgen/cabin.json
 share/cataclysm-dda/json/mapgen/campground.json
+share/cataclysm-dda/json/mapgen/campground_npc.json
 share/cataclysm-dda/json/mapgen/campsite.json
+share/cataclysm-dda/json/mapgen/campus/buildings/admin_f0.json
+share/cataclysm-dda/json/mapgen/campus/buildings/admin_f1.json
+share/cataclysm-dda/json/mapgen/campus/buildings/admin_f2.json
+share/cataclysm-dda/json/mapgen/campus/buildings/admin_roof.json
+share/cataclysm-dda/json/mapgen/campus/buildings/commons_f0.json
+share/cataclysm-dda/json/mapgen/campus/buildings/commons_f1.json
+share/cataclysm-dda/json/mapgen/campus/buildings/commons_f2.json
+share/cataclysm-dda/json/mapgen/campus/buildings/commons_roof.json
+share/cataclysm-dda/json/mapgen/campus/buildings/health_f0.json
+share/cataclysm-dda/json/mapgen/campus/buildings/health_f1.json
+share/cataclysm-dda/json/mapgen/campus/buildings/health_f2.json
+share/cataclysm-dda/json/mapgen/campus/buildings/health_roof.json
+share/cataclysm-dda/json/mapgen/campus/buildings/lecture_f0.json
+share/cataclysm-dda/json/mapgen/campus/buildings/lecture_f1.json
+share/cataclysm-dda/json/mapgen/campus/buildings/lecture_f2.json
+share/cataclysm-dda/json/mapgen/campus/buildings/lecture_roof.json
+share/cataclysm-dda/json/mapgen/campus/buildings/media_f0.json
+share/cataclysm-dda/json/mapgen/campus/buildings/media_f1.json
+share/cataclysm-dda/json/mapgen/campus/buildings/media_f2.json
+share/cataclysm-dda/json/mapgen/campus/buildings/media_f3.json
+share/cataclysm-dda/json/mapgen/campus/buildings/media_roof.json
 share/cataclysm-dda/json/mapgen/cathedral.json
 share/cataclysm-dda/json/mapgen/cemetery_4square.json
 share/cataclysm-dda/json/mapgen/cemetery_medium.json
 share/cataclysm-dda/json/mapgen/cemetery_small.json
+share/cataclysm-dda/json/mapgen/cground3x3.json
 share/cataclysm-dda/json/mapgen/church.json
+share/cataclysm-dda/json/mapgen/city_blocks/city_block_2.json
+share/cataclysm-dda/json/mapgen/collapsed_tower.json
 share/cataclysm-dda/json/mapgen/construction_site.json
+share/cataclysm-dda/json/mapgen/cs_car_dealership.json
+share/cataclysm-dda/json/mapgen/cs_car_showroom.json
+share/cataclysm-dda/json/mapgen/cs_city_dump_small.json
+share/cataclysm-dda/json/mapgen/cs_gardening_allotment.json
+share/cataclysm-dda/json/mapgen/cs_internet_cafe.json
+share/cataclysm-dda/json/mapgen/cs_market_small.json
+share/cataclysm-dda/json/mapgen/cs_open_sewer_small.json
+share/cataclysm-dda/json/mapgen/cs_private_park.json
+share/cataclysm-dda/json/mapgen/cs_public_art_piece.json
+share/cataclysm-dda/json/mapgen/cs_public_space.json
+share/cataclysm-dda/json/mapgen/cs_sex_shop.json
+share/cataclysm-dda/json/mapgen/cs_tire_shop.json
 share/cataclysm-dda/json/mapgen/daycare.json
 share/cataclysm-dda/json/mapgen/debug_ramps.json
 share/cataclysm-dda/json/mapgen/derelict_property.json
 share/cataclysm-dda/json/mapgen/diner.json
 share/cataclysm-dda/json/mapgen/dirtroad.json
 share/cataclysm-dda/json/mapgen/dispensary.json
+share/cataclysm-dda/json/mapgen/dock.json
 share/cataclysm-dda/json/mapgen/dojo.json
 share/cataclysm-dda/json/mapgen/dollar_store.json
 share/cataclysm-dda/json/mapgen/dump.json
 share/cataclysm-dda/json/mapgen/dumpsite.json
-share/cataclysm-dda/json/mapgen/evac_center.json
 share/cataclysm-dda/json/mapgen/faction_buildings.json
 share/cataclysm-dda/json/mapgen/farm.json
+share/cataclysm-dda/json/mapgen/farm_2side.json
 share/cataclysm-dda/json/mapgen/farm_dairy.json
+share/cataclysm-dda/json/mapgen/farm_horse.json
+share/cataclysm-dda/json/mapgen/farm_stills.json
+share/cataclysm-dda/json/mapgen/farm_tiles.json
 share/cataclysm-dda/json/mapgen/farm_tree.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_blc_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_blc_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_blc_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_blc_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_brc_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_brc_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_brc_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_brc_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_le_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_le_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_le_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_le_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_mid_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_mid_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_mid_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_mid_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_re_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_re_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_re_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_re_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_te_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_te_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_te_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_te_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_tlc_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_tlc_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_tlc_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_tlc_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_trc_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_trc_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_trc_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_trc_03.json
 share/cataclysm-dda/json/mapgen/field_baseball.json
 share/cataclysm-dda/json/mapgen/field_football.json
 share/cataclysm-dda/json/mapgen/fire_station.json
+share/cataclysm-dda/json/mapgen/fungal/fungal_bloom.json
+share/cataclysm-dda/json/mapgen/fungal/fungal_flowers.json
+share/cataclysm-dda/json/mapgen/fungal/fungal_tower.json
 share/cataclysm-dda/json/mapgen/gambling_hall.json
 share/cataclysm-dda/json/mapgen/garage.json
 share/cataclysm-dda/json/mapgen/garage_gas.json
@@ -366,14 +728,21 @@ share/cataclysm-dda/json/mapgen/gardenin
 share/cataclysm-dda/json/mapgen/golfcourse.json
 share/cataclysm-dda/json/mapgen/gunsmith.json
 share/cataclysm-dda/json/mapgen/gym.json
+share/cataclysm-dda/json/mapgen/hazardous_waste_sarcophagus.json
 share/cataclysm-dda/json/mapgen/headshop.json
+share/cataclysm-dda/json/mapgen/helipad.json
 share/cataclysm-dda/json/mapgen/homeimprovement.json
 share/cataclysm-dda/json/mapgen/homeimprovement_superstore.json
+share/cataclysm-dda/json/mapgen/homeimprovement_superstore_new.json
 share/cataclysm-dda/json/mapgen/homeless_camp.json
+share/cataclysm-dda/json/mapgen/homeless_shelter.json
 share/cataclysm-dda/json/mapgen/hospital.json
 share/cataclysm-dda/json/mapgen/hotel_tower.json
 share/cataclysm-dda/json/mapgen/house/crack_house.json
-share/cataclysm-dda/json/mapgen/house/detached_house.json
+share/cataclysm-dda/json/mapgen/house/garden_house_1.json
+share/cataclysm-dda/json/mapgen/house/house01.json
+share/cataclysm-dda/json/mapgen/house/house02.json
+share/cataclysm-dda/json/mapgen/house/house03.json
 share/cataclysm-dda/json/mapgen/house/house04.json
 share/cataclysm-dda/json/mapgen/house/house05.json
 share/cataclysm-dda/json/mapgen/house/house05_ab.json
@@ -391,9 +760,42 @@ share/cataclysm-dda/json/mapgen/house/ho
 share/cataclysm-dda/json/mapgen/house/house17.json
 share/cataclysm-dda/json/mapgen/house/house18.json
 share/cataclysm-dda/json/mapgen/house/house19.json
+share/cataclysm-dda/json/mapgen/house/house20.json
+share/cataclysm-dda/json/mapgen/house/house21.json
+share/cataclysm-dda/json/mapgen/house/house22.json
+share/cataclysm-dda/json/mapgen/house/house23.json
+share/cataclysm-dda/json/mapgen/house/house24.json
+share/cataclysm-dda/json/mapgen/house/house25.json
+share/cataclysm-dda/json/mapgen/house/house26.json
+share/cataclysm-dda/json/mapgen/house/house27.json
+share/cataclysm-dda/json/mapgen/house/house28.json
+share/cataclysm-dda/json/mapgen/house/house29.json
+share/cataclysm-dda/json/mapgen/house/house30.json
+share/cataclysm-dda/json/mapgen/house/house31.json
+share/cataclysm-dda/json/mapgen/house/house32.json
 share/cataclysm-dda/json/mapgen/house/house_2story.json
+share/cataclysm-dda/json/mapgen/house/house_detatched1.json
+share/cataclysm-dda/json/mapgen/house/house_detatched10.json
+share/cataclysm-dda/json/mapgen/house/house_detatched2.json
+share/cataclysm-dda/json/mapgen/house/house_detatched3.json
+share/cataclysm-dda/json/mapgen/house/house_detatched4.json
+share/cataclysm-dda/json/mapgen/house/house_detatched5.json
+share/cataclysm-dda/json/mapgen/house/house_detatched6.json
+share/cataclysm-dda/json/mapgen/house/house_detatched7.json
+share/cataclysm-dda/json/mapgen/house/house_detatched8.json
+share/cataclysm-dda/json/mapgen/house/house_detatched9.json
 share/cataclysm-dda/json/mapgen/house/house_dogs.json
 share/cataclysm-dda/json/mapgen/house/house_duplex.json
+share/cataclysm-dda/json/mapgen/house/house_duplex10.json
+share/cataclysm-dda/json/mapgen/house/house_duplex11.json
+share/cataclysm-dda/json/mapgen/house/house_duplex2.json
+share/cataclysm-dda/json/mapgen/house/house_duplex3.json
+share/cataclysm-dda/json/mapgen/house/house_duplex4.json
+share/cataclysm-dda/json/mapgen/house/house_duplex5.json
+share/cataclysm-dda/json/mapgen/house/house_duplex6.json
+share/cataclysm-dda/json/mapgen/house/house_duplex7.json
+share/cataclysm-dda/json/mapgen/house/house_duplex8.json
+share/cataclysm-dda/json/mapgen/house/house_duplex9.json
 share/cataclysm-dda/json/mapgen/house/house_fortified.json
 share/cataclysm-dda/json/mapgen/house/house_garage.json
 share/cataclysm-dda/json/mapgen/house/house_garage2.json
@@ -405,6 +807,7 @@ share/cataclysm-dda/json/mapgen/house/ho
 share/cataclysm-dda/json/mapgen/house/house_garage8.json
 share/cataclysm-dda/json/mapgen/house/house_garage_prepper.json
 share/cataclysm-dda/json/mapgen/house/house_gardener.json
+share/cataclysm-dda/json/mapgen/house/house_inner_garden.json
 share/cataclysm-dda/json/mapgen/house/house_library.json
 share/cataclysm-dda/json/mapgen/house/house_modern_lx.json
 share/cataclysm-dda/json/mapgen/house/house_patio.json
@@ -416,7 +819,20 @@ share/cataclysm-dda/json/mapgen/house/ho
 share/cataclysm-dda/json/mapgen/house/house_suicide.json
 share/cataclysm-dda/json/mapgen/house/house_tool_shed.json
 share/cataclysm-dda/json/mapgen/house/house_vacant.json
+share/cataclysm-dda/json/mapgen/house/house_w_1.json
+share/cataclysm-dda/json/mapgen/house/house_w_2.json
+share/cataclysm-dda/json/mapgen/house/house_w_3.json
+share/cataclysm-dda/json/mapgen/house/house_w_4.json
+share/cataclysm-dda/json/mapgen/house/house_w_5.json
+share/cataclysm-dda/json/mapgen/house/house_w_6.json
+share/cataclysm-dda/json/mapgen/house/house_wooded.json
 share/cataclysm-dda/json/mapgen/hunting_blind.json
+share/cataclysm-dda/json/mapgen/irradiator_1.json
+share/cataclysm-dda/json/mapgen/isherwood_farms/cabin_isherwood.json
+share/cataclysm-dda/json/mapgen/isherwood_farms/dairy_farm_isherwood.json
+share/cataclysm-dda/json/mapgen/isherwood_farms/farm_horse_isherwood.json
+share/cataclysm-dda/json/mapgen/isherwood_farms/farm_isherwood.json
+share/cataclysm-dda/json/mapgen/isherwood_farms/rural_roads_trails.json
 share/cataclysm-dda/json/mapgen/jewel_store.json
 share/cataclysm-dda/json/mapgen/junkyard.json
 share/cataclysm-dda/json/mapgen/lab/README.md
@@ -429,7 +845,18 @@ share/cataclysm-dda/json/mapgen/lab/lab_
 share/cataclysm-dda/json/mapgen/lab/lab_floorplans_finale1level.json
 share/cataclysm-dda/json/mapgen/lab/lab_rooms.json
 share/cataclysm-dda/json/mapgen/lab/lab_rooms_wall.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z1.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z2.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z3.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z4.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z5.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_nested.json
 share/cataclysm-dda/json/mapgen/lab/lab_trains.json
+share/cataclysm-dda/json/mapgen/lake.json
+share/cataclysm-dda/json/mapgen/lake_buildings/cabin_lake.json
+share/cataclysm-dda/json/mapgen/lake_buildings/islands.json
+share/cataclysm-dda/json/mapgen/lake_buildings/lighthouse.json
 share/cataclysm-dda/json/mapgen/lan_center.json
 share/cataclysm-dda/json/mapgen/landfill.json
 share/cataclysm-dda/json/mapgen/landscaping_supply.json
@@ -438,13 +865,37 @@ share/cataclysm-dda/json/mapgen/library.
 share/cataclysm-dda/json/mapgen/lmoe.json
 share/cataclysm-dda/json/mapgen/lot_empty_commercial.json
 share/cataclysm-dda/json/mapgen/lot_empty_residential.json
+share/cataclysm-dda/json/mapgen/lumbermill.json
 share/cataclysm-dda/json/mapgen/lumberyard.json
 share/cataclysm-dda/json/mapgen/mall.json
 share/cataclysm-dda/json/mapgen/mansion.json
+share/cataclysm-dda/json/mapgen/map_extras/nest_dermatik.json
+share/cataclysm-dda/json/mapgen/map_extras/nest_wasp.json
+share/cataclysm-dda/json/mapgen/map_extras/prison_bus.json
+share/cataclysm-dda/json/mapgen/map_extras/wilderness.json
 share/cataclysm-dda/json/mapgen/mapgen-test.json
+share/cataclysm-dda/json/mapgen/marina.json
 share/cataclysm-dda/json/mapgen/mass_grave.json
+share/cataclysm-dda/json/mapgen/megastore.json
 share/cataclysm-dda/json/mapgen/meth_lab.json
+share/cataclysm-dda/json/mapgen/mi-go/mi-go_encampment.json
+share/cataclysm-dda/json/mapgen/mi-go/mi-go_nested.json
+share/cataclysm-dda/json/mapgen/mi-go/mi-go_scout_tower.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_connector.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_generic.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_generic_edge.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_shifting_hall.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_special_tiles.json
 share/cataclysm-dda/json/mapgen/mil_surplus.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z-1.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z0.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z1.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z2.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z3.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z4.json
+share/cataclysm-dda/json/mapgen/miniature_railway/miniature_railway_z1.json
+share/cataclysm-dda/json/mapgen/miniature_railway/miniature_railway_z2.json
+share/cataclysm-dda/json/mapgen/missile_silo.json
 share/cataclysm-dda/json/mapgen/moonshine_camp.json
 share/cataclysm-dda/json/mapgen/mortuary.json
 share/cataclysm-dda/json/mapgen/motel.json
@@ -457,6 +908,16 @@ share/cataclysm-dda/json/mapgen/necropol
 share/cataclysm-dda/json/mapgen/necropolis/necropolisB1.json
 share/cataclysm-dda/json/mapgen/necropolis/necropolisB2.json
 share/cataclysm-dda/json/mapgen/necropolis/necropolisB3.json
+share/cataclysm-dda/json/mapgen/nested/basement_nested.json
+share/cataclysm-dda/json/mapgen/nested/city_npc_nested_spawns.json
+share/cataclysm-dda/json/mapgen/nested/farm_nested.json
+share/cataclysm-dda/json/mapgen/nested/house_nested.json
+share/cataclysm-dda/json/mapgen/nested/lmoe_nested.json
+share/cataclysm-dda/json/mapgen/nested/nested_chunks_roof.json
+share/cataclysm-dda/json/mapgen/nested/office_nested.json
+share/cataclysm-dda/json/mapgen/nested/retail_nested.json
+share/cataclysm-dda/json/mapgen/nested/rural_outdoors_nested.json
+share/cataclysm-dda/json/mapgen/nested/shelter_nested.json
 share/cataclysm-dda/json/mapgen/office_cubical.json
 share/cataclysm-dda/json/mapgen/office_doctor.json
 share/cataclysm-dda/json/mapgen/office_small.json
@@ -464,10 +925,13 @@ share/cataclysm-dda/json/mapgen/office_t
 share/cataclysm-dda/json/mapgen/office_tower_2.json
 share/cataclysm-dda/json/mapgen/orchard_apple.json
 share/cataclysm-dda/json/mapgen/orchard_fruit.json
+share/cataclysm-dda/json/mapgen/outpost.json
 share/cataclysm-dda/json/mapgen/paintball_field.json
 share/cataclysm-dda/json/mapgen/park.json
 share/cataclysm-dda/json/mapgen/park_skate.json
 share/cataclysm-dda/json/mapgen/park_state.json
+share/cataclysm-dda/json/mapgen/parking_garage.json
+share/cataclysm-dda/json/mapgen/parking_lot.json
 share/cataclysm-dda/json/mapgen/pavilion.json
 share/cataclysm-dda/json/mapgen/pawn_shop.json
 share/cataclysm-dda/json/mapgen/petstore.json
@@ -482,6 +946,7 @@ share/cataclysm-dda/json/mapgen/post_off
 share/cataclysm-dda/json/mapgen/power_station_large.json
 share/cataclysm-dda/json/mapgen/power_station_small.json
 share/cataclysm-dda/json/mapgen/prison_1.json
+share/cataclysm-dda/json/mapgen/private_resort.json
 share/cataclysm-dda/json/mapgen/public_works.json
 share/cataclysm-dda/json/mapgen/pump_station.json
 share/cataclysm-dda/json/mapgen/radio_tower.json
@@ -489,12 +954,33 @@ share/cataclysm-dda/json/mapgen/railroad
 share/cataclysm-dda/json/mapgen/railroad/railroad_station.json
 share/cataclysm-dda/json/mapgen/ranch_camp.json
 share/cataclysm-dda/json/mapgen/recycle_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_e.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_n.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_ne.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_nw.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_s.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_se.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_sw.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_w.json
+share/cataclysm-dda/json/mapgen/refugee_center/refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z-1_refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z-2_refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z-3_refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z-4_refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z1_refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z2_refugee_center.json
+share/cataclysm-dda/json/mapgen/regional_airport.json
 share/cataclysm-dda/json/mapgen/restaurant.json
 share/cataclysm-dda/json/mapgen/restaurant_fast.json
 share/cataclysm-dda/json/mapgen/reststop.json
 share/cataclysm-dda/json/mapgen/river_shipwreck.json
+share/cataclysm-dda/json/mapgen/riverside/whaleys_boat_rental.json
+share/cataclysm-dda/json/mapgen/riverside/whaleys_house_river.json
 share/cataclysm-dda/json/mapgen/road_4way.json
 share/cataclysm-dda/json/mapgen/roadstop.json
+share/cataclysm-dda/json/mapgen/robofachq_static.json
+share/cataclysm-dda/json/mapgen/robofaq_locs/robofac_hq_chunks.json
+share/cataclysm-dda/json/mapgen/robofaq_locs/robofac_mission_chunks.json
 share/cataclysm-dda/json/mapgen/s_bookstore.json
 share/cataclysm-dda/json/mapgen/s_candy.json
 share/cataclysm-dda/json/mapgen/s_clothing.json
@@ -509,6 +995,7 @@ share/cataclysm-dda/json/mapgen/s_icecre
 share/cataclysm-dda/json/mapgen/s_liquor.json
 share/cataclysm-dda/json/mapgen/sai.json
 share/cataclysm-dda/json/mapgen/school_1.json
+share/cataclysm-dda/json/mapgen/sewage_treatment.json
 share/cataclysm-dda/json/mapgen/shelter.json
 share/cataclysm-dda/json/mapgen/shooting_range.json
 share/cataclysm-dda/json/mapgen/smallscrapyard.json
@@ -517,15 +1004,21 @@ share/cataclysm-dda/json/mapgen/sports_s
 share/cataclysm-dda/json/mapgen/stadium_football.json
 share/cataclysm-dda/json/mapgen/standing_stones.json
 share/cataclysm-dda/json/mapgen/station_radio.json
+share/cataclysm-dda/json/mapgen/steel_mill/steel_mill_z1.json
+share/cataclysm-dda/json/mapgen/steel_mill/steel_mill_z2.json
+share/cataclysm-dda/json/mapgen/steel_mill/steel_mill_z3.json
 share/cataclysm-dda/json/mapgen/storage_units_large.json
 share/cataclysm-dda/json/mapgen/storage_units_medium.json
 share/cataclysm-dda/json/mapgen/storage_units_small.json
+share/cataclysm-dda/json/mapgen/store/s_hunting.json
 share/cataclysm-dda/json/mapgen/stripclub.json
 share/cataclysm-dda/json/mapgen/sub_station.json
 share/cataclysm-dda/json/mapgen/sugar_house.json
 share/cataclysm-dda/json/mapgen/swamp_shack.json
 share/cataclysm-dda/json/mapgen/teashop.json
 share/cataclysm-dda/json/mapgen/thrift.json
+share/cataclysm-dda/json/mapgen/town_hall.json
+share/cataclysm-dda/json/mapgen/toxic_dump.json
 share/cataclysm-dda/json/mapgen/trail_nature.json
 share/cataclysm-dda/json/mapgen/trail_small.json
 share/cataclysm-dda/json/mapgen/trailer_park.json
@@ -534,53 +1027,158 @@ share/cataclysm-dda/json/mapgen/triffid_
 share/cataclysm-dda/json/mapgen/veterinarian.json
 share/cataclysm-dda/json/mapgen/vfw.json
 share/cataclysm-dda/json/mapgen/warehouse.json
+share/cataclysm-dda/json/mapgen/ws_biker_dump.json
+share/cataclysm-dda/json/mapgen/ws_fire_lookout_tower.json
+share/cataclysm-dda/json/mapgen/ws_giant_sinkhole.json
+share/cataclysm-dda/json/mapgen/ws_regional_dump.json
+share/cataclysm-dda/json/mapgen/ws_survivor_bunker.json
+share/cataclysm-dda/json/mapgen/ws_survivor_camp.json
 share/cataclysm-dda/json/mapgen/zoo.json
+share/cataclysm-dda/json/mapgen_palettes/abandoned_barn_p.json
 share/cataclysm-dda/json/mapgen_palettes/acidia_camp_palette.json
+share/cataclysm-dda/json/mapgen_palettes/airliner_palette.json
+share/cataclysm-dda/json/mapgen_palettes/apartment.json
+share/cataclysm-dda/json/mapgen_palettes/bandit_camp.json
 share/cataclysm-dda/json/mapgen_palettes/basement.json
+share/cataclysm-dda/json/mapgen_palettes/bike_shop_palette.json
+share/cataclysm-dda/json/mapgen_palettes/building.json
+share/cataclysm-dda/json/mapgen_palettes/cabin.json
+share/cataclysm-dda/json/mapgen_palettes/campground.json
+share/cataclysm-dda/json/mapgen_palettes/campus/common.json
+share/cataclysm-dda/json/mapgen_palettes/cground.json
 share/cataclysm-dda/json/mapgen_palettes/church.json
-share/cataclysm-dda/json/mapgen_palettes/evac_center.json
+share/cataclysm-dda/json/mapgen_palettes/city_block_palette.json
+share/cataclysm-dda/json/mapgen_palettes/clothes_store_palette.json
+share/cataclysm-dda/json/mapgen_palettes/collapsed_tower.json
+share/cataclysm-dda/json/mapgen_palettes/farm.json
+share/cataclysm-dda/json/mapgen_palettes/farm_horse.json
+share/cataclysm-dda/json/mapgen_palettes/farm_lots.json
+share/cataclysm-dda/json/mapgen_palettes/fema.json
+share/cataclysm-dda/json/mapgen_palettes/field_football.json
+share/cataclysm-dda/json/mapgen_palettes/helipad.json
 share/cataclysm-dda/json/mapgen_palettes/hospital.json
-share/cataclysm-dda/json/mapgen_palettes/houses_multistory.json
+share/cataclysm-dda/json/mapgen_palettes/hotel_tower_palette.json
+share/cataclysm-dda/json/mapgen_palettes/house_general_palette.json
+share/cataclysm-dda/json/mapgen_palettes/house_w_palette.json
+share/cataclysm-dda/json/mapgen_palettes/junkyard_palette.json
+share/cataclysm-dda/json/mapgen_palettes/lab_surface_palette.json
+share/cataclysm-dda/json/mapgen_palettes/library_palette.json
+share/cataclysm-dda/json/mapgen_palettes/lmoe.json
 share/cataclysm-dda/json/mapgen_palettes/lumberyard.json
+share/cataclysm-dda/json/mapgen_palettes/mall_palette.json
 share/cataclysm-dda/json/mapgen_palettes/mansion.json
+share/cataclysm-dda/json/mapgen_palettes/mi-go_palette.json
+share/cataclysm-dda/json/mapgen_palettes/microlab.json
 share/cataclysm-dda/json/mapgen_palettes/mil_surplus.json
+share/cataclysm-dda/json/mapgen_palettes/military/mil_base_palette.json
+share/cataclysm-dda/json/mapgen_palettes/military/mil_base_roof_palette.json
+share/cataclysm-dda/json/mapgen_palettes/miniature_railway_palette.json
+share/cataclysm-dda/json/mapgen_palettes/movie_theater_palette.json
+share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_a.json
+share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_b1.json
+share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_b2.json
+share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_b3.json
+share/cataclysm-dda/json/mapgen_palettes/office.json
 share/cataclysm-dda/json/mapgen_palettes/office_doctor.json
+share/cataclysm-dda/json/mapgen_palettes/park_palette.json
+share/cataclysm-dda/json/mapgen_palettes/prison.json
+share/cataclysm-dda/json/mapgen_palettes/private_resort.json
 share/cataclysm-dda/json/mapgen_palettes/railroad.json
 share/cataclysm-dda/json/mapgen_palettes/ranch_camp.json
+share/cataclysm-dda/json/mapgen_palettes/refugee_center.json
+share/cataclysm-dda/json/mapgen_palettes/regional_dump_palette.json
 share/cataclysm-dda/json/mapgen_palettes/road.json
+share/cataclysm-dda/json/mapgen_palettes/robofachq.json
+share/cataclysm-dda/json/mapgen_palettes/roof_palette.json
+share/cataclysm-dda/json/mapgen_palettes/rural_roads_trails_palette.json
 share/cataclysm-dda/json/mapgen_palettes/shelter.json
+share/cataclysm-dda/json/mapgen_palettes/steel_mill_palette.json
 share/cataclysm-dda/json/mapgen_palettes/subway.json
+share/cataclysm-dda/json/mapgen_palettes/trailer_park.json
 share/cataclysm-dda/json/martialarts.json
+share/cataclysm-dda/json/martialarts_fictional.json
 share/cataclysm-dda/json/materials.json
 share/cataclysm-dda/json/monster_attacks.json
-share/cataclysm-dda/json/monster_drops.json
 share/cataclysm-dda/json/monster_factions.json
+share/cataclysm-dda/json/monster_special_attacks/spells.json
+share/cataclysm-dda/json/monsterdrops/marloss.json
+share/cataclysm-dda/json/monsterdrops/misc.json
+share/cataclysm-dda/json/monsterdrops/mutant_experimental.json
+share/cataclysm-dda/json/monsterdrops/robofac.json
+share/cataclysm-dda/json/monsterdrops/zombie.json
+share/cataclysm-dda/json/monsterdrops/zombie_child.json
 share/cataclysm-dda/json/monsterdrops/zombie_cop.json
+share/cataclysm-dda/json/monsterdrops/zombie_default.json
+share/cataclysm-dda/json/monsterdrops/zombie_lab.json
 share/cataclysm-dda/json/monsterdrops/zombie_military_pilot.json
+share/cataclysm-dda/json/monsterdrops/zombie_prisoner.json
+share/cataclysm-dda/json/monsterdrops/zombie_resort.json
 share/cataclysm-dda/json/monsterdrops/zombie_soldier.json
 share/cataclysm-dda/json/monsterdrops/zombie_survivor.json
 share/cataclysm-dda/json/monsterdrops/zombie_technician.json
-share/cataclysm-dda/json/monstergroups.json
-share/cataclysm-dda/json/monstergroups_egg.json
-share/cataclysm-dda/json/monsters.json
+share/cataclysm-dda/json/monstergroups/blob.json
+share/cataclysm-dda/json/monstergroups/bugs.json
+share/cataclysm-dda/json/monstergroups/eggs.json
+share/cataclysm-dda/json/monstergroups/fish.json
+share/cataclysm-dda/json/monstergroups/fungi.json
+share/cataclysm-dda/json/monstergroups/lab.json
+share/cataclysm-dda/json/monstergroups/mammal.json
+share/cataclysm-dda/json/monstergroups/mi-go.json
+share/cataclysm-dda/json/monstergroups/military.json
+share/cataclysm-dda/json/monstergroups/misc.json
+share/cataclysm-dda/json/monstergroups/missions.json
+share/cataclysm-dda/json/monstergroups/nether.json
+share/cataclysm-dda/json/monstergroups/obsolete.json
+share/cataclysm-dda/json/monstergroups/resort.json
+share/cataclysm-dda/json/monstergroups/robots.json
+share/cataclysm-dda/json/monstergroups/triffid.json
+share/cataclysm-dda/json/monstergroups/wilderness.json
+share/cataclysm-dda/json/monstergroups/zombie_upgrades.json
+share/cataclysm-dda/json/monstergroups/zombies.json
 share/cataclysm-dda/json/monsters/bird.json
+share/cataclysm-dda/json/monsters/cyborgs.json
 share/cataclysm-dda/json/monsters/defense_bot.json
 share/cataclysm-dda/json/monsters/drones.json
 share/cataclysm-dda/json/monsters/fish.json
+share/cataclysm-dda/json/monsters/fungus.json
 share/cataclysm-dda/json/monsters/insect_spider.json
+share/cataclysm-dda/json/monsters/jabberwock.json
 share/cataclysm-dda/json/monsters/mammal.json
-share/cataclysm-dda/json/monsters/military.json
+share/cataclysm-dda/json/monsters/marloss.json
+share/cataclysm-dda/json/monsters/mechsuits.json
+share/cataclysm-dda/json/monsters/mi-go.json
+share/cataclysm-dda/json/monsters/misc.json
+share/cataclysm-dda/json/monsters/mutant.json
+share/cataclysm-dda/json/monsters/nether.json
 share/cataclysm-dda/json/monsters/obsolete.json
+share/cataclysm-dda/json/monsters/power_leech.json
 share/cataclysm-dda/json/monsters/reptile_amphibian.json
+share/cataclysm-dda/json/monsters/slimes.json
+share/cataclysm-dda/json/monsters/slugs.json
 share/cataclysm-dda/json/monsters/triffid.json
+share/cataclysm-dda/json/monsters/turrets.json
+share/cataclysm-dda/json/monsters/utility_bot.json
+share/cataclysm-dda/json/monsters/zed-animal.json
+share/cataclysm-dda/json/monsters/zed-classic.json
+share/cataclysm-dda/json/monsters/zed_acid.json
+share/cataclysm-dda/json/monsters/zed_burned.json
 share/cataclysm-dda/json/monsters/zed_children.json
+share/cataclysm-dda/json/monsters/zed_electric.json
 share/cataclysm-dda/json/monsters/zed_explosive.json
+share/cataclysm-dda/json/monsters/zed_fusion.json
+share/cataclysm-dda/json/monsters/zed_lab.json
+share/cataclysm-dda/json/monsters/zed_misc.json
+share/cataclysm-dda/json/monsters/zed_prisoner.json
+share/cataclysm-dda/json/monsters/zed_radiation.json
+share/cataclysm-dda/json/monsters/zed_skeletal.json
+share/cataclysm-dda/json/monsters/zed_soldiers.json
+share/cataclysm-dda/json/monsters/zed_survivor.json
 share/cataclysm-dda/json/morale_types.json
-share/cataclysm-dda/json/music.json
-share/cataclysm-dda/json/mutation_category.json
-share/cataclysm-dda/json/mutation_ordering.json
-share/cataclysm-dda/json/mutation_type.json
-share/cataclysm-dda/json/mutations.json
+share/cataclysm-dda/json/mutations/mutation_appearance.json
+share/cataclysm-dda/json/mutations/mutation_category.json
+share/cataclysm-dda/json/mutations/mutation_ordering.json
+share/cataclysm-dda/json/mutations/mutation_type.json
+share/cataclysm-dda/json/mutations/mutations.json
 share/cataclysm-dda/json/npcs/BG_trait_groups.json
 share/cataclysm-dda/json/npcs/BG_traits.json
 share/cataclysm-dda/json/npcs/Backgrounds/backgrounds_table_of_contents.json
@@ -592,6 +1190,7 @@ share/cataclysm-dda/json/npcs/Background
 share/cataclysm-dda/json/npcs/Backgrounds/cop_3.json
 share/cataclysm-dda/json/npcs/Backgrounds/criminal_1.json
 share/cataclysm-dda/json/npcs/Backgrounds/criminal_2.json
+share/cataclysm-dda/json/npcs/Backgrounds/cyborg_1.json
 share/cataclysm-dda/json/npcs/Backgrounds/dreamer.json
 share/cataclysm-dda/json/npcs/Backgrounds/evacuee_1.json
 share/cataclysm-dda/json/npcs/Backgrounds/evacuee_2.json
@@ -640,93 +1239,253 @@ share/cataclysm-dda/json/npcs/Background
 share/cataclysm-dda/json/npcs/NC_ARSONIST.json
 share/cataclysm-dda/json/npcs/NC_BARTENDER.json
 share/cataclysm-dda/json/npcs/NC_BOUNTY_HUNTER.json
+share/cataclysm-dda/json/npcs/NC_CITY_COP.json
 share/cataclysm-dda/json/npcs/NC_COWBOY.json
+share/cataclysm-dda/json/npcs/NC_CYBORG.json
 share/cataclysm-dda/json/npcs/NC_DEBUG.json
 share/cataclysm-dda/json/npcs/NC_DOCTOR.json
-share/cataclysm-dda/json/npcs/NC_EVAC_SHOPKEEP.json
 share/cataclysm-dda/json/npcs/NC_HACKER.json
 share/cataclysm-dda/json/npcs/NC_HUNTER.json
 share/cataclysm-dda/json/npcs/NC_JUNK_SHOPKEEP.json
+share/cataclysm-dda/json/npcs/NC_MARLOSS_VOICE.json
 share/cataclysm-dda/json/npcs/NC_NINJA.json
 share/cataclysm-dda/json/npcs/NC_SCAVENGER.json
 share/cataclysm-dda/json/npcs/NC_SCIENTIST.json
 share/cataclysm-dda/json/npcs/NC_SOLDIER.json
+share/cataclysm-dda/json/npcs/NC_SURVIVOR_CHEF.json
 share/cataclysm-dda/json/npcs/NC_THUG.json
 share/cataclysm-dda/json/npcs/NC_TRADER.json
-share/cataclysm-dda/json/npcs/TALK_ARSONIST.json
+share/cataclysm-dda/json/npcs/NC_TRUE_FOODPERSON.json
+share/cataclysm-dda/json/npcs/NPC_Brigitte_LaCroix.json
+share/cataclysm-dda/json/npcs/TALK_ALLY_TUTORIAL.json
+share/cataclysm-dda/json/npcs/TALK_CITY_COP.json
 share/cataclysm-dda/json/npcs/TALK_COMMON_ALLY.json
 share/cataclysm-dda/json/npcs/TALK_COMMON_GREET.json
 share/cataclysm-dda/json/npcs/TALK_COMMON_MISSION.json
 share/cataclysm-dda/json/npcs/TALK_COMMON_OTHER.json
-share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD1.json
-share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD2.json
-share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD3.json
-share/cataclysm-dda/json/npcs/TALK_EVAC_HUNTER.json
-share/cataclysm-dda/json/npcs/TALK_EVAC_MERCHANT.json
+share/cataclysm-dda/json/npcs/TALK_CYBORG_1.json
 share/cataclysm-dda/json/npcs/TALK_FACTION_CAMP.json
-share/cataclysm-dda/json/npcs/TALK_FREE_MERCHANT.json
 share/cataclysm-dda/json/npcs/TALK_FRIEND_CONVERSATION.json
-share/cataclysm-dda/json/npcs/TALK_GUARD.json
-share/cataclysm-dda/json/npcs/TALK_OLD_GUARD_NECROPOLIS.json
-share/cataclysm-dda/json/npcs/TALK_OLD_GUARD_REP.json
-share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_1.json
-share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_2.json
-share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_3.json
-share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_4.json
-share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_5.json
-share/cataclysm-dda/json/npcs/TALK_REFUGE_RANCH.json
-share/cataclysm-dda/json/npcs/TALK_SCAVENGER_MERC.json
-share/cataclysm-dda/json/npcs/TALK_SCIENCE_REP.json
+share/cataclysm-dda/json/npcs/TALK_MARLOSS_VOICE.json
+share/cataclysm-dda/json/npcs/TALK_SURVIVOR_CHEF.json
 share/cataclysm-dda/json/npcs/TALK_TEST.json
+share/cataclysm-dda/json/npcs/TALK_TRUE_FOODPERSON.json
+share/cataclysm-dda/json/npcs/appearance_trait_groups.json
 share/cataclysm-dda/json/npcs/classes.json
-share/cataclysm-dda/json/npcs/classes_uncommon.json
 share/cataclysm-dda/json/npcs/destination_locations.json
-share/cataclysm-dda/json/npcs/epilogues.json
 share/cataclysm-dda/json/npcs/expertise_traits.json
 share/cataclysm-dda/json/npcs/factions.json
+share/cataclysm-dda/json/npcs/godco/cook.json
+share/cataclysm-dda/json/npcs/godco/foodguard.json
 share/cataclysm-dda/json/npcs/hints.json
+share/cataclysm-dda/json/npcs/holdouts/Mr_Lapin.json
+share/cataclysm-dda/json/npcs/holdouts/rural.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
 share/cataclysm-dda/json/npcs/items_generic.json
 share/cataclysm-dda/json/npcs/missiondef.json
+share/cataclysm-dda/json/npcs/necropolis/NPC_Old_Guard_Captain.json
+share/cataclysm-dda/json/npcs/necropolis/NPC_Old_Guard_Commo.json
+share/cataclysm-dda/json/npcs/necropolis/NPC_Old_Guard_Soldier.json
 share/cataclysm-dda/json/npcs/npc.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Aleesha_Seward.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Boris_Borichenko.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Dana_Nunez.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Jenny_Forcette.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Pablo_Nunez.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Stan_Borichenko.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Vanessa_Toby.json
+share/cataclysm-dda/json/npcs/npc_behavior.json
+share/cataclysm-dda/json/npcs/prisoners/mi-go_prisoners.json
+share/cataclysm-dda/json/npcs/refugee_center/beggars/BEGGAR_1_Reena_Sandhu.json
+share/cataclysm-dda/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json
+share/cataclysm-dda/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json
+share/cataclysm-dda/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json
+share/cataclysm-dda/json/npcs/refugee_center/beggars/BEGGAR_5_Yusuke_Taylor.json
+share/cataclysm-dda/json/npcs/refugee_center/missiondef_free_merchants.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Aleesha_Seward.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Guneet_Singh.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_John_Clemens.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Stan_Borichenko.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard2.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard3.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard_generic.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_hostile_guard.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_visitors/NPC_hunter.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json
+share/cataclysm-dda/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json
+share/cataclysm-dda/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json
+share/cataclysm-dda/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json
+share/cataclysm-dda/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json
+share/cataclysm-dda/json/npcs/robofac/NPC_Ulysses_Rourke.json
+share/cataclysm-dda/json/npcs/robofac/NPC_robofac_generic_security.json
+share/cataclysm-dda/json/npcs/robofac/ROBOFAC_SURFACE_FREEMERCHANT.json
 share/cataclysm-dda/json/npcs/starting_traits.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_barber.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_bartender.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_carpenter1.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_carpenter2.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_crop_overseer.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_doctor.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_farmer1.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_farmer2.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_guard.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_nurse.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_scrapper.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_sickly_laborer.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_woodcutter2.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json
 share/cataclysm-dda/json/npcs/talk_tags.json
-share/cataclysm-dda/json/overmap/multitile_buildings_terrain.json
+share/cataclysm-dda/json/obsolete.json
+share/cataclysm-dda/json/obsolete_terrains.json
+share/cataclysm-dda/json/obsoletion/charge_removal.json
+share/cataclysm-dda/json/overmap/map_extras.json
 share/cataclysm-dda/json/overmap/multitile_city_buildings.json
+share/cataclysm-dda/json/overmap/overmap_connections.json
 share/cataclysm-dda/json/overmap/overmap_land_use_codes.json
+share/cataclysm-dda/json/overmap/overmap_special/campus.json
+share/cataclysm-dda/json/overmap/overmap_special/specials.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_abstract.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_agricultural.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_campus.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_cemetery.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_commercial.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_evac_center.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_faction_base.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_fungal.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_industrial.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_lab.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_mall.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_mansion.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_mi-go.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_microlab.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_military.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_necropolis.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_private_resort.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_ranch_camp.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_recreational.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_residential.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_river.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_robofachq.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_transportation.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_waterbody.json
 share/cataclysm-dda/json/overmap/special_locations.json
-share/cataclysm-dda/json/overmap/specials.json
-share/cataclysm-dda/json/overmap_connections.json
-share/cataclysm-dda/json/overmap_terrain.json
-share/cataclysm-dda/json/overmap_terrain_abstract.json
 share/cataclysm-dda/json/player_activities.json
 share/cataclysm-dda/json/professions.json
+share/cataclysm-dda/json/recipes/ammo/40x46mm.json
+share/cataclysm-dda/json/recipes/ammo/40x53mm.json
 share/cataclysm-dda/json/recipes/ammo/components.json
-share/cataclysm-dda/json/recipes/ammo/grenades.json
 share/cataclysm-dda/json/recipes/ammo/pistol.json
 share/cataclysm-dda/json/recipes/ammo/rifle.json
 share/cataclysm-dda/json/recipes/ammo/shot.json
+share/cataclysm-dda/json/recipes/ammo/weldgas.json
 share/cataclysm-dda/json/recipes/armor/arms.json
 share/cataclysm-dda/json/recipes/armor/feet.json
 share/cataclysm-dda/json/recipes/armor/hands.json
 share/cataclysm-dda/json/recipes/armor/head.json
 share/cataclysm-dda/json/recipes/armor/legs.json
 share/cataclysm-dda/json/recipes/armor/other.json
+share/cataclysm-dda/json/recipes/armor/pets_dog.json
+share/cataclysm-dda/json/recipes/armor/pets_horse.json
 share/cataclysm-dda/json/recipes/armor/storage.json
 share/cataclysm-dda/json/recipes/armor/suit.json
 share/cataclysm-dda/json/recipes/armor/torso.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_groups.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_defenses.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_tent.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_firestation1.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_stone.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_standard.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_primitive_field.json
 share/cataclysm-dda/json/recipes/chem/fuel.json
+share/cataclysm-dda/json/recipes/chem/mutagens.json
 share/cataclysm-dda/json/recipes/chem/other.json
 share/cataclysm-dda/json/recipes/electronics/parts.json
 share/cataclysm-dda/json/recipes/electronics/toolmod.json
-share/cataclysm-dda/json/recipes/engines.json
 share/cataclysm-dda/json/recipes/food/brewing.json
+share/cataclysm-dda/json/recipes/food/canned.json
+share/cataclysm-dda/json/recipes/food/dairy_products.json
 share/cataclysm-dda/json/recipes/food/distill.json
 share/cataclysm-dda/json/recipes/food/dry.json
 share/cataclysm-dda/json/recipes/food/frozen.json
@@ -742,17 +1501,17 @@ share/cataclysm-dda/json/recipes/other/t
 share/cataclysm-dda/json/recipes/other/vehicle.json
 share/cataclysm-dda/json/recipes/recipe_ammo.json
 share/cataclysm-dda/json/recipes/recipe_companion.json
-share/cataclysm-dda/json/recipes/recipe_construction_om.json
 share/cataclysm-dda/json/recipes/recipe_deconstruction.json
 share/cataclysm-dda/json/recipes/recipe_deconstruction_package.json
 share/cataclysm-dda/json/recipes/recipe_electronics.json
 share/cataclysm-dda/json/recipes/recipe_food.json
-share/cataclysm-dda/json/recipes/recipe_groups.json
 share/cataclysm-dda/json/recipes/recipe_medsandchemicals.json
+share/cataclysm-dda/json/recipes/recipe_obsolete.json
 share/cataclysm-dda/json/recipes/recipe_others.json
 share/cataclysm-dda/json/recipes/recipe_vehicle.json
 share/cataclysm-dda/json/recipes/recipe_weapon.json
 share/cataclysm-dda/json/recipes/recipes.json
+share/cataclysm-dda/json/recipes/recipes_holiday.json
 share/cataclysm-dda/json/recipes/weapon/bashing.json
 share/cataclysm-dda/json/recipes/weapon/cutting.json
 share/cataclysm-dda/json/recipes/weapon/explosive.json
@@ -764,38 +1523,95 @@ share/cataclysm-dda/json/regional_map_se
 share/cataclysm-dda/json/requirements/ammo.json
 share/cataclysm-dda/json/requirements/cooking_components.json
 share/cataclysm-dda/json/requirements/cooking_tools.json
+share/cataclysm-dda/json/requirements/explosives.json
 share/cataclysm-dda/json/requirements/materials.json
+share/cataclysm-dda/json/requirements/tailoring.json
 share/cataclysm-dda/json/requirements/toolsets.json
 share/cataclysm-dda/json/requirements/uncraft.json
 share/cataclysm-dda/json/requirements/vehicle.json
 share/cataclysm-dda/json/road_vehicles.json
 share/cataclysm-dda/json/rotatable_symbols.json
-share/cataclysm-dda/json/scenarios/scenarios.json
+share/cataclysm-dda/json/scenarios.json
+share/cataclysm-dda/json/scent_types.json
+share/cataclysm-dda/json/scores.json
+share/cataclysm-dda/json/skillDisplayType.json
 share/cataclysm-dda/json/skills.json
-share/cataclysm-dda/json/snippets.json
+share/cataclysm-dda/json/snippets/dimensional_exploration.json
+share/cataclysm-dda/json/snippets/epilogue_factions.json
+share/cataclysm-dda/json/snippets/epilogue_npc.json
+share/cataclysm-dda/json/snippets/fliers.json
+share/cataclysm-dda/json/snippets/graffiti.json
+share/cataclysm-dda/json/snippets/hazardous_waste_sarcophagus.json
+share/cataclysm-dda/json/snippets/health_msgs.json
+share/cataclysm-dda/json/snippets/lab.json
+share/cataclysm-dda/json/snippets/music.json
+share/cataclysm-dda/json/snippets/newspapers.json
+share/cataclysm-dda/json/snippets/radio.json
+share/cataclysm-dda/json/snippets/schizophrenia.json
+share/cataclysm-dda/json/snippets/snippets.json
+share/cataclysm-dda/json/snippets/survivor_notes.json
 share/cataclysm-dda/json/species.json
 share/cataclysm-dda/json/speech.json
 share/cataclysm-dda/json/start_locations.json
 share/cataclysm-dda/json/techniques.json
-share/cataclysm-dda/json/terrain.json
 share/cataclysm-dda/json/test_regions.json
 share/cataclysm-dda/json/tool_qualities.json
 share/cataclysm-dda/json/traps.json
 share/cataclysm-dda/json/tutorial.json
+share/cataclysm-dda/json/uncraft/ammo/10mm.json
+share/cataclysm-dda/json/uncraft/ammo/22.json
+share/cataclysm-dda/json/uncraft/ammo/223.json
+share/cataclysm-dda/json/uncraft/ammo/270win.json
+share/cataclysm-dda/json/uncraft/ammo/30-06.json
+share/cataclysm-dda/json/uncraft/ammo/300.json
+share/cataclysm-dda/json/uncraft/ammo/300blk.json
+share/cataclysm-dda/json/uncraft/ammo/308.json
+share/cataclysm-dda/json/uncraft/ammo/32.json
+share/cataclysm-dda/json/uncraft/ammo/357mag.json
+share/cataclysm-dda/json/uncraft/ammo/357sig.json
 share/cataclysm-dda/json/uncraft/ammo/38.json
+share/cataclysm-dda/json/uncraft/ammo/380.json
+share/cataclysm-dda/json/uncraft/ammo/38super.json
 share/cataclysm-dda/json/uncraft/ammo/40.json
+share/cataclysm-dda/json/uncraft/ammo/410shot.json
+share/cataclysm-dda/json/uncraft/ammo/44.json
 share/cataclysm-dda/json/uncraft/ammo/45.json
+share/cataclysm-dda/json/uncraft/ammo/454.json
+share/cataclysm-dda/json/uncraft/ammo/4570.json
+share/cataclysm-dda/json/uncraft/ammo/45colt.json
+share/cataclysm-dda/json/uncraft/ammo/460.json
+share/cataclysm-dda/json/uncraft/ammo/46mm.json
+share/cataclysm-dda/json/uncraft/ammo/500.json
+share/cataclysm-dda/json/uncraft/ammo/50bmg.json
+share/cataclysm-dda/json/uncraft/ammo/545.json
+share/cataclysm-dda/json/uncraft/ammo/556.json
+share/cataclysm-dda/json/uncraft/ammo/57mm.json
+share/cataclysm-dda/json/uncraft/ammo/5x50.json
+share/cataclysm-dda/json/uncraft/ammo/700nx.json
 share/cataclysm-dda/json/uncraft/ammo/762x25.json
+share/cataclysm-dda/json/uncraft/ammo/762x39.json
+share/cataclysm-dda/json/uncraft/ammo/762x51.json
+share/cataclysm-dda/json/uncraft/ammo/762x54.json
 share/cataclysm-dda/json/uncraft/ammo/9mm.json
-share/cataclysm-dda/json/uncraft/ammo/flintlock.json
+share/cataclysm-dda/json/uncraft/ammo/9x18mm.json
+share/cataclysm-dda/json/uncraft/ammo/atgm.json
 share/cataclysm-dda/json/uncraft/ammo/shot.json
+share/cataclysm-dda/json/uncraft/armor.json
+share/cataclysm-dda/json/uncraft/armor/pets_dog.json
+share/cataclysm-dda/json/uncraft/armor/storage.json
+share/cataclysm-dda/json/uncraft/armor/suit.json
 share/cataclysm-dda/json/uncraft/cbm/cbm.json
 share/cataclysm-dda/json/uncraft/classes/ammo.json
+share/cataclysm-dda/json/uncraft/food/sourdough.json
 share/cataclysm-dda/json/uncraft/generic.json
+share/cataclysm-dda/json/uncraft/tool/deployable.json
+share/cataclysm-dda/json/uncraft/tools.json
 share/cataclysm-dda/json/uncraft/vehicle/alternator.json
+share/cataclysm-dda/json/uncraft/vehicle/engines.json
+share/cataclysm-dda/json/uncraft/vehicle/noise.json
 share/cataclysm-dda/json/uncraft/weapon/explosive.json
+share/cataclysm-dda/json/uncraft/weapon/ranged.json
 share/cataclysm-dda/json/vehicle_groups.json
-share/cataclysm-dda/json/vehicle_parts.json
 share/cataclysm-dda/json/vehicleparts/alternator.json
 share/cataclysm-dda/json/vehicleparts/armor.json
 share/cataclysm-dda/json/vehicleparts/battery.json
@@ -811,9 +1627,11 @@ share/cataclysm-dda/json/vehicleparts/mo
 share/cataclysm-dda/json/vehicleparts/rams.json
 share/cataclysm-dda/json/vehicleparts/tanks.json
 share/cataclysm-dda/json/vehicleparts/turret.json
+share/cataclysm-dda/json/vehicleparts/vehicle_parts.json
 share/cataclysm-dda/json/vehicleparts/vp_flags.json
 share/cataclysm-dda/json/vehicleparts/wheel.json
 share/cataclysm-dda/json/vehicles/bikes.json
+share/cataclysm-dda/json/vehicles/boats.json
 share/cataclysm-dda/json/vehicles/cars.json
 share/cataclysm-dda/json/vehicles/carts.json
 share/cataclysm-dda/json/vehicles/custom_vehicles.json
@@ -828,54 +1646,116 @@ share/cataclysm-dda/json/vehicles/utilit
 share/cataclysm-dda/json/vehicles/vans_busses.json
 share/cataclysm-dda/json/vehicles/vehicles.json
 share/cataclysm-dda/json/vitamin.json
-share/cataclysm-dda/lua/autoexec.lua
-share/cataclysm-dda/lua/class_definitions.lua
-share/cataclysm-dda/lua/log.lua
-share/cataclysm-dda/mods/Animatronics/animatronics.json
-share/cataclysm-dda/mods/Animatronics/bankrupt_pizzeria.json
-share/cataclysm-dda/mods/Animatronics/dead_animatronics.json
-share/cataclysm-dda/mods/Animatronics/modinfo.json
-share/cataclysm-dda/mods/Animatronics/regional_overlay.json
-share/cataclysm-dda/mods/Animatronics/snippets.json
-share/cataclysm-dda/mods/Animatronics/speech.json
-share/cataclysm-dda/mods/Boats/b_item_groups.json
-share/cataclysm-dda/mods/Boats/b_items.json
-share/cataclysm-dda/mods/Boats/b_recipes.json
-share/cataclysm-dda/mods/Boats/items_vehicleparts_boats.json
-share/cataclysm-dda/mods/Boats/modinfo.json
-share/cataclysm-dda/mods/Boats/overmap_terrain.json
-share/cataclysm-dda/mods/Boats/specials.json
-share/cataclysm-dda/mods/Boats/vehicle_groups_boats.json
-share/cataclysm-dda/mods/Boats/vehicleparts_boats.json
-share/cataclysm-dda/mods/Boats/vehicles_boats.json
-share/cataclysm-dda/mods/Boats/whaleys_boat_rental.json
-share/cataclysm-dda/mods/Boats/whaleys_boats.json
-share/cataclysm-dda/mods/Boats/whaleys_house_river.json
-share/cataclysm-dda/mods/BrightNights/bionics.json
-share/cataclysm-dda/mods/BrightNights/effects.json
-share/cataclysm-dda/mods/BrightNights/game_balance.json
-share/cataclysm-dda/mods/BrightNights/gun.json
-share/cataclysm-dda/mods/BrightNights/item groups/locations.json
-share/cataclysm-dda/mods/BrightNights/item_groups.json
-share/cataclysm-dda/mods/BrightNights/items/bionics.json
-share/cataclysm-dda/mods/BrightNights/items/books.json
-share/cataclysm-dda/mods/BrightNights/items/generic.json
-share/cataclysm-dda/mods/BrightNights/items/med.json
-share/cataclysm-dda/mods/BrightNights/mapgen/map_palletes.json
-share/cataclysm-dda/mods/BrightNights/mapgen/municipal_microreactor.json
-share/cataclysm-dda/mods/BrightNights/mapgen/s_gas.json
-share/cataclysm-dda/mods/BrightNights/misc.json
-share/cataclysm-dda/mods/BrightNights/modinfo.json
-share/cataclysm-dda/mods/BrightNights/overmap_specials.json
-share/cataclysm-dda/mods/BrightNights/overmap_terrain.json
-share/cataclysm-dda/mods/BrightNights/recipe.json
-share/cataclysm-dda/mods/BrightNights/regional_map_settings.json
-share/cataclysm-dda/mods/BrightNights/terrain.json
-share/cataclysm-dda/mods/BrightNights/vehicle_groups.json
-share/cataclysm-dda/mods/BrightNights/vehicle_parts.json
-share/cataclysm-dda/mods/BrightNights/vehicles/cars.json
-share/cataclysm-dda/mods/Craft_Gunpowder/cgp_magazine.json
-share/cataclysm-dda/mods/Craft_Gunpowder/cgp_ranged.json
+share/cataclysm-dda/mods/Aftershock/README.md
+share/cataclysm-dda/mods/Aftershock/items/afs_harvest.json
+share/cataclysm-dda/mods/Aftershock/items/ammo.json
+share/cataclysm-dda/mods/Aftershock/items/ammo_type.json
+share/cataclysm-dda/mods/Aftershock/items/armor.json
+share/cataclysm-dda/mods/Aftershock/items/bioparts.json
+share/cataclysm-dda/mods/Aftershock/items/books.json
+share/cataclysm-dda/mods/Aftershock/items/cast_spell_items.json
+share/cataclysm-dda/mods/Aftershock/items/cbms.json
+share/cataclysm-dda/mods/Aftershock/items/comestibles.json
+share/cataclysm-dda/mods/Aftershock/items/corpses.json
+share/cataclysm-dda/mods/Aftershock/items/furniture.json
+share/cataclysm-dda/mods/Aftershock/items/gun/5x50.json
+share/cataclysm-dda/mods/Aftershock/items/gun/laser.json
+share/cataclysm-dda/mods/Aftershock/items/inactiverobot.json
+share/cataclysm-dda/mods/Aftershock/items/item_groups.json
+share/cataclysm-dda/mods/Aftershock/items/item_overrides.json
+share/cataclysm-dda/mods/Aftershock/items/items.json
+share/cataclysm-dda/mods/Aftershock/items/materials.json
+share/cataclysm-dda/mods/Aftershock/items/monster_drops.json
+share/cataclysm-dda/mods/Aftershock/items/monsterdrops.json
+share/cataclysm-dda/mods/Aftershock/items/obsolete.json
+share/cataclysm-dda/mods/Aftershock/items/robotparts.json
+share/cataclysm-dda/mods/Aftershock/items/tool_quality.json
+share/cataclysm-dda/mods/Aftershock/items/tools.json
+share/cataclysm-dda/mods/Aftershock/items/weapons.json
+share/cataclysm-dda/mods/Aftershock/maps/furniture.json
+share/cataclysm-dda/mods/Aftershock/maps/item_groups.json
+share/cataclysm-dda/mods/Aftershock/maps/lab_vehicle_track.json
+share/cataclysm-dda/mods/Aftershock/maps/lab_weapons_range.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/fungal_siege.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/map_palletes.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/municipal_microreactor.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/prepnet_orchard.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/s_gas.json
+share/cataclysm-dda/mods/Aftershock/maps/overmap_specials.json
+share/cataclysm-dda/mods/Aftershock/maps/overmap_terrain.json
+share/cataclysm-dda/mods/Aftershock/maps/regional_map_settings.json
+share/cataclysm-dda/mods/Aftershock/maps/terrain.json
+share/cataclysm-dda/mods/Aftershock/martialarts.json
+share/cataclysm-dda/mods/Aftershock/mobs/PrepPhyle_mobs.json
+share/cataclysm-dda/mods/Aftershock/mobs/harvest.json
+share/cataclysm-dda/mods/Aftershock/mobs/monster_faction.json
+share/cataclysm-dda/mods/Aftershock/mobs/monster_groups.json
+share/cataclysm-dda/mods/Aftershock/mobs/robots.json
+share/cataclysm-dda/mods/Aftershock/mobs/zombies.json
+share/cataclysm-dda/mods/Aftershock/modinfo.json
+share/cataclysm-dda/mods/Aftershock/mutations/mutations.json
+share/cataclysm-dda/mods/Aftershock/npcs/classes.json
+share/cataclysm-dda/mods/Aftershock/npcs/factions.json
+share/cataclysm-dda/mods/Aftershock/npcs/npc.json
+share/cataclysm-dda/mods/Aftershock/npcs/prepnet_dialogue.json
+share/cataclysm-dda/mods/Aftershock/npcs/prepnet_phyle/prepnet_trade.json
+share/cataclysm-dda/mods/Aftershock/player/bionics.json
+share/cataclysm-dda/mods/Aftershock/player/mutations.json
+share/cataclysm-dda/mods/Aftershock/player/obsolete.json
+share/cataclysm-dda/mods/Aftershock/player/professions.json
+share/cataclysm-dda/mods/Aftershock/player/techniques.json
+share/cataclysm-dda/mods/Aftershock/recipes/armor_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/bionic_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/comestible_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/construction.json
+share/cataclysm-dda/mods/Aftershock/recipes/deconstruction.json
+share/cataclysm-dda/mods/Aftershock/recipes/obsolete.json
+share/cataclysm-dda/mods/Aftershock/recipes/recipe_overrides.json
+share/cataclysm-dda/mods/Aftershock/recipes/recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/requirements.json
+share/cataclysm-dda/mods/Aftershock/recipes/uncraft.json
+share/cataclysm-dda/mods/Aftershock/scenarios.json
+share/cataclysm-dda/mods/Aftershock/speech.json
+share/cataclysm-dda/mods/Aftershock/spells/hologram_spells.json
+share/cataclysm-dda/mods/Aftershock/vehicles/part_items.json
+share/cataclysm-dda/mods/Aftershock/vehicles/vehicle_groups.json
+share/cataclysm-dda/mods/Aftershock/vehicles/vehicle_overrides.json
+share/cataclysm-dda/mods/Aftershock/vehicles/vehicle_parts.json
+share/cataclysm-dda/mods/Aftershock/vehicles/vehicles.json
+share/cataclysm-dda/mods/CRT_EXPANSION/constructions/crt_constructions.json
+share/cataclysm-dda/mods/CRT_EXPANSION/constructions/crt_terrain.json
+share/cataclysm-dda/mods/CRT_EXPANSION/crt_materials.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_ammo.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_ammotypes.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_armor.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_clothes.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_generic.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_gun.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_gunmods.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_item_groups.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_recipes.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_toolarmor.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_tools.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/CRT_Bladework.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/crt_gun_techniques.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/dragonslayertechn.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/generaltechn.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/stabtechn.json
+share/cataclysm-dda/mods/CRT_EXPANSION/modinfo.json
+share/cataclysm-dda/mods/CRT_EXPANSION/monsters/crt_monster.json
+share/cataclysm-dda/mods/CRT_EXPANSION/monsters/crt_monstergroups.json
+share/cataclysm-dda/mods/CRT_EXPANSION/monsters/monster.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_mut_itemgroups.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_mutatinoc.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_vamp_mutations.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_wendigo_mutations.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/vamp_mut_cat.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/wendigo_mut_cat.json
+share/cataclysm-dda/mods/CRT_EXPANSION/readme/README.md
+share/cataclysm-dda/mods/CRT_EXPANSION/scenarios/crt_classes.json
+share/cataclysm-dda/mods/CRT_EXPANSION/scenarios/crt_scenarios.json
 share/cataclysm-dda/mods/Craft_Gunpowder/cgp_recipes.json
 share/cataclysm-dda/mods/Craft_Gunpowder/modinfo.json
 share/cataclysm-dda/mods/CrazyCataclysm/crazy_aperturepotato.json
@@ -884,17 +1764,10 @@ share/cataclysm-dda/mods/CrazyCataclysm/
 share/cataclysm-dda/mods/CrazyCataclysm/crazy_items.json
 share/cataclysm-dda/mods/CrazyCataclysm/crazy_monstergroups.json
 share/cataclysm-dda/mods/CrazyCataclysm/crazy_monsters.json
+share/cataclysm-dda/mods/CrazyCataclysm/crazy_recipes.json
 share/cataclysm-dda/mods/CrazyCataclysm/crazy_speech.json
+share/cataclysm-dda/mods/CrazyCataclysm/crazy_vehicles.json
 share/cataclysm-dda/mods/CrazyCataclysm/modinfo.json
-share/cataclysm-dda/mods/DeadPeople_Chesthole/Chest_Items.png
-share/cataclysm-dda/mods/DeadPeople_Chesthole/mod_tileset.json
-share/cataclysm-dda/mods/DeadPeople_Chesthole/modinfo.json
-share/cataclysm-dda/mods/DeadPeople_Hybrid/Hybrid_Items.png
-share/cataclysm-dda/mods/DeadPeople_Hybrid/mod_tileset.json
-share/cataclysm-dda/mods/DeadPeople_Hybrid/modinfo.json
-share/cataclysm-dda/mods/DeadPeople_Xotto/Xotto_Items.png
-share/cataclysm-dda/mods/DeadPeople_Xotto/mod_tileset.json
-share/cataclysm-dda/mods/DeadPeople_Xotto/modinfo.json
 share/cataclysm-dda/mods/DeoxyMod/Deoxy_vehicle_parts.json
 share/cataclysm-dda/mods/DeoxyMod/modinfo.json
 share/cataclysm-dda/mods/DinoMod/dinosaur.json
@@ -914,8 +1787,6 @@ share/cataclysm-dda/mods/EW_Pack/ew_reci
 share/cataclysm-dda/mods/EW_Pack/ew_weapons.json
 share/cataclysm-dda/mods/EW_Pack/modinfo.json
 share/cataclysm-dda/mods/EW_Pack/obsolete.json
-share/cataclysm-dda/mods/Fast_Zombies/main.lua
-share/cataclysm-dda/mods/Fast_Zombies/modinfo.json
 share/cataclysm-dda/mods/FictonalWeapons/fic_item_groups.json
 share/cataclysm-dda/mods/FictonalWeapons/fic_mods.json
 share/cataclysm-dda/mods/FictonalWeapons/fic_recipes.json
@@ -923,7 +1794,14 @@ share/cataclysm-dda/mods/FictonalWeapons
 share/cataclysm-dda/mods/FictonalWeapons/ficmags.json
 share/cataclysm-dda/mods/FictonalWeapons/modinfo.json
 share/cataclysm-dda/mods/FictonalWeapons/snippets.json
-share/cataclysm-dda/mods/Filthy_Morale/modinfo.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/modinfo.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/npc/NC_ARMY.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/npc/NC_OPS.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/npc/classes.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/prof/army.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/prof/itemgroups_prof.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/prof/spc.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/scenarios.json
 share/cataclysm-dda/mods/Fuji_Structures/items/itemgroups.json
 share/cataclysm-dda/mods/Fuji_Structures/items/items_games.json
 share/cataclysm-dda/mods/Fuji_Structures/items/vehicle_groups.json
@@ -955,74 +1833,285 @@ share/cataclysm-dda/mods/Fuji_Structures
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_g0.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_g1.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/_house_template.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_1.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_10.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_2.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_3.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_4.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_5.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_6.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_7.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_8.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_9.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house33.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house34.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house35.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house36.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house37.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house38.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house39.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house40.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house41.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house42.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_00.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_01.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_10.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_11.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_road_0.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_road_1.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/overmap_multitile_city.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/overmap_specials.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/overmap_terrain.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/palette_electronic.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/regional_overlay.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_apt.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_apt_2.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_camping.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_cardealer.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_diner.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_electronicstore.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_games.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_gunstore.json
-share/cataclysm-dda/mods/Generic_Guns/gg_ammo_blacklist.json
-share/cataclysm-dda/mods/Generic_Guns/gg_ammo_hand_override.json
-share/cataclysm-dda/mods/Generic_Guns/gg_ammo_override.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/black_powder.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/casings.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/gg_ammo_migration.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/gg_casings_migration.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/grenade.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/pistol.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/pistol_magnum.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/pistol_tiny.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/rifle.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/rifle_huge.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/rocket.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/shot.json
+share/cataclysm-dda/mods/Generic_Guns/bandoliers/bandolier.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/black_powder.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/gg_firearms_migration.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/grenade.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/pistol.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/pistol_magnum.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/pistol_tiny.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/rifle.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/rifle_huge.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/rocket.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/shot.json
 share/cataclysm-dda/mods/Generic_Guns/gg_ammunition_types.json
-share/cataclysm-dda/mods/Generic_Guns/gg_bandolier_override.json
-share/cataclysm-dda/mods/Generic_Guns/gg_guns.json
-share/cataclysm-dda/mods/Generic_Guns/gg_guns_blacklist.json
-share/cataclysm-dda/mods/Generic_Guns/gg_guns_override.json
-share/cataclysm-dda/mods/Generic_Guns/gg_itemgroups_ammo.json
-share/cataclysm-dda/mods/Generic_Guns/gg_itemgroups_guns.json
-share/cataclysm-dda/mods/Generic_Guns/gg_magazines_blacklist.json
-share/cataclysm-dda/mods/Generic_Guns/gg_magazines_override.json
-share/cataclysm-dda/mods/Generic_Guns/gg_other_blacklist.json
-share/cataclysm-dda/mods/Generic_Guns/gg_vehicle_override.json
+share/cataclysm-dda/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
+share/cataclysm-dda/mods/Generic_Guns/gunmods/gg_gunmods_migration.json
+share/cataclysm-dda/mods/Generic_Guns/gunmods/gunmods.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/gg_magazines_blacklist.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/gg_magazines_migration.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/grenade.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/pistol.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/pistol_magnum.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/pistol_tiny.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/rifle.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/rifle_huge.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/shot.json
 share/cataclysm-dda/mods/Generic_Guns/modinfo.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipe_obsolete.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_deconstruction.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_firearms_repeater.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_firearms_single.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_grenade_propelled.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_pistol.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_rifle.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_shot.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/requirements.json
+share/cataclysm-dda/mods/Generic_Guns/robots/active_bots.json
+share/cataclysm-dda/mods/Generic_Guns/robots/broken_bots.json
+share/cataclysm-dda/mods/Generic_Guns/robots/inactive_bots.json
+share/cataclysm-dda/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json
+share/cataclysm-dda/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json
+share/cataclysm-dda/mods/Generic_Guns/vehicles/turrets.json
+share/cataclysm-dda/mods/Graphical_Overmap/base_colors.json
+share/cataclysm-dda/mods/Graphical_Overmap/fonts.json.txt
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_abstract.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_agricultural.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_campus.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_cemetery.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_commercial.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_evac_center.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_faction_base.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_fungal.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_hardcoded.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_industrial.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_lab.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_mall.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_mansion.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_mi-go.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_microlab.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_military.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_necropolis.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_private_resort.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_public_institutional.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_ranch_camp.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_recreational.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_residential.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_river.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_robofachq.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_test.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_transportation.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_waste_junk.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_waterbody.json
+share/cataclysm-dda/mods/Graphical_Overmap/modinfo.json
+share/cataclysm-dda/mods/Graphical_Overmap/readme.txt
+share/cataclysm-dda/mods/Graphical_Overmap_FujiStruct/modinfo.json
+share/cataclysm-dda/mods/Graphical_Overmap_FujiStruct/overmap_terrain_fujistruct.json
+share/cataclysm-dda/mods/Graphical_Overmap_More_Locations/modinfo.json
+share/cataclysm-dda/mods/Graphical_Overmap_More_Locations/overmap_terrain_more_locations.json
+share/cataclysm-dda/mods/Graphical_Overmap_Urban_Development/modinfo.json
+share/cataclysm-dda/mods/Graphical_Overmap_Urban_Development/overmap_terrain_urban_development.json
 share/cataclysm-dda/mods/Growable_pots/items.json
 share/cataclysm-dda/mods/Growable_pots/modinfo.json
 share/cataclysm-dda/mods/Growable_pots/recipes.json
+share/cataclysm-dda/mods/HeavyMining/modinfo.json
+share/cataclysm-dda/mods/HeavyMining/parts.json
+share/cataclysm-dda/mods/HeavyMining/vehicle_groups.json
+share/cataclysm-dda/mods/HeavyMining/vehicles.json
+share/cataclysm-dda/mods/Hydroponics/construction.json
+share/cataclysm-dda/mods/Hydroponics/furniture.json
+share/cataclysm-dda/mods/Hydroponics/game_balance.json
+share/cataclysm-dda/mods/Hydroponics/item_groups.json
+share/cataclysm-dda/mods/Hydroponics/mapgen/basement_hydrop.json
+share/cataclysm-dda/mods/Hydroponics/mapgen/lab_floorplans_1side.json
+share/cataclysm-dda/mods/Hydroponics/mapgen/lab_rooms.json
+share/cataclysm-dda/mods/Hydroponics/modinfo.json
+share/cataclysm-dda/mods/Hydroponics/requirements.json
+share/cataclysm-dda/mods/Hydroponics/terrain.json
+share/cataclysm-dda/mods/Hydroponics/tpalletes.json
+share/cataclysm-dda/mods/MMA/item_groups.json
+share/cataclysm-dda/mods/MMA/martial.json
+share/cataclysm-dda/mods/MMA/martialarts.json
+share/cataclysm-dda/mods/MMA/modinfo.json
+share/cataclysm-dda/mods/MMA/mutations.json
+share/cataclysm-dda/mods/MMA/professions.json
+share/cataclysm-dda/mods/MMA/techniques.json
+share/cataclysm-dda/mods/Magiclysm/Spells/animist.json
+share/cataclysm-dda/mods/Magiclysm/Spells/biomancer.json
+share/cataclysm-dda/mods/Magiclysm/Spells/classless.json
+share/cataclysm-dda/mods/Magiclysm/Spells/debug.json
+share/cataclysm-dda/mods/Magiclysm/Spells/dragonbreath.json
+share/cataclysm-dda/mods/Magiclysm/Spells/druid.json
+share/cataclysm-dda/mods/Magiclysm/Spells/earthshaper.json
+share/cataclysm-dda/mods/Magiclysm/Spells/item_only.json
+share/cataclysm-dda/mods/Magiclysm/Spells/kelvinist.json
+share/cataclysm-dda/mods/Magiclysm/Spells/lizardfolk_shaman.json
+share/cataclysm-dda/mods/Magiclysm/Spells/magus.json
+share/cataclysm-dda/mods/Magiclysm/Spells/monsterspells.json
+share/cataclysm-dda/mods/Magiclysm/Spells/stormshaper.json
+share/cataclysm-dda/mods/Magiclysm/Spells/technomancer.json
+share/cataclysm-dda/mods/Magiclysm/bionics.json
+share/cataclysm-dda/mods/Magiclysm/cooking_components.json
+share/cataclysm-dda/mods/Magiclysm/effects/effects.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_belts.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_boots.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_bracers.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_gunmods.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_masks.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_melee.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_misc.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_ranged.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_rings.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_tokens.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_unarmed.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_wands.json
+share/cataclysm-dda/mods/Magiclysm/field.json
+share/cataclysm-dda/mods/Magiclysm/furniture.json
+share/cataclysm-dda/mods/Magiclysm/harvest.json
+share/cataclysm-dda/mods/Magiclysm/itemgroups/itemgroups.json
+share/cataclysm-dda/mods/Magiclysm/itemgroups/recipe_books.json
+share/cataclysm-dda/mods/Magiclysm/itemgroups/spellbooks.json
+share/cataclysm-dda/mods/Magiclysm/items/alchemy_items.json
+share/cataclysm-dda/mods/Magiclysm/items/ammo_types.json
+share/cataclysm-dda/mods/Magiclysm/items/archery.json
+share/cataclysm-dda/mods/Magiclysm/items/armor.json
+share/cataclysm-dda/mods/Magiclysm/items/bionics.json
+share/cataclysm-dda/mods/Magiclysm/items/black_dragon_items.json
+share/cataclysm-dda/mods/Magiclysm/items/cast_spell_items.json
+share/cataclysm-dda/mods/Magiclysm/items/class_runes.json
+share/cataclysm-dda/mods/Magiclysm/items/comestibles.json
+share/cataclysm-dda/mods/Magiclysm/items/constructs.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted.json
+share/cataclysm-dda/mods/Magiclysm/items/ethereal_items.json
+share/cataclysm-dda/mods/Magiclysm/items/fuel.json
+share/cataclysm-dda/mods/Magiclysm/items/mana_crystals.json
+share/cataclysm-dda/mods/Magiclysm/items/melee.json
+share/cataclysm-dda/mods/Magiclysm/items/metals.json
+share/cataclysm-dda/mods/Magiclysm/items/obsolete.json
+share/cataclysm-dda/mods/Magiclysm/items/recipe_books.json
+share/cataclysm-dda/mods/Magiclysm/items/spell_scrolls.json
+share/cataclysm-dda/mods/Magiclysm/items/spellbooks.json
+share/cataclysm-dda/mods/Magiclysm/items/tools.json
+share/cataclysm-dda/mods/Magiclysm/items/vehicle/frames.json
+share/cataclysm-dda/mods/Magiclysm/items/vehicle_parts.json
+share/cataclysm-dda/mods/Magiclysm/items/weapons.json
+share/cataclysm-dda/mods/Magiclysm/lore.md
+share/cataclysm-dda/mods/Magiclysm/magic_balance.md
+share/cataclysm-dda/mods/Magiclysm/martialarts.json
+share/cataclysm-dda/mods/Magiclysm/materials.json
+share/cataclysm-dda/mods/Magiclysm/modinfo.json
+share/cataclysm-dda/mods/Magiclysm/monster_attacks.json
+share/cataclysm-dda/mods/Magiclysm/monster_factions.json
+share/cataclysm-dda/mods/Magiclysm/monstergroups.json
+share/cataclysm-dda/mods/Magiclysm/monstergroups_egg.json
+share/cataclysm-dda/mods/Magiclysm/monsters.json
+share/cataclysm-dda/mods/Magiclysm/monsters/demon_spider.json
+share/cataclysm-dda/mods/Magiclysm/monsters/dragon.json
+share/cataclysm-dda/mods/Magiclysm/monsters/golems.json
+share/cataclysm-dda/mods/Magiclysm/monsters/lizardfolk.json
+share/cataclysm-dda/mods/Magiclysm/monsters/monsters.json
+share/cataclysm-dda/mods/Magiclysm/npc/TALK_HEALER_GREY.json
+share/cataclysm-dda/mods/Magiclysm/npc/TALK_OLD_MAGUS.json
+share/cataclysm-dda/mods/Magiclysm/npc/TALK_TECHNO_KID.json
+share/cataclysm-dda/mods/Magiclysm/npc/classes.json
+share/cataclysm-dda/mods/Magiclysm/npc/factions.json
+share/cataclysm-dda/mods/Magiclysm/npc/items_worn.json
+share/cataclysm-dda/mods/Magiclysm/npc/missiondef.json
+share/cataclysm-dda/mods/Magiclysm/npc/npc.json
+share/cataclysm-dda/mods/Magiclysm/professions.json
+share/cataclysm-dda/mods/Magiclysm/recipes.json
+share/cataclysm-dda/mods/Magiclysm/recipes/alchemy.json
+share/cataclysm-dda/mods/Magiclysm/recipes/construction.json
+share/cataclysm-dda/mods/Magiclysm/recipes/cooking.json
+share/cataclysm-dda/mods/Magiclysm/recipes/deconstruction.json
+share/cataclysm-dda/mods/Magiclysm/recipes/dragon_black.json
+share/cataclysm-dda/mods/Magiclysm/recipes/magic_tools.json
+share/cataclysm-dda/mods/Magiclysm/recipes/mods.json
+share/cataclysm-dda/mods/Magiclysm/recipes/recipe_potions.json
+share/cataclysm-dda/mods/Magiclysm/recipes/weapons.json
+share/cataclysm-dda/mods/Magiclysm/requirements/alchemy.json
+share/cataclysm-dda/mods/Magiclysm/requirements/cooking_components.json
+share/cataclysm-dda/mods/Magiclysm/requirements/metal.json
+share/cataclysm-dda/mods/Magiclysm/scenarios.json
+share/cataclysm-dda/mods/Magiclysm/species.json
+share/cataclysm-dda/mods/Magiclysm/start_locations.json
+share/cataclysm-dda/mods/Magiclysm/ter_fur_transform/ter_fur_transform.json
+share/cataclysm-dda/mods/Magiclysm/terrain.json
+share/cataclysm-dda/mods/Magiclysm/tool_qualities.json
+share/cataclysm-dda/mods/Magiclysm/traits/classes.json
+share/cataclysm-dda/mods/Magiclysm/traits/mutation.json
+share/cataclysm-dda/mods/Magiclysm/vehicle_groups.json
+share/cataclysm-dda/mods/Magiclysm/vehicleparts/frames.json
+share/cataclysm-dda/mods/Magiclysm/vehicleparts/vehicle_parts.json
+share/cataclysm-dda/mods/Magiclysm/vehicles/bikes.json
+share/cataclysm-dda/mods/Magiclysm/vehicles/vans_busses.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/black_dragon_lair.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/demon_spider_lair.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/lake_retreat.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/magic_basement.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/magic_cabin.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/magic_shop.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/multitile_city_buildings.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/overmap_specials.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/overmap_terrain.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/regional_overlay.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/used_bookstore.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/wizard-towers.json
 share/cataclysm-dda/mods/ManualBionicInstall/game_balance.json
 share/cataclysm-dda/mods/ManualBionicInstall/modinfo.json
-share/cataclysm-dda/mods/Medieval_Stuff/ammo.json
 share/cataclysm-dda/mods/Medieval_Stuff/ammo_types.json
-share/cataclysm-dda/mods/Medieval_Stuff/armor.json
 share/cataclysm-dda/mods/Medieval_Stuff/handloaded_bullets.json
 share/cataclysm-dda/mods/Medieval_Stuff/item_groups.json
-share/cataclysm-dda/mods/Medieval_Stuff/martial_arts_manuals.json
-share/cataclysm-dda/mods/Medieval_Stuff/martialarts.json
-share/cataclysm-dda/mods/Medieval_Stuff/materials.json
-share/cataclysm-dda/mods/Medieval_Stuff/melee.json
 share/cataclysm-dda/mods/Medieval_Stuff/modinfo.json
-share/cataclysm-dda/mods/Medieval_Stuff/mutations.json
 share/cataclysm-dda/mods/Medieval_Stuff/professions.json
 share/cataclysm-dda/mods/Medieval_Stuff/ranged.json
 share/cataclysm-dda/mods/Medieval_Stuff/recipe_ammo.json
-share/cataclysm-dda/mods/Medieval_Stuff/recipe_armor.json
-share/cataclysm-dda/mods/Medieval_Stuff/recipe_others.json
 share/cataclysm-dda/mods/Medieval_Stuff/recipe_shields.json
-share/cataclysm-dda/mods/Medieval_Stuff/recipe_weapons.json
-share/cataclysm-dda/mods/Medieval_Stuff/requirements.json
+share/cataclysm-dda/mods/Medieval_Stuff/recipe_weapon.json
 share/cataclysm-dda/mods/Medieval_Stuff/shields.json
-share/cataclysm-dda/mods/Medieval_Stuff/snippets.json
-share/cataclysm-dda/mods/Medieval_Stuff/techniques.json
 share/cataclysm-dda/mods/Medieval_Stuff/tools.json
 share/cataclysm-dda/mods/Modular_Turrets/blacklist.json
 share/cataclysm-dda/mods/Modular_Turrets/corpses.json
@@ -1040,40 +2129,6 @@ share/cataclysm-dda/mods/Modular_Turrets
 share/cataclysm-dda/mods/Modular_Turrets/roboguns.json
 share/cataclysm-dda/mods/Modular_Turrets/uncraft.json
 share/cataclysm-dda/mods/Modular_Turrets/uncraft_corpse.json
-share/cataclysm-dda/mods/More_Buildings/json/baseballfield_a1.json
-share/cataclysm-dda/mods/More_Buildings/json/baseballfield_a2.json
-share/cataclysm-dda/mods/More_Buildings/json/baseballfield_b1.json
-share/cataclysm-dda/mods/More_Buildings/json/baseballfield_b2.json
-share/cataclysm-dda/mods/More_Buildings/json/daycare.json
-share/cataclysm-dda/mods/More_Buildings/json/map_palletes.json
-share/cataclysm-dda/mods/More_Buildings/json/petstore.json
-share/cataclysm-dda/mods/More_Buildings/json/restparking_1.json
-share/cataclysm-dda/mods/More_Buildings/json/restparking_2.json
-share/cataclysm-dda/mods/More_Buildings/json/reststop_1.json
-share/cataclysm-dda/mods/More_Buildings/json/reststop_2.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a1.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a2.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a3.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a4.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a5.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a6.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b1.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b2.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b3.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b4.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b5.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b6.json
-share/cataclysm-dda/mods/More_Buildings/json/storageunits_1.json
-share/cataclysm-dda/mods/More_Buildings/json/storageunits_2.json
-share/cataclysm-dda/mods/More_Buildings/json/storageunits_3.json
-share/cataclysm-dda/mods/More_Buildings/json/storageunits_small_1.json
-share/cataclysm-dda/mods/More_Buildings/json/storageunits_small_2.json
-share/cataclysm-dda/mods/More_Buildings/json/thrift.json
-share/cataclysm-dda/mods/More_Buildings/json/vfw.json
-share/cataclysm-dda/mods/More_Buildings/modinfo.json
-share/cataclysm-dda/mods/More_Buildings/overmap_specials.json
-share/cataclysm-dda/mods/More_Buildings/overmap_terrain.json
-share/cataclysm-dda/mods/More_Buildings/regional_overlay.json
 share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_01.json
 share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_02.json
 share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_03.json
@@ -1365,7 +2420,6 @@ share/cataclysm-dda/mods/More_Locations/
 share/cataclysm-dda/mods/More_Locations/factory/factory_trc_05.json
 share/cataclysm-dda/mods/More_Locations/factory/overmap_specials.json
 share/cataclysm-dda/mods/More_Locations/factory/overmap_terrain.json
-share/cataclysm-dda/mods/More_Locations/furniture.json
 share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_1be_00.json
 share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_1be_01.json
 share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_1blc_00.json
@@ -1862,32 +2916,50 @@ share/cataclysm-dda/mods/More_Locations/
 share/cataclysm-dda/mods/More_Survival_Tools/ammo.json
 share/cataclysm-dda/mods/More_Survival_Tools/ammo_types.json
 share/cataclysm-dda/mods/More_Survival_Tools/armor.json
-share/cataclysm-dda/mods/More_Survival_Tools/construction.json
 share/cataclysm-dda/mods/More_Survival_Tools/effects.json
-share/cataclysm-dda/mods/More_Survival_Tools/furniture.json
 share/cataclysm-dda/mods/More_Survival_Tools/item_groups.json
 share/cataclysm-dda/mods/More_Survival_Tools/items.json
 share/cataclysm-dda/mods/More_Survival_Tools/modinfo.json
+share/cataclysm-dda/mods/More_Survival_Tools/obsolete.json
 share/cataclysm-dda/mods/More_Survival_Tools/professions.json
 share/cataclysm-dda/mods/More_Survival_Tools/recipes.json
 share/cataclysm-dda/mods/More_Survival_Tools/scenarios.json
 share/cataclysm-dda/mods/More_Survival_Tools/snippets.json
 share/cataclysm-dda/mods/More_Survival_Tools/start_locations.json
-share/cataclysm-dda/mods/More_Survival_Tools/terrain.json
 share/cataclysm-dda/mods/More_Survival_Tools/traps.json
 share/cataclysm-dda/mods/Mundane_Zombies/modinfo.json
 share/cataclysm-dda/mods/Mundane_Zombies/z2keep.txt
 share/cataclysm-dda/mods/Mutant_NPCs/modinfo.json
 share/cataclysm-dda/mods/Mutant_NPCs/npc_classes_mutant.json
 share/cataclysm-dda/mods/Mutant_NPCs/trait_groups.json
-share/cataclysm-dda/mods/NPC_Traits/modinfo.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/modinfo.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_comestibles.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_effect.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_field_type.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_harvest.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_item_groups.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_items.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_materials.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_med.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_monster_factions.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_monster_groups.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_monsters.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_mutation_category.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_mutations.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_professions.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_recipe.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_scenarios.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_scent_types.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_snippets.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_species.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_start_locations.json
 share/cataclysm-dda/mods/NW_Pack/modinfo.json
 share/cataclysm-dda/mods/NW_Pack/nw_archery.json
 share/cataclysm-dda/mods/NW_Pack/nw_books.json
 share/cataclysm-dda/mods/NW_Pack/nw_item_groups.json
+share/cataclysm-dda/mods/NW_Pack/nw_martialarts.json
 share/cataclysm-dda/mods/NW_Pack/nw_melee.json
 share/cataclysm-dda/mods/NW_Pack/nw_recipes.json
-share/cataclysm-dda/mods/NW_Pack/nw_tools.json
 share/cataclysm-dda/mods/National_Guard_Camp/furniture.json
 share/cataclysm-dda/mods/National_Guard_Camp/item_groups.json
 share/cataclysm-dda/mods/National_Guard_Camp/military.json
@@ -1897,12 +2969,14 @@ share/cataclysm-dda/mods/National_Guard_
 share/cataclysm-dda/mods/National_Guard_Camp/national_guard_camp/national_guard_camp_b1.json
 share/cataclysm-dda/mods/National_Guard_Camp/overmap_specials.json
 share/cataclysm-dda/mods/National_Guard_Camp/overmap_terrain.json
+share/cataclysm-dda/mods/National_Guard_Camp/palettes/national_guard_camp.json
+share/cataclysm-dda/mods/National_Guard_Camp/palettes/national_guard_camp_b.json
 share/cataclysm-dda/mods/No_Acid_Zombies/modinfo.json
 share/cataclysm-dda/mods/No_Anthills/modinfo.json
 share/cataclysm-dda/mods/No_Beehives/modinfo.json
 share/cataclysm-dda/mods/No_Big_Zombies/modinfo.json
 share/cataclysm-dda/mods/No_Explosive_Zombies/modinfo.json
-share/cataclysm-dda/mods/No_Faults/modinfo.json
+share/cataclysm-dda/mods/No_Filthy_Clothes/modinfo.json
 share/cataclysm-dda/mods/No_Flaming_Weapons/modinfo.json
 share/cataclysm-dda/mods/No_Fungi/comestibles.json
 share/cataclysm-dda/mods/No_Fungi/furniture.json
@@ -1912,14 +2986,14 @@ share/cataclysm-dda/mods/No_Medieval_Ite
 share/cataclysm-dda/mods/No_Mutagen/modinfo.json
 share/cataclysm-dda/mods/No_NPC_Food/modinfo.json
 share/cataclysm-dda/mods/No_Old_guns/modinfo.json
+share/cataclysm-dda/mods/No_Rail_Stations/modinfo.json
+share/cataclysm-dda/mods/No_Rail_Stations/overmap_specials.json
+share/cataclysm-dda/mods/No_Rail_Stations/region_overlay.json
 share/cataclysm-dda/mods/No_Religious_Books/modinfo.json
-share/cataclysm-dda/mods/No_Reviving/main.lua
 share/cataclysm-dda/mods/No_Reviving/modinfo.json
 share/cataclysm-dda/mods/No_Rivtech_Guns/modinfo.json
 share/cataclysm-dda/mods/No_Survivor_Armor/modinfo.json
 share/cataclysm-dda/mods/No_Survivor_Armor/survivor.json
-share/cataclysm-dda/mods/No_Triffids/modinfo.json
-share/cataclysm-dda/mods/No_Zombie_Animals/modinfo.json
 share/cataclysm-dda/mods/Only_Wildlife/modinfo.json
 share/cataclysm-dda/mods/RL_Classes/classes.json
 share/cataclysm-dda/mods/RL_Classes/modinfo.json
@@ -1956,19 +3030,11 @@ share/cataclysm-dda/mods/Salvaged_Robots
 share/cataclysm-dda/mods/Salvaged_Robots/speech.json
 share/cataclysm-dda/mods/Salvaged_Robots/uncraft.json
 share/cataclysm-dda/mods/Salvaged_Robots/uncraft_corpse.json
-share/cataclysm-dda/mods/Sleep_Deprivation/bionics.json
-share/cataclysm-dda/mods/Sleep_Deprivation/effects.json
-share/cataclysm-dda/mods/Sleep_Deprivation/game_balance.json
-share/cataclysm-dda/mods/Sleep_Deprivation/item_actions.json
-share/cataclysm-dda/mods/Sleep_Deprivation/item_groups.json
-share/cataclysm-dda/mods/Sleep_Deprivation/itemgroups/drugs.json
-share/cataclysm-dda/mods/Sleep_Deprivation/items/bionics.json
-share/cataclysm-dda/mods/Sleep_Deprivation/items/comestibles/med.json
 share/cataclysm-dda/mods/Sleep_Deprivation/modinfo.json
-share/cataclysm-dda/mods/Slow_Zombies/main.lua
-share/cataclysm-dda/mods/Slow_Zombies/modinfo.json
-share/cataclysm-dda/mods/StatsThroughSkills/main.lua
 share/cataclysm-dda/mods/StatsThroughSkills/modinfo.json
+share/cataclysm-dda/mods/TEST_DATA/README.md
+share/cataclysm-dda/mods/TEST_DATA/metal.json
+share/cataclysm-dda/mods/TEST_DATA/modinfo.json
 share/cataclysm-dda/mods/Tanks/ammo_types.json
 share/cataclysm-dda/mods/Tanks/item_groups.json
 share/cataclysm-dda/mods/Tanks/items.json
@@ -1984,8 +3050,6 @@ share/cataclysm-dda/mods/Tolerate_This/c
 share/cataclysm-dda/mods/Tolerate_This/cooking_components.json
 share/cataclysm-dda/mods/Tolerate_This/modinfo.json
 share/cataclysm-dda/mods/Tolerate_This/recipe_food.json
-share/cataclysm-dda/mods/Tough_Zombies/main.lua
-share/cataclysm-dda/mods/Tough_Zombies/modinfo.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_10_house_brick_pool.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_11_house_brick.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_12_house.json
@@ -2020,6 +3084,7 @@ share/cataclysm-dda/mods/Urban_Developme
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_39_market_subway_newspaper.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_3_house.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_40_house.json
+share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_41_library.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_4_house_basement.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_5_house.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_6_house.json
@@ -2033,14 +3098,10 @@ share/cataclysm-dda/mods/Urban_Developme
 share/cataclysm-dda/mods/Urban_Development/overmap_specials.json
 share/cataclysm-dda/mods/Urban_Development/overmap_terrain.json
 share/cataclysm-dda/mods/Urban_Development/regional_overlay.json
-share/cataclysm-dda/mods/Z-Level_Buildings/modinfo.json
-share/cataclysm-dda/mods/Zombie_Nightvision/main.lua
 share/cataclysm-dda/mods/Zombie_Nightvision/modinfo.json
 share/cataclysm-dda/mods/alt_map_key/modinfo.json
 share/cataclysm-dda/mods/alt_map_key/overmap_terrain.json
 share/cataclysm-dda/mods/alt_map_key/readme.txt
-share/cataclysm-dda/mods/bio_mod/modinfo.json
-share/cataclysm-dda/mods/blazemod/PAQ.txt
 share/cataclysm-dda/mods/blazemod/blaze_ammo.json
 share/cataclysm-dda/mods/blazemod/blaze_ammo_recipes.json
 share/cataclysm-dda/mods/blazemod/blaze_ammo_types.json
@@ -2063,51 +3124,31 @@ share/cataclysm-dda/mods/blazemod/blaze_
 share/cataclysm-dda/mods/blazemod/blaze_weapons_recipes.json
 share/cataclysm-dda/mods/blazemod/modinfo.json
 share/cataclysm-dda/mods/blazemod/snippets.json
+share/cataclysm-dda/mods/cbm_slots/game_balance.json
+share/cataclysm-dda/mods/cbm_slots/modinfo.json
+share/cataclysm-dda/mods/classic_zombies/exclusions.json
+share/cataclysm-dda/mods/classic_zombies/modinfo.json
 share/cataclysm-dda/mods/dda/modinfo.json
 share/cataclysm-dda/mods/default.json
+share/cataclysm-dda/mods/desert_region/desert_insect_spider.json
+share/cataclysm-dda/mods/desert_region/desert_mammal.json
+share/cataclysm-dda/mods/desert_region/desert_monstergroups.json
+share/cataclysm-dda/mods/desert_region/desert_monsters.json
+share/cataclysm-dda/mods/desert_region/desert_overmap_connections.json
+share/cataclysm-dda/mods/desert_region/desert_overmap_terrain.json
+share/cataclysm-dda/mods/desert_region/desert_regional_map_settings.json
+share/cataclysm-dda/mods/desert_region/desert_reptile_amphibian.json
+share/cataclysm-dda/mods/desert_region/desert_special_locations.json
+share/cataclysm-dda/mods/desert_region/desert_terrain.json
+share/cataclysm-dda/mods/desert_region/modinfo.json
+share/cataclysm-dda/mods/fast_healing/effects.json
+share/cataclysm-dda/mods/fast_healing/meds.json
+share/cataclysm-dda/mods/fast_healing/modinfo.json
+share/cataclysm-dda/mods/fast_healing/recipes.json
 share/cataclysm-dda/mods/makeshift/item.json
 share/cataclysm-dda/mods/makeshift/item_groups.json
 share/cataclysm-dda/mods/makeshift/modinfo.json
 share/cataclysm-dda/mods/makeshift/recipe.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/overmap_specials.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/overmap_terrain.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/palettes.json
 share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_01.json
 share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_02.json
 share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_03.json
@@ -2209,41 +3250,20 @@ share/cataclysm-dda/mods/necromancy/modi
 share/cataclysm-dda/mods/necromancy/necronimicron.json
 share/cataclysm-dda/mods/no_scifi/modinfo.json
 share/cataclysm-dda/mods/novitamins/modinfo.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_car_dealership.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_car_showroom.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_city_dump_small.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_gardening_allotment.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_internet_cafe.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_market_small.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_open_sewer_small.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_private_park.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_public_art_piece.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_public_space.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_sex_shop.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_tire_shop.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_fire_lookout_tower.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_giant_sinkhole.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_regional_dump.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_survivor_bunker.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_survivor_camp.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/oa_shared_item_groups.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/overmap_specials.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/overmap_terrain.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/regional_overlay.json
-share/cataclysm-dda/mods/oa_additional_buildings/modinfo.json
-share/cataclysm-dda/mods/realguns/ammo.json
-share/cataclysm-dda/mods/realguns/ammo_types.json
-share/cataclysm-dda/mods/realguns/armor.json
-share/cataclysm-dda/mods/realguns/gun.json
-share/cataclysm-dda/mods/realguns/gunmod.json
-share/cataclysm-dda/mods/realguns/item_groups.json
-share/cataclysm-dda/mods/realguns/magazine.json
-share/cataclysm-dda/mods/realguns/modinfo.json
-share/cataclysm-dda/mods/realguns/obsolete.json
-share/cataclysm-dda/mods/realguns/recipes.json
-share/cataclysm-dda/mods/realguns/requirements.json
-share/cataclysm-dda/mods/realguns/uncraft.json
 share/cataclysm-dda/mods/replacements.json
+share/cataclysm-dda/mods/rural_biome/modinfo.json
+share/cataclysm-dda/mods/rural_biome/rural_regional_map_settings.json
+share/cataclysm-dda/mods/sees_player_hitbutton/mod_tileset.json
+share/cataclysm-dda/mods/sees_player_hitbutton/modinfo.json
+share/cataclysm-dda/mods/sees_player_hitbutton/sees_player_hitbutton_green.png
+share/cataclysm-dda/mods/sees_player_hitbutton/sees_player_hitbutton_pink.png
+share/cataclysm-dda/mods/sees_player_hitbutton/sees_player_hitbutton_red.png
+share/cataclysm-dda/mods/sees_player_hitbutton/sees_player_hitbutton_yellow.png
+share/cataclysm-dda/mods/sees_player_retro/mod_tileset.json
+share/cataclysm-dda/mods/sees_player_retro/modinfo.json
+share/cataclysm-dda/mods/sees_player_retro/sees_player_retro.png
+share/cataclysm-dda/mods/speedydex/modinfo.json
+share/cataclysm-dda/mods/stats_through_kills/modinfo.json
 share/cataclysm-dda/motd/de.motd
 share/cataclysm-dda/motd/en.motd
 share/cataclysm-dda/motd/es_AR.motd
@@ -2264,7 +3284,12 @@ share/cataclysm-dda/raw/colors.json
 share/cataclysm-dda/raw/keybindings.json
 share/cataclysm-dda/raw/keybindings/vehicle.json
 share/cataclysm-dda/raw/sokoban.txt
+share/cataclysm-dda/title/en.christmas
+share/cataclysm-dda/title/en.easter
 share/cataclysm-dda/title/en.halloween
+share/cataclysm-dda/title/en.independence_day
+share/cataclysm-dda/title/en.new_year
+share/cataclysm-dda/title/en.thanksgiving
 share/cataclysm-dda/title/en.title
 share/cataclysm-dda/title/ru.title
 share/cataclysm-dda/title/zh_CN.title
@@ -2272,10 +3297,12 @@ share/locale/ar/LC_MESSAGES/cataclysm-dd
 share/locale/da/LC_MESSAGES/cataclysm-dda.mo
 share/locale/de/LC_MESSAGES/cataclysm-dda.mo
 share/locale/el/LC_MESSAGES/cataclysm-dda.mo
+share/locale/en/LC_MESSAGES/cataclysm-dda.mo
 share/locale/es_AR/LC_MESSAGES/cataclysm-dda.mo
 share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo
 share/locale/fr/LC_MESSAGES/cataclysm-dda.mo
 share/locale/hu/LC_MESSAGES/cataclysm-dda.mo
+share/locale/id/LC_MESSAGES/cataclysm-dda.mo
 share/locale/is/LC_MESSAGES/cataclysm-dda.mo
 share/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo
 share/locale/ja/LC_MESSAGES/cataclysm-dda.mo
Index: pkgsrc/games/cataclysm-dda/distinfo
diff -u pkgsrc/games/cataclysm-dda/distinfo:1.1 pkgsrc/games/cataclysm-dda/distinfo:1.2
--- pkgsrc/games/cataclysm-dda/distinfo:1.1     Wed Aug  7 18:05:25 2019
+++ pkgsrc/games/cataclysm-dda/distinfo Thu Apr 30 14:57:30 2020
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.1 2019/08/07 18:05:25 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/04/30 14:57:30 nia Exp $
 
-SHA1 (cataclysm-dda-0.D.tar.gz) = 4ef07ec98412ffac28f165859dd1f0cd9f7ba20a
-RMD160 (cataclysm-dda-0.D.tar.gz) = dc22281b0ac0fd518614136d37d35e29408eb759
-SHA512 (cataclysm-dda-0.D.tar.gz) = 9ab19038d67cf388eb6e3549df88b58745a2c82652e2b33c8346b98733860926005c935874fcddf993d345f404e924d90a623d196f570bac18dbeae5c794a678
-Size (cataclysm-dda-0.D.tar.gz) = 93423203 bytes
+SHA1 (cataclysm-dda-0.E.tar.gz) = 8c648c51a50519177bc5e65f094089f05d6bf13a
+RMD160 (cataclysm-dda-0.E.tar.gz) = 427fae20b8c8a26482075c87985df713bbdfc581
+SHA512 (cataclysm-dda-0.E.tar.gz) = f725e2bb75d62b5bbac3d4fbc00f1d1efe31afcb10186677f7f6f7810ae3819296c4090a90b1b730c0b758ffabca9d2e546999cfc2f7de26a38bf98426674c83
+Size (cataclysm-dda-0.E.tar.gz) = 69933302 bytes
+SHA1 (patch-lang_compile__mo.sh) = d62c0cd564ed67d0401eba3f571db546748b6b3d
+SHA1 (patch-src_translations.cpp) = 6d7650746dbe661f7442409beacbf93cd94dddf8
+SHA1 (patch-src_translations.h) = 13bbd0d1fd5ce1ec9588fbf89f63ff8ed2894e9e

Index: pkgsrc/games/cataclysm-dda-sdl/Makefile
diff -u pkgsrc/games/cataclysm-dda-sdl/Makefile:1.4 pkgsrc/games/cataclysm-dda-sdl/Makefile:1.5
--- pkgsrc/games/cataclysm-dda-sdl/Makefile:1.4 Sun Mar  8 16:49:34 2020
+++ pkgsrc/games/cataclysm-dda-sdl/Makefile     Thu Apr 30 14:57:30 2020
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.4 2020/03/08 16:49:34 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2020/04/30 14:57:30 nia Exp $
 
-PKGREVISION= 1
 .include "../../games/cataclysm-dda/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-dda/-dda-sdl/}
@@ -32,12 +31,6 @@ do-install:
 .endfor
        cd ${WRKSRC}/gfx && ${PAX} -rw -pp . \
            ${DESTDIR}${PREFIX}/share/cataclysm-dda/gfx
-       ${INSTALL_DATA} ${WRKSRC}/lua/autoexec.lua \
-           ${DESTDIR}${PREFIX}/share/cataclysm-dda/lua
-       ${INSTALL_DATA} ${WRKSRC}/lua/log.lua \
-           ${DESTDIR}${PREFIX}/share/cataclysm-dda/lua
-       ${INSTALL_DATA} ${WRKSRC}/lua/class_definitions.lua \
-           ${DESTDIR}${PREFIX}/share/cataclysm-dda/lua
        ${INSTALL_DATA} ${WRKSRC}/data/changelog.txt \
            ${DESTDIR}${PREFIX}/share/cataclysm-dda
        ${INSTALL_DATA} ${WRKSRC}/data/cataicon.ico \

Index: pkgsrc/games/cataclysm-dda-sdl/PLIST
diff -u pkgsrc/games/cataclysm-dda-sdl/PLIST:1.1 pkgsrc/games/cataclysm-dda-sdl/PLIST:1.2
--- pkgsrc/games/cataclysm-dda-sdl/PLIST:1.1    Wed Aug  7 18:05:25 2019
+++ pkgsrc/games/cataclysm-dda-sdl/PLIST        Thu Apr 30 14:57:30 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/08/07 18:05:25 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/04/30 14:57:30 nia Exp $
 bin/cataclysm-tiles
 share/appdata/cataclysm-dda.appdata.xml
 share/applications/cataclysm-dda.desktop
@@ -7,51 +7,26 @@ share/cataclysm-dda/cataicon.ico
 share/cataclysm-dda/changelog.txt
 share/cataclysm-dda/core/basic.json
 share/cataclysm-dda/core/tips.json
-share/cataclysm-dda/credits/de.credits
 share/cataclysm-dda/credits/en.credits
-share/cataclysm-dda/credits/es_AR.credits
-share/cataclysm-dda/credits/es_ES.credits
-share/cataclysm-dda/credits/it_IT.credits
-share/cataclysm-dda/credits/ko.credits
-share/cataclysm-dda/credits/pt_BR.credits
 share/cataclysm-dda/credits/ru.credits
-share/cataclysm-dda/credits/zh_CN.credits
-share/cataclysm-dda/credits/zh_TW.credits
-share/cataclysm-dda/font/Square-Smallcaps.ttf
-share/cataclysm-dda/font/fixedsys.ttf
-share/cataclysm-dda/font/square.ttf
+share/cataclysm-dda/font/map_font_LARWICK.png
 share/cataclysm-dda/font/terminus.fon
 share/cataclysm-dda/font/unifont.ttf
 share/cataclysm-dda/fontdata.json
-share/cataclysm-dda/gfx/BlockheadTileset/blockheadtiles.png
-share/cataclysm-dda/gfx/BlockheadTileset/tile_config.json
-share/cataclysm-dda/gfx/BlockheadTileset/tileset.txt
+share/cataclysm-dda/gfx/ASCIITileset/ASCIITiles.png
+share/cataclysm-dda/gfx/ASCIITileset/fallback.png
+share/cataclysm-dda/gfx/ASCIITileset/tile_config.json
+share/cataclysm-dda/gfx/ASCIITileset/tileset.txt
+share/cataclysm-dda/gfx/BrownLikeBears/fallback.png
+share/cataclysm-dda/gfx/BrownLikeBears/tile_config.json
+share/cataclysm-dda/gfx/BrownLikeBears/tiles.png
+share/cataclysm-dda/gfx/BrownLikeBears/tileset.txt
 share/cataclysm-dda/gfx/ChestHole16Tileset/fallback.png
 share/cataclysm-dda/gfx/ChestHole16Tileset/tile_config.json
 share/cataclysm-dda/gfx/ChestHole16Tileset/tiles.png
 share/cataclysm-dda/gfx/ChestHole16Tileset/tiles24.png
 share/cataclysm-dda/gfx/ChestHole16Tileset/tileset.txt
 share/cataclysm-dda/gfx/ChestHole16Tileset/tree.png
-share/cataclysm-dda/gfx/ChestHole32Tileset/fallback.png
-share/cataclysm-dda/gfx/ChestHole32Tileset/tile_config.json
-share/cataclysm-dda/gfx/ChestHole32Tileset/tiles.png
-share/cataclysm-dda/gfx/ChestHole32Tileset/tiles48.png
-share/cataclysm-dda/gfx/ChestHole32Tileset/tileset.txt
-share/cataclysm-dda/gfx/ChestHole32Tileset/tree.png
-share/cataclysm-dda/gfx/ChestHole32Tileset_iso/fallback.png
-share/cataclysm-dda/gfx/ChestHole32Tileset_iso/tile_config.json
-share/cataclysm-dda/gfx/ChestHole32Tileset_iso/tiles.png
-share/cataclysm-dda/gfx/ChestHole32Tileset_iso/tiles48.png
-share/cataclysm-dda/gfx/ChestHole32Tileset_iso/tileset.txt
-share/cataclysm-dda/gfx/ChestHoleTileset/fallback.png
-share/cataclysm-dda/gfx/ChestHoleTileset/tile_config.json
-share/cataclysm-dda/gfx/ChestHoleTileset/tiles.png
-share/cataclysm-dda/gfx/ChestHoleTileset/tiles32.png
-share/cataclysm-dda/gfx/ChestHoleTileset/tileset.txt
-share/cataclysm-dda/gfx/ChestHoleTileset/tree.png
-share/cataclysm-dda/gfx/DeonTileset/deontiles.png
-share/cataclysm-dda/gfx/DeonTileset/tile_config.json
-share/cataclysm-dda/gfx/DeonTileset/tileset.txt
 share/cataclysm-dda/gfx/HitButton_iso/HitButton_iso.png
 share/cataclysm-dda/gfx/HitButton_iso/fallback.png
 share/cataclysm-dda/gfx/HitButton_iso/tile_config.json
@@ -61,117 +36,179 @@ share/cataclysm-dda/gfx/HoderTileset/hod
 share/cataclysm-dda/gfx/HoderTileset/hodertiles_oversized.png
 share/cataclysm-dda/gfx/HoderTileset/tile_config.json
 share/cataclysm-dda/gfx/HoderTileset/tileset.txt
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/10_xfiles_32x32_22052-22195.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/11_tiles_kawaiimaidmod_32x32_22196-22291.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/12_tiles_kawaiimaidmod_offset_32x32_22292-22339.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/13_tiles_kawaiimaidmod_64x48-22340-22364.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/14_tiles2_32x32_22365-27564.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/15_tiles-connected_variants_32x32_27565-32764.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/16_tiles_trees_64x80_32765-33164.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/17_top_hats_32x32-33165-35756.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/1_tiles_32x32_0-5199.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/2_expan_32x32_5200-5391.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/3_tree_64x80_5392-5471.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/4_fallback_5472-9567.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/5_tiles_character_customization_32x32_9568-11567.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/6_tiles_wide_monsters_160x128_11568-11603.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/7_expan2_32x32_11604-11651.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/8_tiles-monster-variants_32x32_11652-16851.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/9_tiles-connected_32x32_16852-22051.png
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/tile_config.json
-share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/tileset.txt
-share/cataclysm-dda/gfx/MShock24TilesetModded/fallback.png
-share/cataclysm-dda/gfx/MShock24TilesetModded/tile_config.json
-share/cataclysm-dda/gfx/MShock24TilesetModded/tiles.png
-share/cataclysm-dda/gfx/MShock24TilesetModded/tileset.txt
-share/cataclysm-dda/gfx/MShock32TilesetModded/fallback.png
-share/cataclysm-dda/gfx/MShock32TilesetModded/tile_config.json
-share/cataclysm-dda/gfx/MShock32TilesetModded/tiles.png
-share/cataclysm-dda/gfx/MShock32TilesetModded/tileset.txt
-share/cataclysm-dda/gfx/MshockXotto+/expan.png
-share/cataclysm-dda/gfx/MshockXotto+/expan2.png
-share/cataclysm-dda/gfx/MshockXotto+/fallback.png
-share/cataclysm-dda/gfx/MshockXotto+/tile_config.json
-share/cataclysm-dda/gfx/MshockXotto+/tiles.png
-share/cataclysm-dda/gfx/MshockXotto+/tileset.txt
-share/cataclysm-dda/gfx/MshockXotto+/tree.png
-share/cataclysm-dda/gfx/MshockXotto+/treeO.png
-share/cataclysm-dda/gfx/RetroASCIITileset/fallback.png
-share/cataclysm-dda/gfx/RetroASCIITileset/retroasciitiles.png
-share/cataclysm-dda/gfx/RetroASCIITileset/tile_config.json
-share/cataclysm-dda/gfx/RetroASCIITileset/tileset.txt
+share/cataclysm-dda/gfx/RetroDays+Tileset/fallback.png
+share/cataclysm-dda/gfx/RetroDays+Tileset/tile_config.json
+share/cataclysm-dda/gfx/RetroDays+Tileset/tiles.png
+share/cataclysm-dda/gfx/RetroDays+Tileset/tiles_20x20.png
+share/cataclysm-dda/gfx/RetroDays+Tileset/tileset.txt
 share/cataclysm-dda/gfx/RetroDaysTileset/fallback.png
 share/cataclysm-dda/gfx/RetroDaysTileset/tile_config.json
 share/cataclysm-dda/gfx/RetroDaysTileset/tiles.png
 share/cataclysm-dda/gfx/RetroDaysTileset/tiles_20x20.png
 share/cataclysm-dda/gfx/RetroDaysTileset/tileset.txt
-share/cataclysm-dda/gfx/ThuztorTileset@/thuztortiles@.png
-share/cataclysm-dda/gfx/ThuztorTileset@/tile_config.json
-share/cataclysm-dda/gfx/ThuztorTileset@/tileset.txt
-share/cataclysm-dda/gfx/TsuTileset/tile_config.json
-share/cataclysm-dda/gfx/TsuTileset/tileset.txt
-share/cataclysm-dda/gfx/TsuTileset/tsutiles.png
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/fallback.png
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/fillerhoder.png
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/giant.png
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/huge.png
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/incomplete.png
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/large.png
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/normal.png
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/opengameartgiant.png
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/tall.png
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/tile_config.json
+share/cataclysm-dda/gfx/UltimateCataclysmDemo/tileset.txt
 share/cataclysm-dda/gfx/tile_config.json
 share/cataclysm-dda/gfx/tile_config_template.json
 share/cataclysm-dda/gfx/tinytile.png
 share/cataclysm-dda/json/LOADING_ORDER.md
+share/cataclysm-dda/json/ammo_effects.json
 share/cataclysm-dda/json/anatomy.json
 share/cataclysm-dda/json/bionics.json
 share/cataclysm-dda/json/body_parts.json
+share/cataclysm-dda/json/clothing_mods.json
 share/cataclysm-dda/json/construction.json
-share/cataclysm-dda/json/corpses.json
+share/cataclysm-dda/json/construction_category.json
 share/cataclysm-dda/json/default_blacklist.json
-share/cataclysm-dda/json/doll_speech.json
 share/cataclysm-dda/json/dreams.json
 share/cataclysm-dda/json/effects.json
 share/cataclysm-dda/json/emit.json
+share/cataclysm-dda/json/field_type.json
 share/cataclysm-dda/json/flags.json
-share/cataclysm-dda/json/furniture.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-appliances.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-barriers.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-decorative.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-domestic_plants.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-eggs.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-emitters.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-fakes.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-fireplaces.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-flora.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-fungal.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-graves.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-industrial.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-medical.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-migo.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-plumbing.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-recreation.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-regional-pseudo.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-roof.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-rural.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-seats.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-signs.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-sleep.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-storage.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-surfaces.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-terrains.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-tools.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-bridges-docks.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-doors.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-fences-gates.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-floors-outdoors.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-floors_indoor.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-flora.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-fungal.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-liquids.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-manufactured.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-mechanisms.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-migo.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-railroads.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-recreational.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-regional-pseudo.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-roofs.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-traps.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-walls.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-windows.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-zlevel-transitions.json
 share/cataclysm-dda/json/game_balance.json
 share/cataclysm-dda/json/gates.json
 share/cataclysm-dda/json/harvest.json
-share/cataclysm-dda/json/health_msgs.json
+share/cataclysm-dda/json/hit_range.json
 share/cataclysm-dda/json/item_actions.json
 share/cataclysm-dda/json/item_category.json
-share/cataclysm-dda/json/item_groups.json
-share/cataclysm-dda/json/itemgroups/ammo.json
+share/cataclysm-dda/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
+share/cataclysm-dda/json/itemgroups/Agriculture_Forage_Excavation/forage.json
+share/cataclysm-dda/json/itemgroups/Clothing_Gear/clothing.json
+share/cataclysm-dda/json/itemgroups/Clothing_Gear/gear.json
+share/cataclysm-dda/json/itemgroups/Clothing_Gear/gear_civilian.json
+share/cataclysm-dda/json/itemgroups/Clothing_Gear/jewellery_gems.json
+share/cataclysm-dda/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
+share/cataclysm-dda/json/itemgroups/Food/food.json
+share/cataclysm-dda/json/itemgroups/Food/irradiated.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/locations.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/locations_commercial.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/locations_mapextras.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/mall_item_groups.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/mansion.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/map_extras.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/private_resort_item_groups.json
+share/cataclysm-dda/json/itemgroups/Locations_MapExtras/robofac_trade.json
+share/cataclysm-dda/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json
+share/cataclysm-dda/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
+share/cataclysm-dda/json/itemgroups/SUS/clothes_store.json
+share/cataclysm-dda/json/itemgroups/SUS/domestic.json
+share/cataclysm-dda/json/itemgroups/SUS/evac_shelter.json
+share/cataclysm-dda/json/itemgroups/SUS/garage.json
+share/cataclysm-dda/json/itemgroups/SUS/library.json
+share/cataclysm-dda/json/itemgroups/SUS/office.json
+share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/ammo.json
+share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
+share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/guns.json
+share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json
+share/cataclysm-dda/json/itemgroups/activities_hobbies.json
+share/cataclysm-dda/json/itemgroups/art_antiques_crafts.json
+share/cataclysm-dda/json/itemgroups/bionics.json
 share/cataclysm-dda/json/itemgroups/books.json
-share/cataclysm-dda/json/itemgroups/clothing.json
+share/cataclysm-dda/json/itemgroups/collections_domestic.json
+share/cataclysm-dda/json/itemgroups/collections_trades.json
+share/cataclysm-dda/json/itemgroups/corpses.json
 share/cataclysm-dda/json/itemgroups/defense_mode.json
-share/cataclysm-dda/json/itemgroups/drugs.json
+share/cataclysm-dda/json/itemgroups/electronics.json
 share/cataclysm-dda/json/itemgroups/faction_camps.json
-share/cataclysm-dda/json/itemgroups/forage.json
-share/cataclysm-dda/json/itemgroups/gear.json
-share/cataclysm-dda/json/itemgroups/gunmod.json
-share/cataclysm-dda/json/itemgroups/guns.json
-share/cataclysm-dda/json/itemgroups/locations.json
-share/cataclysm-dda/json/itemgroups/magazines.json
+share/cataclysm-dda/json/itemgroups/food_service.json
+share/cataclysm-dda/json/itemgroups/furniture.json
 share/cataclysm-dda/json/itemgroups/main.json
-share/cataclysm-dda/json/itemgroups/mansion.json
-share/cataclysm-dda/json/itemgroups/map_extras.json
+share/cataclysm-dda/json/itemgroups/military.json
 share/cataclysm-dda/json/itemgroups/misc.json
-share/cataclysm-dda/json/itemgroups/monster_drops.json
+share/cataclysm-dda/json/itemgroups/oa_shared_item_groups.json
+share/cataclysm-dda/json/itemgroups/obsolete.json
+share/cataclysm-dda/json/itemgroups/roof.json
+share/cataclysm-dda/json/itemgroups/science_and_tech.json
+share/cataclysm-dda/json/itemgroups/shops_trades.json
+share/cataclysm-dda/json/itemgroups/stashes.json
 share/cataclysm-dda/json/itemgroups/supplies.json
 share/cataclysm-dda/json/itemgroups/tools.json
+share/cataclysm-dda/json/itemgroups/trash_and_debris.json
+share/cataclysm-dda/json/itemgroups/vehicles_fuel_related.json
 share/cataclysm-dda/json/itemgroups/vending_machines.json
 share/cataclysm-dda/json/items/ammo.json
+share/cataclysm-dda/json/items/ammo/10mm.json
 share/cataclysm-dda/json/items/ammo/12mm.json
 share/cataclysm-dda/json/items/ammo/20x66mm.json
 share/cataclysm-dda/json/items/ammo/22.json
 share/cataclysm-dda/json/items/ammo/223.json
+share/cataclysm-dda/json/items/ammo/270win.json
 share/cataclysm-dda/json/items/ammo/300.json
 share/cataclysm-dda/json/items/ammo/3006.json
+share/cataclysm-dda/json/items/ammo/300blk.json
 share/cataclysm-dda/json/items/ammo/308.json
 share/cataclysm-dda/json/items/ammo/32.json
-share/cataclysm-dda/json/items/ammo/357.json
+share/cataclysm-dda/json/items/ammo/357mag.json
+share/cataclysm-dda/json/items/ammo/357sig.json
 share/cataclysm-dda/json/items/ammo/36paper.json
 share/cataclysm-dda/json/items/ammo/38.json
+share/cataclysm-dda/json/items/ammo/380.json
+share/cataclysm-dda/json/items/ammo/38super.json
 share/cataclysm-dda/json/items/ammo/40.json
-share/cataclysm-dda/json/items/ammo/40mm.json
+share/cataclysm-dda/json/items/ammo/40x46mm.json
+share/cataclysm-dda/json/items/ammo/40x53mm.json
+share/cataclysm-dda/json/items/ammo/410shot.json
 share/cataclysm-dda/json/items/ammo/44.json
 share/cataclysm-dda/json/items/ammo/44paper.json
 share/cataclysm-dda/json/items/ammo/45.json
 share/cataclysm-dda/json/items/ammo/454.json
+share/cataclysm-dda/json/items/ammo/4570.json
+share/cataclysm-dda/json/items/ammo/45colt.json
 share/cataclysm-dda/json/items/ammo/46.json
 share/cataclysm-dda/json/items/ammo/460.json
 share/cataclysm-dda/json/items/ammo/50.json
@@ -179,6 +216,7 @@ share/cataclysm-dda/json/items/ammo/500.
 share/cataclysm-dda/json/items/ammo/545x39.json
 share/cataclysm-dda/json/items/ammo/57.json
 share/cataclysm-dda/json/items/ammo/5x50.json
+share/cataclysm-dda/json/items/ammo/66mm.json
 share/cataclysm-dda/json/items/ammo/700nx.json
 share/cataclysm-dda/json/items/ammo/762.json
 share/cataclysm-dda/json/items/ammo/762R.json
@@ -187,20 +225,52 @@ share/cataclysm-dda/json/items/ammo/84x2
 share/cataclysm-dda/json/items/ammo/8x40mm.json
 share/cataclysm-dda/json/items/ammo/9mm.json
 share/cataclysm-dda/json/items/ammo/9x18.json
+share/cataclysm-dda/json/items/ammo/atgm.json
+share/cataclysm-dda/json/items/ammo/barb.json
+share/cataclysm-dda/json/items/ammo/chemical_spray.json
 share/cataclysm-dda/json/items/ammo/flintlock.json
 share/cataclysm-dda/json/items/ammo/metal_rail.json
 share/cataclysm-dda/json/items/ammo/nail.json
 share/cataclysm-dda/json/items/ammo/paintball.json
 share/cataclysm-dda/json/items/ammo/shot.json
+share/cataclysm-dda/json/items/ammo/shotcanister.json
+share/cataclysm-dda/json/items/ammo/shotpaper.json
 share/cataclysm-dda/json/items/ammo/signal_flare.json
 share/cataclysm-dda/json/items/ammo/weldgas.json
 share/cataclysm-dda/json/items/ammo_types.json
-share/cataclysm-dda/json/items/archery.json
-share/cataclysm-dda/json/items/armor.json
 share/cataclysm-dda/json/items/armor/ammo_pouch.json
+share/cataclysm-dda/json/items/armor/arms_armor.json
+share/cataclysm-dda/json/items/armor/ballistic_armor.json
 share/cataclysm-dda/json/items/armor/bandolier.json
+share/cataclysm-dda/json/items/armor/belts.json
 share/cataclysm-dda/json/items/armor/boots.json
+share/cataclysm-dda/json/items/armor/cloaks.json
+share/cataclysm-dda/json/items/armor/coats.json
+share/cataclysm-dda/json/items/armor/eyewear.json
+share/cataclysm-dda/json/items/armor/gloves.json
+share/cataclysm-dda/json/items/armor/hats.json
+share/cataclysm-dda/json/items/armor/helmets.json
 share/cataclysm-dda/json/items/armor/holster.json
+share/cataclysm-dda/json/items/armor/hoods.json
+share/cataclysm-dda/json/items/armor/jewelry.json
+share/cataclysm-dda/json/items/armor/legs_armor.json
+share/cataclysm-dda/json/items/armor/legs_clothes.json
+share/cataclysm-dda/json/items/armor/masks.json
+share/cataclysm-dda/json/items/armor/misc.json
+share/cataclysm-dda/json/items/armor/pets_dog_armor.json
+share/cataclysm-dda/json/items/armor/pets_horse_armor.json
+share/cataclysm-dda/json/items/armor/power_armor.json
+share/cataclysm-dda/json/items/armor/scarfs.json
+share/cataclysm-dda/json/items/armor/sheath.json
+share/cataclysm-dda/json/items/armor/storage.json
+share/cataclysm-dda/json/items/armor/suits_clothes.json
+share/cataclysm-dda/json/items/armor/suits_protection.json
+share/cataclysm-dda/json/items/armor/swimming.json
+share/cataclysm-dda/json/items/armor/torso_armor.json
+share/cataclysm-dda/json/items/armor/torso_clothes.json
+share/cataclysm-dda/json/items/armor/undergarment.json
+share/cataclysm-dda/json/items/basecamp.json
+share/cataclysm-dda/json/items/battery.json
 share/cataclysm-dda/json/items/bionics.json
 share/cataclysm-dda/json/items/biosignatures.json
 share/cataclysm-dda/json/items/book/archery.json
@@ -252,7 +322,6 @@ share/cataclysm-dda/json/items/comestibl
 share/cataclysm-dda/json/items/comestibles/irradiated_veggy.json
 share/cataclysm-dda/json/items/comestibles/junkfood.json
 share/cataclysm-dda/json/items/comestibles/meat_dishes.json
-share/cataclysm-dda/json/items/comestibles/meat_dishes_human.json
 share/cataclysm-dda/json/items/comestibles/med.json
 share/cataclysm-dda/json/items/comestibles/mre.json
 share/cataclysm-dda/json/items/comestibles/mushroom.json
@@ -270,34 +339,49 @@ share/cataclysm-dda/json/items/comestibl
 share/cataclysm-dda/json/items/comestibles/veggy_dishes.json
 share/cataclysm-dda/json/items/comestibles/wheat.json
 share/cataclysm-dda/json/items/containers.json
-share/cataclysm-dda/json/items/crossbows.json
+share/cataclysm-dda/json/items/corpses/corpses.json
+share/cataclysm-dda/json/items/corpses/inactive_bots.json
+share/cataclysm-dda/json/items/electronics.json
 share/cataclysm-dda/json/items/fake.json
+share/cataclysm-dda/json/items/faults_bionic.json
 share/cataclysm-dda/json/items/fluff.json
 share/cataclysm-dda/json/items/fuel.json
 share/cataclysm-dda/json/items/generic.json
 share/cataclysm-dda/json/items/generic/ammolink.json
+share/cataclysm-dda/json/items/generic/bathroom_house.json
+share/cataclysm-dda/json/items/generic/bedding.json
 share/cataclysm-dda/json/items/generic/casing.json
 share/cataclysm-dda/json/items/generic/currency.json
+share/cataclysm-dda/json/items/generic/dining_kitchen.json
 share/cataclysm-dda/json/items/generic/spares.json
+share/cataclysm-dda/json/items/generic/storage.json
 share/cataclysm-dda/json/items/generic/string.json
-share/cataclysm-dda/json/items/grenades.json
+share/cataclysm-dda/json/items/generic/toys_and_sports.json
 share/cataclysm-dda/json/items/gun/12mm.json
 share/cataclysm-dda/json/items/gun/20x66mm.json
 share/cataclysm-dda/json/items/gun/22.json
 share/cataclysm-dda/json/items/gun/223.json
+share/cataclysm-dda/json/items/gun/270win.json
 share/cataclysm-dda/json/items/gun/300.json
 share/cataclysm-dda/json/items/gun/3006.json
+share/cataclysm-dda/json/items/gun/300BLK.json
 share/cataclysm-dda/json/items/gun/308.json
 share/cataclysm-dda/json/items/gun/32.json
-share/cataclysm-dda/json/items/gun/357.json
+share/cataclysm-dda/json/items/gun/357sig.json
 share/cataclysm-dda/json/items/gun/36paper.json
 share/cataclysm-dda/json/items/gun/38.json
+share/cataclysm-dda/json/items/gun/380.json
+share/cataclysm-dda/json/items/gun/38super.json
 share/cataclysm-dda/json/items/gun/40.json
-share/cataclysm-dda/json/items/gun/40mm.json
+share/cataclysm-dda/json/items/gun/40x46mm.json
+share/cataclysm-dda/json/items/gun/40x53mm.json
+share/cataclysm-dda/json/items/gun/410shot.json
 share/cataclysm-dda/json/items/gun/44.json
 share/cataclysm-dda/json/items/gun/44paper.json
 share/cataclysm-dda/json/items/gun/45.json
 share/cataclysm-dda/json/items/gun/454.json
+share/cataclysm-dda/json/items/gun/4570.json
+share/cataclysm-dda/json/items/gun/45colt.json
 share/cataclysm-dda/json/items/gun/46.json
 share/cataclysm-dda/json/items/gun/460.json
 share/cataclysm-dda/json/items/gun/50.json
@@ -305,6 +389,7 @@ share/cataclysm-dda/json/items/gun/500.j
 share/cataclysm-dda/json/items/gun/545x39.json
 share/cataclysm-dda/json/items/gun/57.json
 share/cataclysm-dda/json/items/gun/5x50.json
+share/cataclysm-dda/json/items/gun/66mm.json
 share/cataclysm-dda/json/items/gun/700nx.json
 share/cataclysm-dda/json/items/gun/762.json
 share/cataclysm-dda/json/items/gun/762R.json
@@ -313,11 +398,16 @@ share/cataclysm-dda/json/items/gun/84x24
 share/cataclysm-dda/json/items/gun/8x40mm.json
 share/cataclysm-dda/json/items/gun/9mm.json
 share/cataclysm-dda/json/items/gun/9x18.json
+share/cataclysm-dda/json/items/gun/atgm.json
 share/cataclysm-dda/json/items/gun/bio.json
 share/cataclysm-dda/json/items/gun/blunderbuss.json
+share/cataclysm-dda/json/items/gun/chemical_spray.json
+share/cataclysm-dda/json/items/gun/combination.json
+share/cataclysm-dda/json/items/gun/faults_gun.json
 share/cataclysm-dda/json/items/gun/flammable.json
 share/cataclysm-dda/json/items/gun/flintlock.json
 share/cataclysm-dda/json/items/gun/metal_rail.json
+share/cataclysm-dda/json/items/gun/monster_gun.json
 share/cataclysm-dda/json/items/gun/nail.json
 share/cataclysm-dda/json/items/gun/paintball.json
 share/cataclysm-dda/json/items/gun/shot.json
@@ -325,16 +415,22 @@ share/cataclysm-dda/json/items/gun/signa
 share/cataclysm-dda/json/items/gun/ups.json
 share/cataclysm-dda/json/items/gunmod/accessories.json
 share/cataclysm-dda/json/items/gunmod/barrel.json
+share/cataclysm-dda/json/items/gunmod/bionicmods.json
+share/cataclysm-dda/json/items/gunmod/brass_catcher.json
+share/cataclysm-dda/json/items/gunmod/conversions.json
 share/cataclysm-dda/json/items/gunmod/grip.json
 share/cataclysm-dda/json/items/gunmod/laser_gunmods.json
-share/cataclysm-dda/json/items/gunmod/magazine.json
+share/cataclysm-dda/json/items/gunmod/loading_port.json
 share/cataclysm-dda/json/items/gunmod/mechanism.json
+share/cataclysm-dda/json/items/gunmod/mount.json
 share/cataclysm-dda/json/items/gunmod/muzzle.json
 share/cataclysm-dda/json/items/gunmod/rail.json
 share/cataclysm-dda/json/items/gunmod/sights.json
+share/cataclysm-dda/json/items/gunmod/sling.json
 share/cataclysm-dda/json/items/gunmod/stock.json
 share/cataclysm-dda/json/items/gunmod/underbarrel.json
 share/cataclysm-dda/json/items/handloaded_bullets.json
+share/cataclysm-dda/json/items/items_holiday.json
 share/cataclysm-dda/json/items/magazine/12mm.json
 share/cataclysm-dda/json/items/magazine/20x60mm.json
 share/cataclysm-dda/json/items/magazine/22.json
@@ -343,65 +439,142 @@ share/cataclysm-dda/json/items/magazine/
 share/cataclysm-dda/json/items/magazine/3006.json
 share/cataclysm-dda/json/items/magazine/308.json
 share/cataclysm-dda/json/items/magazine/32.json
-share/cataclysm-dda/json/items/magazine/357.json
+share/cataclysm-dda/json/items/magazine/357sig.json
 share/cataclysm-dda/json/items/magazine/38.json
+share/cataclysm-dda/json/items/magazine/380.json
+share/cataclysm-dda/json/items/magazine/38super.json
 share/cataclysm-dda/json/items/magazine/40.json
 share/cataclysm-dda/json/items/magazine/40mm.json
+share/cataclysm-dda/json/items/magazine/410shot.json
 share/cataclysm-dda/json/items/magazine/44.json
 share/cataclysm-dda/json/items/magazine/45.json
+share/cataclysm-dda/json/items/magazine/454.json
 share/cataclysm-dda/json/items/magazine/46.json
 share/cataclysm-dda/json/items/magazine/460.json
 share/cataclysm-dda/json/items/magazine/50.json
+share/cataclysm-dda/json/items/magazine/500.json
 share/cataclysm-dda/json/items/magazine/545x39.json
 share/cataclysm-dda/json/items/magazine/57.json
 share/cataclysm-dda/json/items/magazine/5x50.json
+share/cataclysm-dda/json/items/magazine/66mm.json
 share/cataclysm-dda/json/items/magazine/762.json
 share/cataclysm-dda/json/items/magazine/762R.json
 share/cataclysm-dda/json/items/magazine/762x25.json
 share/cataclysm-dda/json/items/magazine/8x40mm.json
 share/cataclysm-dda/json/items/magazine/9mm.json
 share/cataclysm-dda/json/items/magazine/9x18.json
+share/cataclysm-dda/json/items/magazine/chemical_spray.json
 share/cataclysm-dda/json/items/magazine/liquid.json
 share/cataclysm-dda/json/items/magazine/nail.json
 share/cataclysm-dda/json/items/magazine/shot.json
 share/cataclysm-dda/json/items/magazine/weldgas.json
-share/cataclysm-dda/json/items/melee.json
+share/cataclysm-dda/json/items/melee/bludgeons.json
+share/cataclysm-dda/json/items/melee/fake.json
+share/cataclysm-dda/json/items/melee/knives_kitchen.json
+share/cataclysm-dda/json/items/melee/misc.json
+share/cataclysm-dda/json/items/melee/spears_and_polearms.json
+share/cataclysm-dda/json/items/melee/swords_and_blades.json
+share/cataclysm-dda/json/items/melee/unarmed_weapons.json
 share/cataclysm-dda/json/items/migration.json
 share/cataclysm-dda/json/items/newspaper.json
 share/cataclysm-dda/json/items/obsolete.json
-share/cataclysm-dda/json/items/ranged.json
-share/cataclysm-dda/json/items/resources/metals.json
+share/cataclysm-dda/json/items/ranged/archery.json
+share/cataclysm-dda/json/items/ranged/crossbows.json
+share/cataclysm-dda/json/items/ranged/energy.json
+share/cataclysm-dda/json/items/ranged/launchers.json
+share/cataclysm-dda/json/items/ranged/pneumatic.json
+share/cataclysm-dda/json/items/ranged/slings.json
+share/cataclysm-dda/json/items/ranged/spearguns.json
+share/cataclysm-dda/json/items/ranged/throwing.json
+share/cataclysm-dda/json/items/resources/alien.json
+share/cataclysm-dda/json/items/resources/chemicals.json
+share/cataclysm-dda/json/items/resources/fasteners.json
+share/cataclysm-dda/json/items/resources/glass.json
+share/cataclysm-dda/json/items/resources/home_improvement.json
+share/cataclysm-dda/json/items/resources/metal.json
 share/cataclysm-dda/json/items/resources/misc.json
+share/cataclysm-dda/json/items/resources/plastic.json
+share/cataclysm-dda/json/items/resources/tailoring.json
+share/cataclysm-dda/json/items/resources/wood.json
+share/cataclysm-dda/json/items/robot_parts.json
 share/cataclysm-dda/json/items/software.json
+share/cataclysm-dda/json/items/tool/container.json
+share/cataclysm-dda/json/items/tool/cooking.json
 share/cataclysm-dda/json/items/tool/deployable.json
+share/cataclysm-dda/json/items/tool/electronics.json
+share/cataclysm-dda/json/items/tool/entry_tools.json
+share/cataclysm-dda/json/items/tool/explosives.json
+share/cataclysm-dda/json/items/tool/fire.json
+share/cataclysm-dda/json/items/tool/firefighting.json
+share/cataclysm-dda/json/items/tool/fishing.json
+share/cataclysm-dda/json/items/tool/handloading.json
+share/cataclysm-dda/json/items/tool/knives.json
+share/cataclysm-dda/json/items/tool/landscaping.json
 share/cataclysm-dda/json/items/tool/lighting.json
 share/cataclysm-dda/json/items/tool/med.json
+share/cataclysm-dda/json/items/tool/metalworking.json
+share/cataclysm-dda/json/items/tool/misc.json
+share/cataclysm-dda/json/items/tool/musical_instruments.json
+share/cataclysm-dda/json/items/tool/pets.json
 share/cataclysm-dda/json/items/tool/radio_tools.json
+share/cataclysm-dda/json/items/tool/raincatchers.json
 share/cataclysm-dda/json/items/tool/science.json
+share/cataclysm-dda/json/items/tool/shelters.json
+share/cataclysm-dda/json/items/tool/smoking.json
+share/cataclysm-dda/json/items/tool/stationary.json
+share/cataclysm-dda/json/items/tool/tailoring.json
+share/cataclysm-dda/json/items/tool/toileteries.json
+share/cataclysm-dda/json/items/tool/traps.json
+share/cataclysm-dda/json/items/tool/woodworking.json
 share/cataclysm-dda/json/items/tool/workshop.json
 share/cataclysm-dda/json/items/tool_armor.json
 share/cataclysm-dda/json/items/toolmod.json
-share/cataclysm-dda/json/items/tools.json
 share/cataclysm-dda/json/items/vehicle/alternator.json
+share/cataclysm-dda/json/items/vehicle/animals.json
 share/cataclysm-dda/json/items/vehicle/armor.json
 share/cataclysm-dda/json/items/vehicle/battery.json
+share/cataclysm-dda/json/items/vehicle/boat.json
+share/cataclysm-dda/json/items/vehicle/cables.json
+share/cataclysm-dda/json/items/vehicle/cargo.json
+share/cataclysm-dda/json/items/vehicle/controls.json
 share/cataclysm-dda/json/items/vehicle/engine.json
 share/cataclysm-dda/json/items/vehicle/engineering.json
+share/cataclysm-dda/json/items/vehicle/farming.json
+share/cataclysm-dda/json/items/vehicle/frames.json
+share/cataclysm-dda/json/items/vehicle/fuel_storage.json
+share/cataclysm-dda/json/items/vehicle/lights.json
+share/cataclysm-dda/json/items/vehicle/manual.json
+share/cataclysm-dda/json/items/vehicle/mills.json
+share/cataclysm-dda/json/items/vehicle/motors.json
+share/cataclysm-dda/json/items/vehicle/noise.json
+share/cataclysm-dda/json/items/vehicle/plating.json
 share/cataclysm-dda/json/items/vehicle/rams.json
 share/cataclysm-dda/json/items/vehicle/rigs.json
+share/cataclysm-dda/json/items/vehicle/seating.json
+share/cataclysm-dda/json/items/vehicle/solar.json
+share/cataclysm-dda/json/items/vehicle/tables.json
+share/cataclysm-dda/json/items/vehicle/turrets.json
+share/cataclysm-dda/json/items/vehicle/utilities.json
 share/cataclysm-dda/json/items/vehicle/wheel.json
-share/cataclysm-dda/json/items/vehicle_parts.json
-share/cataclysm-dda/json/lab_notes.json
+share/cataclysm-dda/json/legacy_artifact_active.json
+share/cataclysm-dda/json/legacy_artifact_passive.json
+share/cataclysm-dda/json/loot_zones.json
+share/cataclysm-dda/json/mapgen/Glassblower.json
+share/cataclysm-dda/json/mapgen/Metalworker.json
+share/cataclysm-dda/json/mapgen/Pottery_Sewing_Shops.json
 share/cataclysm-dda/json/mapgen/abandoned01.json
 share/cataclysm-dda/json/mapgen/abandoned_barn.json
 share/cataclysm-dda/json/mapgen/abandoned_shopping_plaza.json
 share/cataclysm-dda/json/mapgen/abandoned_warehouse.json
 share/cataclysm-dda/json/mapgen/abstorefront.json
+share/cataclysm-dda/json/mapgen/airliner.json
 share/cataclysm-dda/json/mapgen/animalpound.json
 share/cataclysm-dda/json/mapgen/animalshelter.json
 share/cataclysm-dda/json/mapgen/antique_store.json
 share/cataclysm-dda/json/mapgen/apartment_con.json
+share/cataclysm-dda/json/mapgen/apartment_con_new.json
 share/cataclysm-dda/json/mapgen/apartment_mod.json
+share/cataclysm-dda/json/mapgen/apartment_mod_new.json
 share/cataclysm-dda/json/mapgen/arcade.json
 share/cataclysm-dda/json/mapgen/art_gallery.json
 share/cataclysm-dda/json/mapgen/bakery.json
@@ -410,45 +583,190 @@ share/cataclysm-dda/json/mapgen/bandit_c
 share/cataclysm-dda/json/mapgen/bandit_garage.json
 share/cataclysm-dda/json/mapgen/bank.json
 share/cataclysm-dda/json/mapgen/bar.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_canteen/modular_canteen_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_defenses.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_tent.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_field_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_firestation1.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_saltworks/modular_saltworks_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_standard.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter/modular_shelter_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_standard.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_1/modular_shelter_1_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_metal.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_migo_resin.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_rammed_earth.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_workshop/modular_workshop_wood.json
+share/cataclysm-dda/json/mapgen/basecamps/primitive_field.json
 share/cataclysm-dda/json/mapgen/basement/basement_bionic.json
 share/cataclysm-dda/json/mapgen/basement/basement_chem.json
 share/cataclysm-dda/json/mapgen/basement/basement_game.json
 share/cataclysm-dda/json/mapgen/basement/basement_guns.json
 share/cataclysm-dda/json/mapgen/basement/basement_lab_stairs.json
+share/cataclysm-dda/json/mapgen/basement/basement_messed.json
+share/cataclysm-dda/json/mapgen/basement/basement_meth.json
 share/cataclysm-dda/json/mapgen/basement/basement_survival.json
 share/cataclysm-dda/json/mapgen/basement/basement_weed.json
+share/cataclysm-dda/json/mapgen/basement/basements.json
 share/cataclysm-dda/json/mapgen/bike_shop.json
 share/cataclysm-dda/json/mapgen/bowling_alley.json
 share/cataclysm-dda/json/mapgen/boxing.json
 share/cataclysm-dda/json/mapgen/bunker.json
+share/cataclysm-dda/json/mapgen/bus_station.json
 share/cataclysm-dda/json/mapgen/butcher.json
 share/cataclysm-dda/json/mapgen/cabin.json
 share/cataclysm-dda/json/mapgen/campground.json
+share/cataclysm-dda/json/mapgen/campground_npc.json
 share/cataclysm-dda/json/mapgen/campsite.json
+share/cataclysm-dda/json/mapgen/campus/buildings/admin_f0.json
+share/cataclysm-dda/json/mapgen/campus/buildings/admin_f1.json
+share/cataclysm-dda/json/mapgen/campus/buildings/admin_f2.json
+share/cataclysm-dda/json/mapgen/campus/buildings/admin_roof.json
+share/cataclysm-dda/json/mapgen/campus/buildings/commons_f0.json
+share/cataclysm-dda/json/mapgen/campus/buildings/commons_f1.json
+share/cataclysm-dda/json/mapgen/campus/buildings/commons_f2.json
+share/cataclysm-dda/json/mapgen/campus/buildings/commons_roof.json
+share/cataclysm-dda/json/mapgen/campus/buildings/health_f0.json
+share/cataclysm-dda/json/mapgen/campus/buildings/health_f1.json
+share/cataclysm-dda/json/mapgen/campus/buildings/health_f2.json
+share/cataclysm-dda/json/mapgen/campus/buildings/health_roof.json
+share/cataclysm-dda/json/mapgen/campus/buildings/lecture_f0.json
+share/cataclysm-dda/json/mapgen/campus/buildings/lecture_f1.json
+share/cataclysm-dda/json/mapgen/campus/buildings/lecture_f2.json
+share/cataclysm-dda/json/mapgen/campus/buildings/lecture_roof.json
+share/cataclysm-dda/json/mapgen/campus/buildings/media_f0.json
+share/cataclysm-dda/json/mapgen/campus/buildings/media_f1.json
+share/cataclysm-dda/json/mapgen/campus/buildings/media_f2.json
+share/cataclysm-dda/json/mapgen/campus/buildings/media_f3.json
+share/cataclysm-dda/json/mapgen/campus/buildings/media_roof.json
 share/cataclysm-dda/json/mapgen/cathedral.json
 share/cataclysm-dda/json/mapgen/cemetery_4square.json
 share/cataclysm-dda/json/mapgen/cemetery_medium.json
 share/cataclysm-dda/json/mapgen/cemetery_small.json
+share/cataclysm-dda/json/mapgen/cground3x3.json
 share/cataclysm-dda/json/mapgen/church.json
+share/cataclysm-dda/json/mapgen/city_blocks/city_block_2.json
+share/cataclysm-dda/json/mapgen/collapsed_tower.json
 share/cataclysm-dda/json/mapgen/construction_site.json
+share/cataclysm-dda/json/mapgen/cs_car_dealership.json
+share/cataclysm-dda/json/mapgen/cs_car_showroom.json
+share/cataclysm-dda/json/mapgen/cs_city_dump_small.json
+share/cataclysm-dda/json/mapgen/cs_gardening_allotment.json
+share/cataclysm-dda/json/mapgen/cs_internet_cafe.json
+share/cataclysm-dda/json/mapgen/cs_market_small.json
+share/cataclysm-dda/json/mapgen/cs_open_sewer_small.json
+share/cataclysm-dda/json/mapgen/cs_private_park.json
+share/cataclysm-dda/json/mapgen/cs_public_art_piece.json
+share/cataclysm-dda/json/mapgen/cs_public_space.json
+share/cataclysm-dda/json/mapgen/cs_sex_shop.json
+share/cataclysm-dda/json/mapgen/cs_tire_shop.json
 share/cataclysm-dda/json/mapgen/daycare.json
 share/cataclysm-dda/json/mapgen/debug_ramps.json
 share/cataclysm-dda/json/mapgen/derelict_property.json
 share/cataclysm-dda/json/mapgen/diner.json
 share/cataclysm-dda/json/mapgen/dirtroad.json
 share/cataclysm-dda/json/mapgen/dispensary.json
+share/cataclysm-dda/json/mapgen/dock.json
 share/cataclysm-dda/json/mapgen/dojo.json
 share/cataclysm-dda/json/mapgen/dollar_store.json
 share/cataclysm-dda/json/mapgen/dump.json
 share/cataclysm-dda/json/mapgen/dumpsite.json
-share/cataclysm-dda/json/mapgen/evac_center.json
 share/cataclysm-dda/json/mapgen/faction_buildings.json
 share/cataclysm-dda/json/mapgen/farm.json
+share/cataclysm-dda/json/mapgen/farm_2side.json
 share/cataclysm-dda/json/mapgen/farm_dairy.json
+share/cataclysm-dda/json/mapgen/farm_horse.json
+share/cataclysm-dda/json/mapgen/farm_stills.json
+share/cataclysm-dda/json/mapgen/farm_tiles.json
 share/cataclysm-dda/json/mapgen/farm_tree.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_blc_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_blc_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_blc_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_blc_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_brc_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_brc_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_brc_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_brc_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_le_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_le_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_le_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_le_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_mid_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_mid_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_mid_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_mid_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_re_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_re_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_re_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_re_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_te_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_te_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_te_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_te_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_tlc_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_tlc_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_tlc_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_tlc_03.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_trc_00.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_trc_01.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_trc_02.json
+share/cataclysm-dda/json/mapgen/fema/FEMA_trc_03.json
 share/cataclysm-dda/json/mapgen/field_baseball.json
 share/cataclysm-dda/json/mapgen/field_football.json
 share/cataclysm-dda/json/mapgen/fire_station.json
+share/cataclysm-dda/json/mapgen/fungal/fungal_bloom.json
+share/cataclysm-dda/json/mapgen/fungal/fungal_flowers.json
+share/cataclysm-dda/json/mapgen/fungal/fungal_tower.json
 share/cataclysm-dda/json/mapgen/gambling_hall.json
 share/cataclysm-dda/json/mapgen/garage.json
 share/cataclysm-dda/json/mapgen/garage_gas.json
@@ -459,14 +777,21 @@ share/cataclysm-dda/json/mapgen/gardenin
 share/cataclysm-dda/json/mapgen/golfcourse.json
 share/cataclysm-dda/json/mapgen/gunsmith.json
 share/cataclysm-dda/json/mapgen/gym.json
+share/cataclysm-dda/json/mapgen/hazardous_waste_sarcophagus.json
 share/cataclysm-dda/json/mapgen/headshop.json
+share/cataclysm-dda/json/mapgen/helipad.json
 share/cataclysm-dda/json/mapgen/homeimprovement.json
 share/cataclysm-dda/json/mapgen/homeimprovement_superstore.json
+share/cataclysm-dda/json/mapgen/homeimprovement_superstore_new.json
 share/cataclysm-dda/json/mapgen/homeless_camp.json
+share/cataclysm-dda/json/mapgen/homeless_shelter.json
 share/cataclysm-dda/json/mapgen/hospital.json
 share/cataclysm-dda/json/mapgen/hotel_tower.json
 share/cataclysm-dda/json/mapgen/house/crack_house.json
-share/cataclysm-dda/json/mapgen/house/detached_house.json
+share/cataclysm-dda/json/mapgen/house/garden_house_1.json
+share/cataclysm-dda/json/mapgen/house/house01.json
+share/cataclysm-dda/json/mapgen/house/house02.json
+share/cataclysm-dda/json/mapgen/house/house03.json
 share/cataclysm-dda/json/mapgen/house/house04.json
 share/cataclysm-dda/json/mapgen/house/house05.json
 share/cataclysm-dda/json/mapgen/house/house05_ab.json
@@ -484,9 +809,42 @@ share/cataclysm-dda/json/mapgen/house/ho
 share/cataclysm-dda/json/mapgen/house/house17.json
 share/cataclysm-dda/json/mapgen/house/house18.json
 share/cataclysm-dda/json/mapgen/house/house19.json
+share/cataclysm-dda/json/mapgen/house/house20.json
+share/cataclysm-dda/json/mapgen/house/house21.json
+share/cataclysm-dda/json/mapgen/house/house22.json
+share/cataclysm-dda/json/mapgen/house/house23.json
+share/cataclysm-dda/json/mapgen/house/house24.json
+share/cataclysm-dda/json/mapgen/house/house25.json
+share/cataclysm-dda/json/mapgen/house/house26.json
+share/cataclysm-dda/json/mapgen/house/house27.json
+share/cataclysm-dda/json/mapgen/house/house28.json
+share/cataclysm-dda/json/mapgen/house/house29.json
+share/cataclysm-dda/json/mapgen/house/house30.json
+share/cataclysm-dda/json/mapgen/house/house31.json
+share/cataclysm-dda/json/mapgen/house/house32.json
 share/cataclysm-dda/json/mapgen/house/house_2story.json
+share/cataclysm-dda/json/mapgen/house/house_detatched1.json
+share/cataclysm-dda/json/mapgen/house/house_detatched10.json
+share/cataclysm-dda/json/mapgen/house/house_detatched2.json
+share/cataclysm-dda/json/mapgen/house/house_detatched3.json
+share/cataclysm-dda/json/mapgen/house/house_detatched4.json
+share/cataclysm-dda/json/mapgen/house/house_detatched5.json
+share/cataclysm-dda/json/mapgen/house/house_detatched6.json
+share/cataclysm-dda/json/mapgen/house/house_detatched7.json
+share/cataclysm-dda/json/mapgen/house/house_detatched8.json
+share/cataclysm-dda/json/mapgen/house/house_detatched9.json
 share/cataclysm-dda/json/mapgen/house/house_dogs.json
 share/cataclysm-dda/json/mapgen/house/house_duplex.json
+share/cataclysm-dda/json/mapgen/house/house_duplex10.json
+share/cataclysm-dda/json/mapgen/house/house_duplex11.json
+share/cataclysm-dda/json/mapgen/house/house_duplex2.json
+share/cataclysm-dda/json/mapgen/house/house_duplex3.json
+share/cataclysm-dda/json/mapgen/house/house_duplex4.json
+share/cataclysm-dda/json/mapgen/house/house_duplex5.json
+share/cataclysm-dda/json/mapgen/house/house_duplex6.json
+share/cataclysm-dda/json/mapgen/house/house_duplex7.json
+share/cataclysm-dda/json/mapgen/house/house_duplex8.json
+share/cataclysm-dda/json/mapgen/house/house_duplex9.json
 share/cataclysm-dda/json/mapgen/house/house_fortified.json
 share/cataclysm-dda/json/mapgen/house/house_garage.json
 share/cataclysm-dda/json/mapgen/house/house_garage2.json
@@ -498,6 +856,7 @@ share/cataclysm-dda/json/mapgen/house/ho
 share/cataclysm-dda/json/mapgen/house/house_garage8.json
 share/cataclysm-dda/json/mapgen/house/house_garage_prepper.json
 share/cataclysm-dda/json/mapgen/house/house_gardener.json
+share/cataclysm-dda/json/mapgen/house/house_inner_garden.json
 share/cataclysm-dda/json/mapgen/house/house_library.json
 share/cataclysm-dda/json/mapgen/house/house_modern_lx.json
 share/cataclysm-dda/json/mapgen/house/house_patio.json
@@ -509,7 +868,20 @@ share/cataclysm-dda/json/mapgen/house/ho
 share/cataclysm-dda/json/mapgen/house/house_suicide.json
 share/cataclysm-dda/json/mapgen/house/house_tool_shed.json
 share/cataclysm-dda/json/mapgen/house/house_vacant.json
+share/cataclysm-dda/json/mapgen/house/house_w_1.json
+share/cataclysm-dda/json/mapgen/house/house_w_2.json
+share/cataclysm-dda/json/mapgen/house/house_w_3.json
+share/cataclysm-dda/json/mapgen/house/house_w_4.json
+share/cataclysm-dda/json/mapgen/house/house_w_5.json
+share/cataclysm-dda/json/mapgen/house/house_w_6.json
+share/cataclysm-dda/json/mapgen/house/house_wooded.json
 share/cataclysm-dda/json/mapgen/hunting_blind.json
+share/cataclysm-dda/json/mapgen/irradiator_1.json
+share/cataclysm-dda/json/mapgen/isherwood_farms/cabin_isherwood.json
+share/cataclysm-dda/json/mapgen/isherwood_farms/dairy_farm_isherwood.json
+share/cataclysm-dda/json/mapgen/isherwood_farms/farm_horse_isherwood.json
+share/cataclysm-dda/json/mapgen/isherwood_farms/farm_isherwood.json
+share/cataclysm-dda/json/mapgen/isherwood_farms/rural_roads_trails.json
 share/cataclysm-dda/json/mapgen/jewel_store.json
 share/cataclysm-dda/json/mapgen/junkyard.json
 share/cataclysm-dda/json/mapgen/lab/README.md
@@ -522,7 +894,18 @@ share/cataclysm-dda/json/mapgen/lab/lab_
 share/cataclysm-dda/json/mapgen/lab/lab_floorplans_finale1level.json
 share/cataclysm-dda/json/mapgen/lab/lab_rooms.json
 share/cataclysm-dda/json/mapgen/lab/lab_rooms_wall.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z1.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z2.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z3.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z4.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_big_z5.json
+share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_nested.json
 share/cataclysm-dda/json/mapgen/lab/lab_trains.json
+share/cataclysm-dda/json/mapgen/lake.json
+share/cataclysm-dda/json/mapgen/lake_buildings/cabin_lake.json
+share/cataclysm-dda/json/mapgen/lake_buildings/islands.json
+share/cataclysm-dda/json/mapgen/lake_buildings/lighthouse.json
 share/cataclysm-dda/json/mapgen/lan_center.json
 share/cataclysm-dda/json/mapgen/landfill.json
 share/cataclysm-dda/json/mapgen/landscaping_supply.json
@@ -531,13 +914,37 @@ share/cataclysm-dda/json/mapgen/library.
 share/cataclysm-dda/json/mapgen/lmoe.json
 share/cataclysm-dda/json/mapgen/lot_empty_commercial.json
 share/cataclysm-dda/json/mapgen/lot_empty_residential.json
+share/cataclysm-dda/json/mapgen/lumbermill.json
 share/cataclysm-dda/json/mapgen/lumberyard.json
 share/cataclysm-dda/json/mapgen/mall.json
 share/cataclysm-dda/json/mapgen/mansion.json
+share/cataclysm-dda/json/mapgen/map_extras/nest_dermatik.json
+share/cataclysm-dda/json/mapgen/map_extras/nest_wasp.json
+share/cataclysm-dda/json/mapgen/map_extras/prison_bus.json
+share/cataclysm-dda/json/mapgen/map_extras/wilderness.json
 share/cataclysm-dda/json/mapgen/mapgen-test.json
+share/cataclysm-dda/json/mapgen/marina.json
 share/cataclysm-dda/json/mapgen/mass_grave.json
+share/cataclysm-dda/json/mapgen/megastore.json
 share/cataclysm-dda/json/mapgen/meth_lab.json
+share/cataclysm-dda/json/mapgen/mi-go/mi-go_encampment.json
+share/cataclysm-dda/json/mapgen/mi-go/mi-go_nested.json
+share/cataclysm-dda/json/mapgen/mi-go/mi-go_scout_tower.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_connector.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_generic.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_generic_edge.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_shifting_hall.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_special_tiles.json
 share/cataclysm-dda/json/mapgen/mil_surplus.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z-1.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z0.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z1.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z2.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z3.json
+share/cataclysm-dda/json/mapgen/military/mil_base/mil_base_z4.json
+share/cataclysm-dda/json/mapgen/miniature_railway/miniature_railway_z1.json
+share/cataclysm-dda/json/mapgen/miniature_railway/miniature_railway_z2.json
+share/cataclysm-dda/json/mapgen/missile_silo.json
 share/cataclysm-dda/json/mapgen/moonshine_camp.json
 share/cataclysm-dda/json/mapgen/mortuary.json
 share/cataclysm-dda/json/mapgen/motel.json
@@ -550,6 +957,16 @@ share/cataclysm-dda/json/mapgen/necropol
 share/cataclysm-dda/json/mapgen/necropolis/necropolisB1.json
 share/cataclysm-dda/json/mapgen/necropolis/necropolisB2.json
 share/cataclysm-dda/json/mapgen/necropolis/necropolisB3.json
+share/cataclysm-dda/json/mapgen/nested/basement_nested.json
+share/cataclysm-dda/json/mapgen/nested/city_npc_nested_spawns.json
+share/cataclysm-dda/json/mapgen/nested/farm_nested.json
+share/cataclysm-dda/json/mapgen/nested/house_nested.json
+share/cataclysm-dda/json/mapgen/nested/lmoe_nested.json
+share/cataclysm-dda/json/mapgen/nested/nested_chunks_roof.json
+share/cataclysm-dda/json/mapgen/nested/office_nested.json
+share/cataclysm-dda/json/mapgen/nested/retail_nested.json
+share/cataclysm-dda/json/mapgen/nested/rural_outdoors_nested.json
+share/cataclysm-dda/json/mapgen/nested/shelter_nested.json
 share/cataclysm-dda/json/mapgen/office_cubical.json
 share/cataclysm-dda/json/mapgen/office_doctor.json
 share/cataclysm-dda/json/mapgen/office_small.json
@@ -557,10 +974,13 @@ share/cataclysm-dda/json/mapgen/office_t
 share/cataclysm-dda/json/mapgen/office_tower_2.json
 share/cataclysm-dda/json/mapgen/orchard_apple.json
 share/cataclysm-dda/json/mapgen/orchard_fruit.json
+share/cataclysm-dda/json/mapgen/outpost.json
 share/cataclysm-dda/json/mapgen/paintball_field.json
 share/cataclysm-dda/json/mapgen/park.json
 share/cataclysm-dda/json/mapgen/park_skate.json
 share/cataclysm-dda/json/mapgen/park_state.json
+share/cataclysm-dda/json/mapgen/parking_garage.json
+share/cataclysm-dda/json/mapgen/parking_lot.json
 share/cataclysm-dda/json/mapgen/pavilion.json
 share/cataclysm-dda/json/mapgen/pawn_shop.json
 share/cataclysm-dda/json/mapgen/petstore.json
@@ -575,6 +995,7 @@ share/cataclysm-dda/json/mapgen/post_off
 share/cataclysm-dda/json/mapgen/power_station_large.json
 share/cataclysm-dda/json/mapgen/power_station_small.json
 share/cataclysm-dda/json/mapgen/prison_1.json
+share/cataclysm-dda/json/mapgen/private_resort.json
 share/cataclysm-dda/json/mapgen/public_works.json
 share/cataclysm-dda/json/mapgen/pump_station.json
 share/cataclysm-dda/json/mapgen/radio_tower.json
@@ -582,12 +1003,33 @@ share/cataclysm-dda/json/mapgen/railroad
 share/cataclysm-dda/json/mapgen/railroad/railroad_station.json
 share/cataclysm-dda/json/mapgen/ranch_camp.json
 share/cataclysm-dda/json/mapgen/recycle_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_e.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_n.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_ne.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_nw.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_s.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_se.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_sw.json
+share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_w.json
+share/cataclysm-dda/json/mapgen/refugee_center/refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z-1_refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z-2_refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z-3_refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z-4_refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z1_refugee_center.json
+share/cataclysm-dda/json/mapgen/refugee_center/z2_refugee_center.json
+share/cataclysm-dda/json/mapgen/regional_airport.json
 share/cataclysm-dda/json/mapgen/restaurant.json
 share/cataclysm-dda/json/mapgen/restaurant_fast.json
 share/cataclysm-dda/json/mapgen/reststop.json
 share/cataclysm-dda/json/mapgen/river_shipwreck.json
+share/cataclysm-dda/json/mapgen/riverside/whaleys_boat_rental.json
+share/cataclysm-dda/json/mapgen/riverside/whaleys_house_river.json
 share/cataclysm-dda/json/mapgen/road_4way.json
 share/cataclysm-dda/json/mapgen/roadstop.json
+share/cataclysm-dda/json/mapgen/robofachq_static.json
+share/cataclysm-dda/json/mapgen/robofaq_locs/robofac_hq_chunks.json
+share/cataclysm-dda/json/mapgen/robofaq_locs/robofac_mission_chunks.json
 share/cataclysm-dda/json/mapgen/s_bookstore.json
 share/cataclysm-dda/json/mapgen/s_candy.json
 share/cataclysm-dda/json/mapgen/s_clothing.json
@@ -602,6 +1044,7 @@ share/cataclysm-dda/json/mapgen/s_icecre
 share/cataclysm-dda/json/mapgen/s_liquor.json
 share/cataclysm-dda/json/mapgen/sai.json
 share/cataclysm-dda/json/mapgen/school_1.json
+share/cataclysm-dda/json/mapgen/sewage_treatment.json
 share/cataclysm-dda/json/mapgen/shelter.json
 share/cataclysm-dda/json/mapgen/shooting_range.json
 share/cataclysm-dda/json/mapgen/smallscrapyard.json
@@ -610,15 +1053,21 @@ share/cataclysm-dda/json/mapgen/sports_s
 share/cataclysm-dda/json/mapgen/stadium_football.json
 share/cataclysm-dda/json/mapgen/standing_stones.json
 share/cataclysm-dda/json/mapgen/station_radio.json
+share/cataclysm-dda/json/mapgen/steel_mill/steel_mill_z1.json
+share/cataclysm-dda/json/mapgen/steel_mill/steel_mill_z2.json
+share/cataclysm-dda/json/mapgen/steel_mill/steel_mill_z3.json
 share/cataclysm-dda/json/mapgen/storage_units_large.json
 share/cataclysm-dda/json/mapgen/storage_units_medium.json
 share/cataclysm-dda/json/mapgen/storage_units_small.json
+share/cataclysm-dda/json/mapgen/store/s_hunting.json
 share/cataclysm-dda/json/mapgen/stripclub.json
 share/cataclysm-dda/json/mapgen/sub_station.json
 share/cataclysm-dda/json/mapgen/sugar_house.json
 share/cataclysm-dda/json/mapgen/swamp_shack.json
 share/cataclysm-dda/json/mapgen/teashop.json
 share/cataclysm-dda/json/mapgen/thrift.json
+share/cataclysm-dda/json/mapgen/town_hall.json
+share/cataclysm-dda/json/mapgen/toxic_dump.json
 share/cataclysm-dda/json/mapgen/trail_nature.json
 share/cataclysm-dda/json/mapgen/trail_small.json
 share/cataclysm-dda/json/mapgen/trailer_park.json
@@ -627,53 +1076,158 @@ share/cataclysm-dda/json/mapgen/triffid_
 share/cataclysm-dda/json/mapgen/veterinarian.json
 share/cataclysm-dda/json/mapgen/vfw.json
 share/cataclysm-dda/json/mapgen/warehouse.json
+share/cataclysm-dda/json/mapgen/ws_biker_dump.json
+share/cataclysm-dda/json/mapgen/ws_fire_lookout_tower.json
+share/cataclysm-dda/json/mapgen/ws_giant_sinkhole.json
+share/cataclysm-dda/json/mapgen/ws_regional_dump.json
+share/cataclysm-dda/json/mapgen/ws_survivor_bunker.json
+share/cataclysm-dda/json/mapgen/ws_survivor_camp.json
 share/cataclysm-dda/json/mapgen/zoo.json
+share/cataclysm-dda/json/mapgen_palettes/abandoned_barn_p.json
 share/cataclysm-dda/json/mapgen_palettes/acidia_camp_palette.json
+share/cataclysm-dda/json/mapgen_palettes/airliner_palette.json
+share/cataclysm-dda/json/mapgen_palettes/apartment.json
+share/cataclysm-dda/json/mapgen_palettes/bandit_camp.json
 share/cataclysm-dda/json/mapgen_palettes/basement.json
+share/cataclysm-dda/json/mapgen_palettes/bike_shop_palette.json
+share/cataclysm-dda/json/mapgen_palettes/building.json
+share/cataclysm-dda/json/mapgen_palettes/cabin.json
+share/cataclysm-dda/json/mapgen_palettes/campground.json
+share/cataclysm-dda/json/mapgen_palettes/campus/common.json
+share/cataclysm-dda/json/mapgen_palettes/cground.json
 share/cataclysm-dda/json/mapgen_palettes/church.json
-share/cataclysm-dda/json/mapgen_palettes/evac_center.json
+share/cataclysm-dda/json/mapgen_palettes/city_block_palette.json
+share/cataclysm-dda/json/mapgen_palettes/clothes_store_palette.json
+share/cataclysm-dda/json/mapgen_palettes/collapsed_tower.json
+share/cataclysm-dda/json/mapgen_palettes/farm.json
+share/cataclysm-dda/json/mapgen_palettes/farm_horse.json
+share/cataclysm-dda/json/mapgen_palettes/farm_lots.json
+share/cataclysm-dda/json/mapgen_palettes/fema.json
+share/cataclysm-dda/json/mapgen_palettes/field_football.json
+share/cataclysm-dda/json/mapgen_palettes/helipad.json
 share/cataclysm-dda/json/mapgen_palettes/hospital.json
-share/cataclysm-dda/json/mapgen_palettes/houses_multistory.json
+share/cataclysm-dda/json/mapgen_palettes/hotel_tower_palette.json
+share/cataclysm-dda/json/mapgen_palettes/house_general_palette.json
+share/cataclysm-dda/json/mapgen_palettes/house_w_palette.json
+share/cataclysm-dda/json/mapgen_palettes/junkyard_palette.json
+share/cataclysm-dda/json/mapgen_palettes/lab_surface_palette.json
+share/cataclysm-dda/json/mapgen_palettes/library_palette.json
+share/cataclysm-dda/json/mapgen_palettes/lmoe.json
 share/cataclysm-dda/json/mapgen_palettes/lumberyard.json
+share/cataclysm-dda/json/mapgen_palettes/mall_palette.json
 share/cataclysm-dda/json/mapgen_palettes/mansion.json
+share/cataclysm-dda/json/mapgen_palettes/mi-go_palette.json
+share/cataclysm-dda/json/mapgen_palettes/microlab.json
 share/cataclysm-dda/json/mapgen_palettes/mil_surplus.json
+share/cataclysm-dda/json/mapgen_palettes/military/mil_base_palette.json
+share/cataclysm-dda/json/mapgen_palettes/military/mil_base_roof_palette.json
+share/cataclysm-dda/json/mapgen_palettes/miniature_railway_palette.json
+share/cataclysm-dda/json/mapgen_palettes/movie_theater_palette.json
+share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_a.json
+share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_b1.json
+share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_b2.json
+share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_b3.json
+share/cataclysm-dda/json/mapgen_palettes/office.json
 share/cataclysm-dda/json/mapgen_palettes/office_doctor.json
+share/cataclysm-dda/json/mapgen_palettes/park_palette.json
+share/cataclysm-dda/json/mapgen_palettes/prison.json
+share/cataclysm-dda/json/mapgen_palettes/private_resort.json
 share/cataclysm-dda/json/mapgen_palettes/railroad.json
 share/cataclysm-dda/json/mapgen_palettes/ranch_camp.json
+share/cataclysm-dda/json/mapgen_palettes/refugee_center.json
+share/cataclysm-dda/json/mapgen_palettes/regional_dump_palette.json
 share/cataclysm-dda/json/mapgen_palettes/road.json
+share/cataclysm-dda/json/mapgen_palettes/robofachq.json
+share/cataclysm-dda/json/mapgen_palettes/roof_palette.json
+share/cataclysm-dda/json/mapgen_palettes/rural_roads_trails_palette.json
 share/cataclysm-dda/json/mapgen_palettes/shelter.json
+share/cataclysm-dda/json/mapgen_palettes/steel_mill_palette.json
 share/cataclysm-dda/json/mapgen_palettes/subway.json
+share/cataclysm-dda/json/mapgen_palettes/trailer_park.json
 share/cataclysm-dda/json/martialarts.json
+share/cataclysm-dda/json/martialarts_fictional.json
 share/cataclysm-dda/json/materials.json
 share/cataclysm-dda/json/monster_attacks.json
-share/cataclysm-dda/json/monster_drops.json
 share/cataclysm-dda/json/monster_factions.json
+share/cataclysm-dda/json/monster_special_attacks/spells.json
+share/cataclysm-dda/json/monsterdrops/marloss.json
+share/cataclysm-dda/json/monsterdrops/misc.json
+share/cataclysm-dda/json/monsterdrops/mutant_experimental.json
+share/cataclysm-dda/json/monsterdrops/robofac.json
+share/cataclysm-dda/json/monsterdrops/zombie.json
+share/cataclysm-dda/json/monsterdrops/zombie_child.json
 share/cataclysm-dda/json/monsterdrops/zombie_cop.json
+share/cataclysm-dda/json/monsterdrops/zombie_default.json
+share/cataclysm-dda/json/monsterdrops/zombie_lab.json
 share/cataclysm-dda/json/monsterdrops/zombie_military_pilot.json
+share/cataclysm-dda/json/monsterdrops/zombie_prisoner.json
+share/cataclysm-dda/json/monsterdrops/zombie_resort.json
 share/cataclysm-dda/json/monsterdrops/zombie_soldier.json
 share/cataclysm-dda/json/monsterdrops/zombie_survivor.json
 share/cataclysm-dda/json/monsterdrops/zombie_technician.json
-share/cataclysm-dda/json/monstergroups.json
-share/cataclysm-dda/json/monstergroups_egg.json
-share/cataclysm-dda/json/monsters.json
+share/cataclysm-dda/json/monstergroups/blob.json
+share/cataclysm-dda/json/monstergroups/bugs.json
+share/cataclysm-dda/json/monstergroups/eggs.json
+share/cataclysm-dda/json/monstergroups/fish.json
+share/cataclysm-dda/json/monstergroups/fungi.json
+share/cataclysm-dda/json/monstergroups/lab.json
+share/cataclysm-dda/json/monstergroups/mammal.json
+share/cataclysm-dda/json/monstergroups/mi-go.json
+share/cataclysm-dda/json/monstergroups/military.json
+share/cataclysm-dda/json/monstergroups/misc.json
+share/cataclysm-dda/json/monstergroups/missions.json
+share/cataclysm-dda/json/monstergroups/nether.json
+share/cataclysm-dda/json/monstergroups/obsolete.json
+share/cataclysm-dda/json/monstergroups/resort.json
+share/cataclysm-dda/json/monstergroups/robots.json
+share/cataclysm-dda/json/monstergroups/triffid.json
+share/cataclysm-dda/json/monstergroups/wilderness.json
+share/cataclysm-dda/json/monstergroups/zombie_upgrades.json
+share/cataclysm-dda/json/monstergroups/zombies.json
 share/cataclysm-dda/json/monsters/bird.json
+share/cataclysm-dda/json/monsters/cyborgs.json
 share/cataclysm-dda/json/monsters/defense_bot.json
 share/cataclysm-dda/json/monsters/drones.json
 share/cataclysm-dda/json/monsters/fish.json
+share/cataclysm-dda/json/monsters/fungus.json
 share/cataclysm-dda/json/monsters/insect_spider.json
+share/cataclysm-dda/json/monsters/jabberwock.json
 share/cataclysm-dda/json/monsters/mammal.json
-share/cataclysm-dda/json/monsters/military.json
+share/cataclysm-dda/json/monsters/marloss.json
+share/cataclysm-dda/json/monsters/mechsuits.json
+share/cataclysm-dda/json/monsters/mi-go.json
+share/cataclysm-dda/json/monsters/misc.json
+share/cataclysm-dda/json/monsters/mutant.json
+share/cataclysm-dda/json/monsters/nether.json
 share/cataclysm-dda/json/monsters/obsolete.json
+share/cataclysm-dda/json/monsters/power_leech.json
 share/cataclysm-dda/json/monsters/reptile_amphibian.json
+share/cataclysm-dda/json/monsters/slimes.json
+share/cataclysm-dda/json/monsters/slugs.json
 share/cataclysm-dda/json/monsters/triffid.json
+share/cataclysm-dda/json/monsters/turrets.json
+share/cataclysm-dda/json/monsters/utility_bot.json
+share/cataclysm-dda/json/monsters/zed-animal.json
+share/cataclysm-dda/json/monsters/zed-classic.json
+share/cataclysm-dda/json/monsters/zed_acid.json
+share/cataclysm-dda/json/monsters/zed_burned.json
 share/cataclysm-dda/json/monsters/zed_children.json
+share/cataclysm-dda/json/monsters/zed_electric.json
 share/cataclysm-dda/json/monsters/zed_explosive.json
+share/cataclysm-dda/json/monsters/zed_fusion.json
+share/cataclysm-dda/json/monsters/zed_lab.json
+share/cataclysm-dda/json/monsters/zed_misc.json
+share/cataclysm-dda/json/monsters/zed_prisoner.json
+share/cataclysm-dda/json/monsters/zed_radiation.json
+share/cataclysm-dda/json/monsters/zed_skeletal.json
+share/cataclysm-dda/json/monsters/zed_soldiers.json
+share/cataclysm-dda/json/monsters/zed_survivor.json
 share/cataclysm-dda/json/morale_types.json
-share/cataclysm-dda/json/music.json
-share/cataclysm-dda/json/mutation_category.json
-share/cataclysm-dda/json/mutation_ordering.json
-share/cataclysm-dda/json/mutation_type.json
-share/cataclysm-dda/json/mutations.json
+share/cataclysm-dda/json/mutations/mutation_appearance.json
+share/cataclysm-dda/json/mutations/mutation_category.json
+share/cataclysm-dda/json/mutations/mutation_ordering.json
+share/cataclysm-dda/json/mutations/mutation_type.json
+share/cataclysm-dda/json/mutations/mutations.json
 share/cataclysm-dda/json/npcs/BG_trait_groups.json
 share/cataclysm-dda/json/npcs/BG_traits.json
 share/cataclysm-dda/json/npcs/Backgrounds/backgrounds_table_of_contents.json
@@ -685,6 +1239,7 @@ share/cataclysm-dda/json/npcs/Background
 share/cataclysm-dda/json/npcs/Backgrounds/cop_3.json
 share/cataclysm-dda/json/npcs/Backgrounds/criminal_1.json
 share/cataclysm-dda/json/npcs/Backgrounds/criminal_2.json
+share/cataclysm-dda/json/npcs/Backgrounds/cyborg_1.json
 share/cataclysm-dda/json/npcs/Backgrounds/dreamer.json
 share/cataclysm-dda/json/npcs/Backgrounds/evacuee_1.json
 share/cataclysm-dda/json/npcs/Backgrounds/evacuee_2.json
@@ -733,93 +1288,253 @@ share/cataclysm-dda/json/npcs/Background
 share/cataclysm-dda/json/npcs/NC_ARSONIST.json
 share/cataclysm-dda/json/npcs/NC_BARTENDER.json
 share/cataclysm-dda/json/npcs/NC_BOUNTY_HUNTER.json
+share/cataclysm-dda/json/npcs/NC_CITY_COP.json
 share/cataclysm-dda/json/npcs/NC_COWBOY.json
+share/cataclysm-dda/json/npcs/NC_CYBORG.json
 share/cataclysm-dda/json/npcs/NC_DEBUG.json
 share/cataclysm-dda/json/npcs/NC_DOCTOR.json
-share/cataclysm-dda/json/npcs/NC_EVAC_SHOPKEEP.json
 share/cataclysm-dda/json/npcs/NC_HACKER.json
 share/cataclysm-dda/json/npcs/NC_HUNTER.json
 share/cataclysm-dda/json/npcs/NC_JUNK_SHOPKEEP.json
+share/cataclysm-dda/json/npcs/NC_MARLOSS_VOICE.json
 share/cataclysm-dda/json/npcs/NC_NINJA.json
 share/cataclysm-dda/json/npcs/NC_SCAVENGER.json
 share/cataclysm-dda/json/npcs/NC_SCIENTIST.json
 share/cataclysm-dda/json/npcs/NC_SOLDIER.json
+share/cataclysm-dda/json/npcs/NC_SURVIVOR_CHEF.json
 share/cataclysm-dda/json/npcs/NC_THUG.json
 share/cataclysm-dda/json/npcs/NC_TRADER.json
-share/cataclysm-dda/json/npcs/TALK_ARSONIST.json
+share/cataclysm-dda/json/npcs/NC_TRUE_FOODPERSON.json
+share/cataclysm-dda/json/npcs/NPC_Brigitte_LaCroix.json
+share/cataclysm-dda/json/npcs/TALK_ALLY_TUTORIAL.json
+share/cataclysm-dda/json/npcs/TALK_CITY_COP.json
 share/cataclysm-dda/json/npcs/TALK_COMMON_ALLY.json
 share/cataclysm-dda/json/npcs/TALK_COMMON_GREET.json
 share/cataclysm-dda/json/npcs/TALK_COMMON_MISSION.json
 share/cataclysm-dda/json/npcs/TALK_COMMON_OTHER.json
-share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD1.json
-share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD2.json
-share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD3.json
-share/cataclysm-dda/json/npcs/TALK_EVAC_HUNTER.json
-share/cataclysm-dda/json/npcs/TALK_EVAC_MERCHANT.json
+share/cataclysm-dda/json/npcs/TALK_CYBORG_1.json
 share/cataclysm-dda/json/npcs/TALK_FACTION_CAMP.json
-share/cataclysm-dda/json/npcs/TALK_FREE_MERCHANT.json
 share/cataclysm-dda/json/npcs/TALK_FRIEND_CONVERSATION.json
-share/cataclysm-dda/json/npcs/TALK_GUARD.json
-share/cataclysm-dda/json/npcs/TALK_OLD_GUARD_NECROPOLIS.json
-share/cataclysm-dda/json/npcs/TALK_OLD_GUARD_REP.json
-share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_1.json
-share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_2.json
-share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_3.json
-share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_4.json
-share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_5.json
-share/cataclysm-dda/json/npcs/TALK_REFUGE_RANCH.json
-share/cataclysm-dda/json/npcs/TALK_SCAVENGER_MERC.json
-share/cataclysm-dda/json/npcs/TALK_SCIENCE_REP.json
+share/cataclysm-dda/json/npcs/TALK_MARLOSS_VOICE.json
+share/cataclysm-dda/json/npcs/TALK_SURVIVOR_CHEF.json
 share/cataclysm-dda/json/npcs/TALK_TEST.json
+share/cataclysm-dda/json/npcs/TALK_TRUE_FOODPERSON.json
+share/cataclysm-dda/json/npcs/appearance_trait_groups.json
 share/cataclysm-dda/json/npcs/classes.json
-share/cataclysm-dda/json/npcs/classes_uncommon.json
 share/cataclysm-dda/json/npcs/destination_locations.json
-share/cataclysm-dda/json/npcs/epilogues.json
 share/cataclysm-dda/json/npcs/expertise_traits.json
 share/cataclysm-dda/json/npcs/factions.json
+share/cataclysm-dda/json/npcs/godco/cook.json
+share/cataclysm-dda/json/npcs/godco/foodguard.json
 share/cataclysm-dda/json/npcs/hints.json
+share/cataclysm-dda/json/npcs/holdouts/Mr_Lapin.json
+share/cataclysm-dda/json/npcs/holdouts/rural.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json
+share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
 share/cataclysm-dda/json/npcs/items_generic.json
 share/cataclysm-dda/json/npcs/missiondef.json
+share/cataclysm-dda/json/npcs/necropolis/NPC_Old_Guard_Captain.json
+share/cataclysm-dda/json/npcs/necropolis/NPC_Old_Guard_Commo.json
+share/cataclysm-dda/json/npcs/necropolis/NPC_Old_Guard_Soldier.json
 share/cataclysm-dda/json/npcs/npc.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Aleesha_Seward.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Boris_Borichenko.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Dana_Nunez.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Jenny_Forcette.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Pablo_Nunez.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Stan_Borichenko.json
-share/cataclysm-dda/json/npcs/refugee_center/NPC_Vanessa_Toby.json
+share/cataclysm-dda/json/npcs/npc_behavior.json
+share/cataclysm-dda/json/npcs/prisoners/mi-go_prisoners.json
+share/cataclysm-dda/json/npcs/refugee_center/beggars/BEGGAR_1_Reena_Sandhu.json
+share/cataclysm-dda/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json
+share/cataclysm-dda/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json
+share/cataclysm-dda/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json
+share/cataclysm-dda/json/npcs/refugee_center/beggars/BEGGAR_5_Yusuke_Taylor.json
+share/cataclysm-dda/json/npcs/refugee_center/missiondef_free_merchants.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Aleesha_Seward.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Guneet_Singh.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_John_Clemens.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Stan_Borichenko.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard2.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard3.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard_generic.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_hostile_guard.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_visitors/NPC_hunter.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json
+share/cataclysm-dda/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json
+share/cataclysm-dda/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json
+share/cataclysm-dda/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json
+share/cataclysm-dda/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json
+share/cataclysm-dda/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json
+share/cataclysm-dda/json/npcs/robofac/NPC_Ulysses_Rourke.json
+share/cataclysm-dda/json/npcs/robofac/NPC_robofac_generic_security.json
+share/cataclysm-dda/json/npcs/robofac/ROBOFAC_SURFACE_FREEMERCHANT.json
 share/cataclysm-dda/json/npcs/starting_traits.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_barber.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_bartender.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_carpenter1.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_carpenter2.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_crop_overseer.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_doctor.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_farmer1.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_farmer2.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_guard.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_nurse.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_scrapper.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_sickly_laborer.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_woodcutter2.json
+share/cataclysm-dda/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json
 share/cataclysm-dda/json/npcs/talk_tags.json
-share/cataclysm-dda/json/overmap/multitile_buildings_terrain.json
+share/cataclysm-dda/json/obsolete.json
+share/cataclysm-dda/json/obsolete_terrains.json
+share/cataclysm-dda/json/obsoletion/charge_removal.json
+share/cataclysm-dda/json/overmap/map_extras.json
 share/cataclysm-dda/json/overmap/multitile_city_buildings.json
+share/cataclysm-dda/json/overmap/overmap_connections.json
 share/cataclysm-dda/json/overmap/overmap_land_use_codes.json
+share/cataclysm-dda/json/overmap/overmap_special/campus.json
+share/cataclysm-dda/json/overmap/overmap_special/specials.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_abstract.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_agricultural.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_campus.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_cemetery.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_commercial.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_evac_center.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_faction_base.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_fungal.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_industrial.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_lab.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_mall.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_mansion.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_mi-go.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_microlab.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_military.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_necropolis.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_private_resort.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_ranch_camp.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_recreational.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_residential.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_river.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_robofachq.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_transportation.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json
+share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_waterbody.json
 share/cataclysm-dda/json/overmap/special_locations.json
-share/cataclysm-dda/json/overmap/specials.json
-share/cataclysm-dda/json/overmap_connections.json
-share/cataclysm-dda/json/overmap_terrain.json
-share/cataclysm-dda/json/overmap_terrain_abstract.json
 share/cataclysm-dda/json/player_activities.json
 share/cataclysm-dda/json/professions.json
+share/cataclysm-dda/json/recipes/ammo/40x46mm.json
+share/cataclysm-dda/json/recipes/ammo/40x53mm.json
 share/cataclysm-dda/json/recipes/ammo/components.json
-share/cataclysm-dda/json/recipes/ammo/grenades.json
 share/cataclysm-dda/json/recipes/ammo/pistol.json
 share/cataclysm-dda/json/recipes/ammo/rifle.json
 share/cataclysm-dda/json/recipes/ammo/shot.json
+share/cataclysm-dda/json/recipes/ammo/weldgas.json
 share/cataclysm-dda/json/recipes/armor/arms.json
 share/cataclysm-dda/json/recipes/armor/feet.json
 share/cataclysm-dda/json/recipes/armor/hands.json
 share/cataclysm-dda/json/recipes/armor/head.json
 share/cataclysm-dda/json/recipes/armor/legs.json
 share/cataclysm-dda/json/recipes/armor/other.json
+share/cataclysm-dda/json/recipes/armor/pets_dog.json
+share/cataclysm-dda/json/recipes/armor/pets_horse.json
 share/cataclysm-dda/json/recipes/armor/storage.json
 share/cataclysm-dda/json/recipes/armor/suit.json
 share/cataclysm-dda/json/recipes/armor/torso.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_groups.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_defenses.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_tent.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_field_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_firestation1.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_livestock/recipe_modular_livestock_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_stone.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_saltworks/recipe_modular_saltworks_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_standard.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_storehouse/recipe_modular_storehouse_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_migo_resin.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_rammed_earth.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_primitive_field.json
 share/cataclysm-dda/json/recipes/chem/fuel.json
+share/cataclysm-dda/json/recipes/chem/mutagens.json
 share/cataclysm-dda/json/recipes/chem/other.json
 share/cataclysm-dda/json/recipes/electronics/parts.json
 share/cataclysm-dda/json/recipes/electronics/toolmod.json
-share/cataclysm-dda/json/recipes/engines.json
 share/cataclysm-dda/json/recipes/food/brewing.json
+share/cataclysm-dda/json/recipes/food/canned.json
+share/cataclysm-dda/json/recipes/food/dairy_products.json
 share/cataclysm-dda/json/recipes/food/distill.json
 share/cataclysm-dda/json/recipes/food/dry.json
 share/cataclysm-dda/json/recipes/food/frozen.json
@@ -835,17 +1550,17 @@ share/cataclysm-dda/json/recipes/other/t
 share/cataclysm-dda/json/recipes/other/vehicle.json
 share/cataclysm-dda/json/recipes/recipe_ammo.json
 share/cataclysm-dda/json/recipes/recipe_companion.json
-share/cataclysm-dda/json/recipes/recipe_construction_om.json
 share/cataclysm-dda/json/recipes/recipe_deconstruction.json
 share/cataclysm-dda/json/recipes/recipe_deconstruction_package.json
 share/cataclysm-dda/json/recipes/recipe_electronics.json
 share/cataclysm-dda/json/recipes/recipe_food.json
-share/cataclysm-dda/json/recipes/recipe_groups.json
 share/cataclysm-dda/json/recipes/recipe_medsandchemicals.json
+share/cataclysm-dda/json/recipes/recipe_obsolete.json
 share/cataclysm-dda/json/recipes/recipe_others.json
 share/cataclysm-dda/json/recipes/recipe_vehicle.json
 share/cataclysm-dda/json/recipes/recipe_weapon.json
 share/cataclysm-dda/json/recipes/recipes.json
+share/cataclysm-dda/json/recipes/recipes_holiday.json
 share/cataclysm-dda/json/recipes/weapon/bashing.json
 share/cataclysm-dda/json/recipes/weapon/cutting.json
 share/cataclysm-dda/json/recipes/weapon/explosive.json
@@ -857,38 +1572,95 @@ share/cataclysm-dda/json/regional_map_se
 share/cataclysm-dda/json/requirements/ammo.json
 share/cataclysm-dda/json/requirements/cooking_components.json
 share/cataclysm-dda/json/requirements/cooking_tools.json
+share/cataclysm-dda/json/requirements/explosives.json
 share/cataclysm-dda/json/requirements/materials.json
+share/cataclysm-dda/json/requirements/tailoring.json
 share/cataclysm-dda/json/requirements/toolsets.json
 share/cataclysm-dda/json/requirements/uncraft.json
 share/cataclysm-dda/json/requirements/vehicle.json
 share/cataclysm-dda/json/road_vehicles.json
 share/cataclysm-dda/json/rotatable_symbols.json
-share/cataclysm-dda/json/scenarios/scenarios.json
+share/cataclysm-dda/json/scenarios.json
+share/cataclysm-dda/json/scent_types.json
+share/cataclysm-dda/json/scores.json
+share/cataclysm-dda/json/skillDisplayType.json
 share/cataclysm-dda/json/skills.json
-share/cataclysm-dda/json/snippets.json
+share/cataclysm-dda/json/snippets/dimensional_exploration.json
+share/cataclysm-dda/json/snippets/epilogue_factions.json
+share/cataclysm-dda/json/snippets/epilogue_npc.json
+share/cataclysm-dda/json/snippets/fliers.json
+share/cataclysm-dda/json/snippets/graffiti.json
+share/cataclysm-dda/json/snippets/hazardous_waste_sarcophagus.json
+share/cataclysm-dda/json/snippets/health_msgs.json
+share/cataclysm-dda/json/snippets/lab.json
+share/cataclysm-dda/json/snippets/music.json
+share/cataclysm-dda/json/snippets/newspapers.json
+share/cataclysm-dda/json/snippets/radio.json
+share/cataclysm-dda/json/snippets/schizophrenia.json
+share/cataclysm-dda/json/snippets/snippets.json
+share/cataclysm-dda/json/snippets/survivor_notes.json
 share/cataclysm-dda/json/species.json
 share/cataclysm-dda/json/speech.json
 share/cataclysm-dda/json/start_locations.json
 share/cataclysm-dda/json/techniques.json
-share/cataclysm-dda/json/terrain.json
 share/cataclysm-dda/json/test_regions.json
 share/cataclysm-dda/json/tool_qualities.json
 share/cataclysm-dda/json/traps.json
 share/cataclysm-dda/json/tutorial.json
+share/cataclysm-dda/json/uncraft/ammo/10mm.json
+share/cataclysm-dda/json/uncraft/ammo/22.json
+share/cataclysm-dda/json/uncraft/ammo/223.json
+share/cataclysm-dda/json/uncraft/ammo/270win.json
+share/cataclysm-dda/json/uncraft/ammo/30-06.json
+share/cataclysm-dda/json/uncraft/ammo/300.json
+share/cataclysm-dda/json/uncraft/ammo/300blk.json
+share/cataclysm-dda/json/uncraft/ammo/308.json
+share/cataclysm-dda/json/uncraft/ammo/32.json
+share/cataclysm-dda/json/uncraft/ammo/357mag.json
+share/cataclysm-dda/json/uncraft/ammo/357sig.json
 share/cataclysm-dda/json/uncraft/ammo/38.json
+share/cataclysm-dda/json/uncraft/ammo/380.json
+share/cataclysm-dda/json/uncraft/ammo/38super.json
 share/cataclysm-dda/json/uncraft/ammo/40.json
+share/cataclysm-dda/json/uncraft/ammo/410shot.json
+share/cataclysm-dda/json/uncraft/ammo/44.json
 share/cataclysm-dda/json/uncraft/ammo/45.json
+share/cataclysm-dda/json/uncraft/ammo/454.json
+share/cataclysm-dda/json/uncraft/ammo/4570.json
+share/cataclysm-dda/json/uncraft/ammo/45colt.json
+share/cataclysm-dda/json/uncraft/ammo/460.json
+share/cataclysm-dda/json/uncraft/ammo/46mm.json
+share/cataclysm-dda/json/uncraft/ammo/500.json
+share/cataclysm-dda/json/uncraft/ammo/50bmg.json
+share/cataclysm-dda/json/uncraft/ammo/545.json
+share/cataclysm-dda/json/uncraft/ammo/556.json
+share/cataclysm-dda/json/uncraft/ammo/57mm.json
+share/cataclysm-dda/json/uncraft/ammo/5x50.json
+share/cataclysm-dda/json/uncraft/ammo/700nx.json
 share/cataclysm-dda/json/uncraft/ammo/762x25.json
+share/cataclysm-dda/json/uncraft/ammo/762x39.json
+share/cataclysm-dda/json/uncraft/ammo/762x51.json
+share/cataclysm-dda/json/uncraft/ammo/762x54.json
 share/cataclysm-dda/json/uncraft/ammo/9mm.json
-share/cataclysm-dda/json/uncraft/ammo/flintlock.json
+share/cataclysm-dda/json/uncraft/ammo/9x18mm.json
+share/cataclysm-dda/json/uncraft/ammo/atgm.json
 share/cataclysm-dda/json/uncraft/ammo/shot.json
+share/cataclysm-dda/json/uncraft/armor.json
+share/cataclysm-dda/json/uncraft/armor/pets_dog.json
+share/cataclysm-dda/json/uncraft/armor/storage.json
+share/cataclysm-dda/json/uncraft/armor/suit.json
 share/cataclysm-dda/json/uncraft/cbm/cbm.json
 share/cataclysm-dda/json/uncraft/classes/ammo.json
+share/cataclysm-dda/json/uncraft/food/sourdough.json
 share/cataclysm-dda/json/uncraft/generic.json
+share/cataclysm-dda/json/uncraft/tool/deployable.json
+share/cataclysm-dda/json/uncraft/tools.json
 share/cataclysm-dda/json/uncraft/vehicle/alternator.json
+share/cataclysm-dda/json/uncraft/vehicle/engines.json
+share/cataclysm-dda/json/uncraft/vehicle/noise.json
 share/cataclysm-dda/json/uncraft/weapon/explosive.json
+share/cataclysm-dda/json/uncraft/weapon/ranged.json
 share/cataclysm-dda/json/vehicle_groups.json
-share/cataclysm-dda/json/vehicle_parts.json
 share/cataclysm-dda/json/vehicleparts/alternator.json
 share/cataclysm-dda/json/vehicleparts/armor.json
 share/cataclysm-dda/json/vehicleparts/battery.json
@@ -904,9 +1676,11 @@ share/cataclysm-dda/json/vehicleparts/mo
 share/cataclysm-dda/json/vehicleparts/rams.json
 share/cataclysm-dda/json/vehicleparts/tanks.json
 share/cataclysm-dda/json/vehicleparts/turret.json
+share/cataclysm-dda/json/vehicleparts/vehicle_parts.json
 share/cataclysm-dda/json/vehicleparts/vp_flags.json
 share/cataclysm-dda/json/vehicleparts/wheel.json
 share/cataclysm-dda/json/vehicles/bikes.json
+share/cataclysm-dda/json/vehicles/boats.json
 share/cataclysm-dda/json/vehicles/cars.json
 share/cataclysm-dda/json/vehicles/carts.json
 share/cataclysm-dda/json/vehicles/custom_vehicles.json
@@ -921,54 +1695,116 @@ share/cataclysm-dda/json/vehicles/utilit
 share/cataclysm-dda/json/vehicles/vans_busses.json
 share/cataclysm-dda/json/vehicles/vehicles.json
 share/cataclysm-dda/json/vitamin.json
-share/cataclysm-dda/lua/autoexec.lua
-share/cataclysm-dda/lua/class_definitions.lua
-share/cataclysm-dda/lua/log.lua
-share/cataclysm-dda/mods/Animatronics/animatronics.json
-share/cataclysm-dda/mods/Animatronics/bankrupt_pizzeria.json
-share/cataclysm-dda/mods/Animatronics/dead_animatronics.json
-share/cataclysm-dda/mods/Animatronics/modinfo.json
-share/cataclysm-dda/mods/Animatronics/regional_overlay.json
-share/cataclysm-dda/mods/Animatronics/snippets.json
-share/cataclysm-dda/mods/Animatronics/speech.json
-share/cataclysm-dda/mods/Boats/b_item_groups.json
-share/cataclysm-dda/mods/Boats/b_items.json
-share/cataclysm-dda/mods/Boats/b_recipes.json
-share/cataclysm-dda/mods/Boats/items_vehicleparts_boats.json
-share/cataclysm-dda/mods/Boats/modinfo.json
-share/cataclysm-dda/mods/Boats/overmap_terrain.json
-share/cataclysm-dda/mods/Boats/specials.json
-share/cataclysm-dda/mods/Boats/vehicle_groups_boats.json
-share/cataclysm-dda/mods/Boats/vehicleparts_boats.json
-share/cataclysm-dda/mods/Boats/vehicles_boats.json
-share/cataclysm-dda/mods/Boats/whaleys_boat_rental.json
-share/cataclysm-dda/mods/Boats/whaleys_boats.json
-share/cataclysm-dda/mods/Boats/whaleys_house_river.json
-share/cataclysm-dda/mods/BrightNights/bionics.json
-share/cataclysm-dda/mods/BrightNights/effects.json
-share/cataclysm-dda/mods/BrightNights/game_balance.json
-share/cataclysm-dda/mods/BrightNights/gun.json
-share/cataclysm-dda/mods/BrightNights/item groups/locations.json
-share/cataclysm-dda/mods/BrightNights/item_groups.json
-share/cataclysm-dda/mods/BrightNights/items/bionics.json
-share/cataclysm-dda/mods/BrightNights/items/books.json
-share/cataclysm-dda/mods/BrightNights/items/generic.json
-share/cataclysm-dda/mods/BrightNights/items/med.json
-share/cataclysm-dda/mods/BrightNights/mapgen/map_palletes.json
-share/cataclysm-dda/mods/BrightNights/mapgen/municipal_microreactor.json
-share/cataclysm-dda/mods/BrightNights/mapgen/s_gas.json
-share/cataclysm-dda/mods/BrightNights/misc.json
-share/cataclysm-dda/mods/BrightNights/modinfo.json
-share/cataclysm-dda/mods/BrightNights/overmap_specials.json
-share/cataclysm-dda/mods/BrightNights/overmap_terrain.json
-share/cataclysm-dda/mods/BrightNights/recipe.json
-share/cataclysm-dda/mods/BrightNights/regional_map_settings.json
-share/cataclysm-dda/mods/BrightNights/terrain.json
-share/cataclysm-dda/mods/BrightNights/vehicle_groups.json
-share/cataclysm-dda/mods/BrightNights/vehicle_parts.json
-share/cataclysm-dda/mods/BrightNights/vehicles/cars.json
-share/cataclysm-dda/mods/Craft_Gunpowder/cgp_magazine.json
-share/cataclysm-dda/mods/Craft_Gunpowder/cgp_ranged.json
+share/cataclysm-dda/mods/Aftershock/README.md
+share/cataclysm-dda/mods/Aftershock/items/afs_harvest.json
+share/cataclysm-dda/mods/Aftershock/items/ammo.json
+share/cataclysm-dda/mods/Aftershock/items/ammo_type.json
+share/cataclysm-dda/mods/Aftershock/items/armor.json
+share/cataclysm-dda/mods/Aftershock/items/bioparts.json
+share/cataclysm-dda/mods/Aftershock/items/books.json
+share/cataclysm-dda/mods/Aftershock/items/cast_spell_items.json
+share/cataclysm-dda/mods/Aftershock/items/cbms.json
+share/cataclysm-dda/mods/Aftershock/items/comestibles.json
+share/cataclysm-dda/mods/Aftershock/items/corpses.json
+share/cataclysm-dda/mods/Aftershock/items/furniture.json
+share/cataclysm-dda/mods/Aftershock/items/gun/5x50.json
+share/cataclysm-dda/mods/Aftershock/items/gun/laser.json
+share/cataclysm-dda/mods/Aftershock/items/inactiverobot.json
+share/cataclysm-dda/mods/Aftershock/items/item_groups.json
+share/cataclysm-dda/mods/Aftershock/items/item_overrides.json
+share/cataclysm-dda/mods/Aftershock/items/items.json
+share/cataclysm-dda/mods/Aftershock/items/materials.json
+share/cataclysm-dda/mods/Aftershock/items/monster_drops.json
+share/cataclysm-dda/mods/Aftershock/items/monsterdrops.json
+share/cataclysm-dda/mods/Aftershock/items/obsolete.json
+share/cataclysm-dda/mods/Aftershock/items/robotparts.json
+share/cataclysm-dda/mods/Aftershock/items/tool_quality.json
+share/cataclysm-dda/mods/Aftershock/items/tools.json
+share/cataclysm-dda/mods/Aftershock/items/weapons.json
+share/cataclysm-dda/mods/Aftershock/maps/furniture.json
+share/cataclysm-dda/mods/Aftershock/maps/item_groups.json
+share/cataclysm-dda/mods/Aftershock/maps/lab_vehicle_track.json
+share/cataclysm-dda/mods/Aftershock/maps/lab_weapons_range.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/fungal_siege.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/map_palletes.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/municipal_microreactor.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/prepnet_orchard.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/s_gas.json
+share/cataclysm-dda/mods/Aftershock/maps/overmap_specials.json
+share/cataclysm-dda/mods/Aftershock/maps/overmap_terrain.json
+share/cataclysm-dda/mods/Aftershock/maps/regional_map_settings.json
+share/cataclysm-dda/mods/Aftershock/maps/terrain.json
+share/cataclysm-dda/mods/Aftershock/martialarts.json
+share/cataclysm-dda/mods/Aftershock/mobs/PrepPhyle_mobs.json
+share/cataclysm-dda/mods/Aftershock/mobs/harvest.json
+share/cataclysm-dda/mods/Aftershock/mobs/monster_faction.json
+share/cataclysm-dda/mods/Aftershock/mobs/monster_groups.json
+share/cataclysm-dda/mods/Aftershock/mobs/robots.json
+share/cataclysm-dda/mods/Aftershock/mobs/zombies.json
+share/cataclysm-dda/mods/Aftershock/modinfo.json
+share/cataclysm-dda/mods/Aftershock/mutations/mutations.json
+share/cataclysm-dda/mods/Aftershock/npcs/classes.json
+share/cataclysm-dda/mods/Aftershock/npcs/factions.json
+share/cataclysm-dda/mods/Aftershock/npcs/npc.json
+share/cataclysm-dda/mods/Aftershock/npcs/prepnet_dialogue.json
+share/cataclysm-dda/mods/Aftershock/npcs/prepnet_phyle/prepnet_trade.json
+share/cataclysm-dda/mods/Aftershock/player/bionics.json
+share/cataclysm-dda/mods/Aftershock/player/mutations.json
+share/cataclysm-dda/mods/Aftershock/player/obsolete.json
+share/cataclysm-dda/mods/Aftershock/player/professions.json
+share/cataclysm-dda/mods/Aftershock/player/techniques.json
+share/cataclysm-dda/mods/Aftershock/recipes/armor_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/bionic_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/comestible_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/construction.json
+share/cataclysm-dda/mods/Aftershock/recipes/deconstruction.json
+share/cataclysm-dda/mods/Aftershock/recipes/obsolete.json
+share/cataclysm-dda/mods/Aftershock/recipes/recipe_overrides.json
+share/cataclysm-dda/mods/Aftershock/recipes/recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/requirements.json
+share/cataclysm-dda/mods/Aftershock/recipes/uncraft.json
+share/cataclysm-dda/mods/Aftershock/scenarios.json
+share/cataclysm-dda/mods/Aftershock/speech.json
+share/cataclysm-dda/mods/Aftershock/spells/hologram_spells.json
+share/cataclysm-dda/mods/Aftershock/vehicles/part_items.json
+share/cataclysm-dda/mods/Aftershock/vehicles/vehicle_groups.json
+share/cataclysm-dda/mods/Aftershock/vehicles/vehicle_overrides.json
+share/cataclysm-dda/mods/Aftershock/vehicles/vehicle_parts.json
+share/cataclysm-dda/mods/Aftershock/vehicles/vehicles.json
+share/cataclysm-dda/mods/CRT_EXPANSION/constructions/crt_constructions.json
+share/cataclysm-dda/mods/CRT_EXPANSION/constructions/crt_terrain.json
+share/cataclysm-dda/mods/CRT_EXPANSION/crt_materials.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_ammo.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_ammotypes.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_armor.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_clothes.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_generic.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_gun.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_gunmods.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_item_groups.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_recipes.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_toolarmor.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_tools.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/CRT_Bladework.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/crt_gun_techniques.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/dragonslayertechn.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/generaltechn.json
+share/cataclysm-dda/mods/CRT_EXPANSION/martial/stabtechn.json
+share/cataclysm-dda/mods/CRT_EXPANSION/modinfo.json
+share/cataclysm-dda/mods/CRT_EXPANSION/monsters/crt_monster.json
+share/cataclysm-dda/mods/CRT_EXPANSION/monsters/crt_monstergroups.json
+share/cataclysm-dda/mods/CRT_EXPANSION/monsters/monster.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_mut_itemgroups.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_mutatinoc.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_vamp_mutations.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_wendigo_mutations.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/vamp_mut_cat.json
+share/cataclysm-dda/mods/CRT_EXPANSION/mutations/wendigo_mut_cat.json
+share/cataclysm-dda/mods/CRT_EXPANSION/readme/README.md
+share/cataclysm-dda/mods/CRT_EXPANSION/scenarios/crt_classes.json
+share/cataclysm-dda/mods/CRT_EXPANSION/scenarios/crt_scenarios.json
 share/cataclysm-dda/mods/Craft_Gunpowder/cgp_recipes.json
 share/cataclysm-dda/mods/Craft_Gunpowder/modinfo.json
 share/cataclysm-dda/mods/CrazyCataclysm/crazy_aperturepotato.json
@@ -977,17 +1813,10 @@ share/cataclysm-dda/mods/CrazyCataclysm/
 share/cataclysm-dda/mods/CrazyCataclysm/crazy_items.json
 share/cataclysm-dda/mods/CrazyCataclysm/crazy_monstergroups.json
 share/cataclysm-dda/mods/CrazyCataclysm/crazy_monsters.json
+share/cataclysm-dda/mods/CrazyCataclysm/crazy_recipes.json
 share/cataclysm-dda/mods/CrazyCataclysm/crazy_speech.json
+share/cataclysm-dda/mods/CrazyCataclysm/crazy_vehicles.json
 share/cataclysm-dda/mods/CrazyCataclysm/modinfo.json
-share/cataclysm-dda/mods/DeadPeople_Chesthole/Chest_Items.png
-share/cataclysm-dda/mods/DeadPeople_Chesthole/mod_tileset.json
-share/cataclysm-dda/mods/DeadPeople_Chesthole/modinfo.json
-share/cataclysm-dda/mods/DeadPeople_Hybrid/Hybrid_Items.png
-share/cataclysm-dda/mods/DeadPeople_Hybrid/mod_tileset.json
-share/cataclysm-dda/mods/DeadPeople_Hybrid/modinfo.json
-share/cataclysm-dda/mods/DeadPeople_Xotto/Xotto_Items.png
-share/cataclysm-dda/mods/DeadPeople_Xotto/mod_tileset.json
-share/cataclysm-dda/mods/DeadPeople_Xotto/modinfo.json
 share/cataclysm-dda/mods/DeoxyMod/Deoxy_vehicle_parts.json
 share/cataclysm-dda/mods/DeoxyMod/modinfo.json
 share/cataclysm-dda/mods/DinoMod/dinosaur.json
@@ -1007,8 +1836,6 @@ share/cataclysm-dda/mods/EW_Pack/ew_reci
 share/cataclysm-dda/mods/EW_Pack/ew_weapons.json
 share/cataclysm-dda/mods/EW_Pack/modinfo.json
 share/cataclysm-dda/mods/EW_Pack/obsolete.json
-share/cataclysm-dda/mods/Fast_Zombies/main.lua
-share/cataclysm-dda/mods/Fast_Zombies/modinfo.json
 share/cataclysm-dda/mods/FictonalWeapons/fic_item_groups.json
 share/cataclysm-dda/mods/FictonalWeapons/fic_mods.json
 share/cataclysm-dda/mods/FictonalWeapons/fic_recipes.json
@@ -1016,7 +1843,14 @@ share/cataclysm-dda/mods/FictonalWeapons
 share/cataclysm-dda/mods/FictonalWeapons/ficmags.json
 share/cataclysm-dda/mods/FictonalWeapons/modinfo.json
 share/cataclysm-dda/mods/FictonalWeapons/snippets.json
-share/cataclysm-dda/mods/Filthy_Morale/modinfo.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/modinfo.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/npc/NC_ARMY.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/npc/NC_OPS.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/npc/classes.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/prof/army.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/prof/itemgroups_prof.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/prof/spc.json
+share/cataclysm-dda/mods/Fuji_Mil_Prof/scenarios.json
 share/cataclysm-dda/mods/Fuji_Structures/items/itemgroups.json
 share/cataclysm-dda/mods/Fuji_Structures/items/items_games.json
 share/cataclysm-dda/mods/Fuji_Structures/items/vehicle_groups.json
@@ -1048,74 +1882,285 @@ share/cataclysm-dda/mods/Fuji_Structures
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_g0.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_g1.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/_house_template.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_1.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_10.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_2.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_3.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_4.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_5.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_6.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_7.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_8.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_9.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house33.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house34.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house35.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house36.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house37.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house38.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house39.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house40.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house41.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house42.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_00.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_01.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_10.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_11.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_road_0.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_road_1.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/overmap_multitile_city.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/overmap_specials.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/overmap_terrain.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/palette_electronic.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/regional_overlay.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_apt.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_apt_2.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_camping.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_cardealer.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_diner.json
+share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_electronicstore.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_games.json
 share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_gunstore.json
-share/cataclysm-dda/mods/Generic_Guns/gg_ammo_blacklist.json
-share/cataclysm-dda/mods/Generic_Guns/gg_ammo_hand_override.json
-share/cataclysm-dda/mods/Generic_Guns/gg_ammo_override.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/black_powder.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/casings.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/gg_ammo_migration.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/gg_casings_migration.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/grenade.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/pistol.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/pistol_magnum.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/pistol_tiny.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/rifle.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/rifle_huge.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/rocket.json
+share/cataclysm-dda/mods/Generic_Guns/ammo/shot.json
+share/cataclysm-dda/mods/Generic_Guns/bandoliers/bandolier.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/black_powder.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/gg_firearms_migration.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/grenade.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/pistol.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/pistol_magnum.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/pistol_tiny.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/rifle.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/rifle_huge.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/rocket.json
+share/cataclysm-dda/mods/Generic_Guns/firearms/shot.json
 share/cataclysm-dda/mods/Generic_Guns/gg_ammunition_types.json
-share/cataclysm-dda/mods/Generic_Guns/gg_bandolier_override.json
-share/cataclysm-dda/mods/Generic_Guns/gg_guns.json
-share/cataclysm-dda/mods/Generic_Guns/gg_guns_blacklist.json
-share/cataclysm-dda/mods/Generic_Guns/gg_guns_override.json
-share/cataclysm-dda/mods/Generic_Guns/gg_itemgroups_ammo.json
-share/cataclysm-dda/mods/Generic_Guns/gg_itemgroups_guns.json
-share/cataclysm-dda/mods/Generic_Guns/gg_magazines_blacklist.json
-share/cataclysm-dda/mods/Generic_Guns/gg_magazines_override.json
-share/cataclysm-dda/mods/Generic_Guns/gg_other_blacklist.json
-share/cataclysm-dda/mods/Generic_Guns/gg_vehicle_override.json
+share/cataclysm-dda/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
+share/cataclysm-dda/mods/Generic_Guns/gunmods/gg_gunmods_migration.json
+share/cataclysm-dda/mods/Generic_Guns/gunmods/gunmods.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/gg_magazines_blacklist.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/gg_magazines_migration.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/grenade.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/pistol.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/pistol_magnum.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/pistol_tiny.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/rifle.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/rifle_huge.json
+share/cataclysm-dda/mods/Generic_Guns/magazines/shot.json
 share/cataclysm-dda/mods/Generic_Guns/modinfo.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipe_obsolete.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_deconstruction.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_firearms_repeater.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_firearms_single.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_grenade_propelled.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_pistol.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_rifle.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_shot.json
+share/cataclysm-dda/mods/Generic_Guns/recipes/requirements.json
+share/cataclysm-dda/mods/Generic_Guns/robots/active_bots.json
+share/cataclysm-dda/mods/Generic_Guns/robots/broken_bots.json
+share/cataclysm-dda/mods/Generic_Guns/robots/inactive_bots.json
+share/cataclysm-dda/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json
+share/cataclysm-dda/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json
+share/cataclysm-dda/mods/Generic_Guns/vehicles/turrets.json
+share/cataclysm-dda/mods/Graphical_Overmap/base_colors.json
+share/cataclysm-dda/mods/Graphical_Overmap/fonts.json.txt
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_abstract.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_agricultural.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_campus.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_cemetery.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_commercial.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_evac_center.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_faction_base.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_fungal.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_hardcoded.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_industrial.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_lab.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_mall.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_mansion.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_mi-go.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_microlab.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_military.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_necropolis.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_private_resort.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_public_institutional.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_ranch_camp.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_recreational.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_residential.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_river.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_robofachq.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_test.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_transportation.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_waste_junk.json
+share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_waterbody.json
+share/cataclysm-dda/mods/Graphical_Overmap/modinfo.json
+share/cataclysm-dda/mods/Graphical_Overmap/readme.txt
+share/cataclysm-dda/mods/Graphical_Overmap_FujiStruct/modinfo.json
+share/cataclysm-dda/mods/Graphical_Overmap_FujiStruct/overmap_terrain_fujistruct.json
+share/cataclysm-dda/mods/Graphical_Overmap_More_Locations/modinfo.json
+share/cataclysm-dda/mods/Graphical_Overmap_More_Locations/overmap_terrain_more_locations.json
+share/cataclysm-dda/mods/Graphical_Overmap_Urban_Development/modinfo.json
+share/cataclysm-dda/mods/Graphical_Overmap_Urban_Development/overmap_terrain_urban_development.json
 share/cataclysm-dda/mods/Growable_pots/items.json
 share/cataclysm-dda/mods/Growable_pots/modinfo.json
 share/cataclysm-dda/mods/Growable_pots/recipes.json
+share/cataclysm-dda/mods/HeavyMining/modinfo.json
+share/cataclysm-dda/mods/HeavyMining/parts.json
+share/cataclysm-dda/mods/HeavyMining/vehicle_groups.json
+share/cataclysm-dda/mods/HeavyMining/vehicles.json
+share/cataclysm-dda/mods/Hydroponics/construction.json
+share/cataclysm-dda/mods/Hydroponics/furniture.json
+share/cataclysm-dda/mods/Hydroponics/game_balance.json
+share/cataclysm-dda/mods/Hydroponics/item_groups.json
+share/cataclysm-dda/mods/Hydroponics/mapgen/basement_hydrop.json
+share/cataclysm-dda/mods/Hydroponics/mapgen/lab_floorplans_1side.json
+share/cataclysm-dda/mods/Hydroponics/mapgen/lab_rooms.json
+share/cataclysm-dda/mods/Hydroponics/modinfo.json
+share/cataclysm-dda/mods/Hydroponics/requirements.json
+share/cataclysm-dda/mods/Hydroponics/terrain.json
+share/cataclysm-dda/mods/Hydroponics/tpalletes.json
+share/cataclysm-dda/mods/MMA/item_groups.json
+share/cataclysm-dda/mods/MMA/martial.json
+share/cataclysm-dda/mods/MMA/martialarts.json
+share/cataclysm-dda/mods/MMA/modinfo.json
+share/cataclysm-dda/mods/MMA/mutations.json
+share/cataclysm-dda/mods/MMA/professions.json
+share/cataclysm-dda/mods/MMA/techniques.json
+share/cataclysm-dda/mods/Magiclysm/Spells/animist.json
+share/cataclysm-dda/mods/Magiclysm/Spells/biomancer.json
+share/cataclysm-dda/mods/Magiclysm/Spells/classless.json
+share/cataclysm-dda/mods/Magiclysm/Spells/debug.json
+share/cataclysm-dda/mods/Magiclysm/Spells/dragonbreath.json
+share/cataclysm-dda/mods/Magiclysm/Spells/druid.json
+share/cataclysm-dda/mods/Magiclysm/Spells/earthshaper.json
+share/cataclysm-dda/mods/Magiclysm/Spells/item_only.json
+share/cataclysm-dda/mods/Magiclysm/Spells/kelvinist.json
+share/cataclysm-dda/mods/Magiclysm/Spells/lizardfolk_shaman.json
+share/cataclysm-dda/mods/Magiclysm/Spells/magus.json
+share/cataclysm-dda/mods/Magiclysm/Spells/monsterspells.json
+share/cataclysm-dda/mods/Magiclysm/Spells/stormshaper.json
+share/cataclysm-dda/mods/Magiclysm/Spells/technomancer.json
+share/cataclysm-dda/mods/Magiclysm/bionics.json
+share/cataclysm-dda/mods/Magiclysm/cooking_components.json
+share/cataclysm-dda/mods/Magiclysm/effects/effects.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_belts.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_boots.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_bracers.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_gunmods.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_masks.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_melee.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_misc.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_ranged.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_rings.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_tokens.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_unarmed.json
+share/cataclysm-dda/mods/Magiclysm/enchanted/enchanted_wands.json
+share/cataclysm-dda/mods/Magiclysm/field.json
+share/cataclysm-dda/mods/Magiclysm/furniture.json
+share/cataclysm-dda/mods/Magiclysm/harvest.json
+share/cataclysm-dda/mods/Magiclysm/itemgroups/itemgroups.json
+share/cataclysm-dda/mods/Magiclysm/itemgroups/recipe_books.json
+share/cataclysm-dda/mods/Magiclysm/itemgroups/spellbooks.json
+share/cataclysm-dda/mods/Magiclysm/items/alchemy_items.json
+share/cataclysm-dda/mods/Magiclysm/items/ammo_types.json
+share/cataclysm-dda/mods/Magiclysm/items/archery.json
+share/cataclysm-dda/mods/Magiclysm/items/armor.json
+share/cataclysm-dda/mods/Magiclysm/items/bionics.json
+share/cataclysm-dda/mods/Magiclysm/items/black_dragon_items.json
+share/cataclysm-dda/mods/Magiclysm/items/cast_spell_items.json
+share/cataclysm-dda/mods/Magiclysm/items/class_runes.json
+share/cataclysm-dda/mods/Magiclysm/items/comestibles.json
+share/cataclysm-dda/mods/Magiclysm/items/constructs.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted.json
+share/cataclysm-dda/mods/Magiclysm/items/ethereal_items.json
+share/cataclysm-dda/mods/Magiclysm/items/fuel.json
+share/cataclysm-dda/mods/Magiclysm/items/mana_crystals.json
+share/cataclysm-dda/mods/Magiclysm/items/melee.json
+share/cataclysm-dda/mods/Magiclysm/items/metals.json
+share/cataclysm-dda/mods/Magiclysm/items/obsolete.json
+share/cataclysm-dda/mods/Magiclysm/items/recipe_books.json
+share/cataclysm-dda/mods/Magiclysm/items/spell_scrolls.json
+share/cataclysm-dda/mods/Magiclysm/items/spellbooks.json
+share/cataclysm-dda/mods/Magiclysm/items/tools.json
+share/cataclysm-dda/mods/Magiclysm/items/vehicle/frames.json
+share/cataclysm-dda/mods/Magiclysm/items/vehicle_parts.json
+share/cataclysm-dda/mods/Magiclysm/items/weapons.json
+share/cataclysm-dda/mods/Magiclysm/lore.md
+share/cataclysm-dda/mods/Magiclysm/magic_balance.md
+share/cataclysm-dda/mods/Magiclysm/martialarts.json
+share/cataclysm-dda/mods/Magiclysm/materials.json
+share/cataclysm-dda/mods/Magiclysm/modinfo.json
+share/cataclysm-dda/mods/Magiclysm/monster_attacks.json
+share/cataclysm-dda/mods/Magiclysm/monster_factions.json
+share/cataclysm-dda/mods/Magiclysm/monstergroups.json
+share/cataclysm-dda/mods/Magiclysm/monstergroups_egg.json
+share/cataclysm-dda/mods/Magiclysm/monsters.json
+share/cataclysm-dda/mods/Magiclysm/monsters/demon_spider.json
+share/cataclysm-dda/mods/Magiclysm/monsters/dragon.json
+share/cataclysm-dda/mods/Magiclysm/monsters/golems.json
+share/cataclysm-dda/mods/Magiclysm/monsters/lizardfolk.json
+share/cataclysm-dda/mods/Magiclysm/monsters/monsters.json
+share/cataclysm-dda/mods/Magiclysm/npc/TALK_HEALER_GREY.json
+share/cataclysm-dda/mods/Magiclysm/npc/TALK_OLD_MAGUS.json
+share/cataclysm-dda/mods/Magiclysm/npc/TALK_TECHNO_KID.json
+share/cataclysm-dda/mods/Magiclysm/npc/classes.json
+share/cataclysm-dda/mods/Magiclysm/npc/factions.json
+share/cataclysm-dda/mods/Magiclysm/npc/items_worn.json
+share/cataclysm-dda/mods/Magiclysm/npc/missiondef.json
+share/cataclysm-dda/mods/Magiclysm/npc/npc.json
+share/cataclysm-dda/mods/Magiclysm/professions.json
+share/cataclysm-dda/mods/Magiclysm/recipes.json
+share/cataclysm-dda/mods/Magiclysm/recipes/alchemy.json
+share/cataclysm-dda/mods/Magiclysm/recipes/construction.json
+share/cataclysm-dda/mods/Magiclysm/recipes/cooking.json
+share/cataclysm-dda/mods/Magiclysm/recipes/deconstruction.json
+share/cataclysm-dda/mods/Magiclysm/recipes/dragon_black.json
+share/cataclysm-dda/mods/Magiclysm/recipes/magic_tools.json
+share/cataclysm-dda/mods/Magiclysm/recipes/mods.json
+share/cataclysm-dda/mods/Magiclysm/recipes/recipe_potions.json
+share/cataclysm-dda/mods/Magiclysm/recipes/weapons.json
+share/cataclysm-dda/mods/Magiclysm/requirements/alchemy.json
+share/cataclysm-dda/mods/Magiclysm/requirements/cooking_components.json
+share/cataclysm-dda/mods/Magiclysm/requirements/metal.json
+share/cataclysm-dda/mods/Magiclysm/scenarios.json
+share/cataclysm-dda/mods/Magiclysm/species.json
+share/cataclysm-dda/mods/Magiclysm/start_locations.json
+share/cataclysm-dda/mods/Magiclysm/ter_fur_transform/ter_fur_transform.json
+share/cataclysm-dda/mods/Magiclysm/terrain.json
+share/cataclysm-dda/mods/Magiclysm/tool_qualities.json
+share/cataclysm-dda/mods/Magiclysm/traits/classes.json
+share/cataclysm-dda/mods/Magiclysm/traits/mutation.json
+share/cataclysm-dda/mods/Magiclysm/vehicle_groups.json
+share/cataclysm-dda/mods/Magiclysm/vehicleparts/frames.json
+share/cataclysm-dda/mods/Magiclysm/vehicleparts/vehicle_parts.json
+share/cataclysm-dda/mods/Magiclysm/vehicles/bikes.json
+share/cataclysm-dda/mods/Magiclysm/vehicles/vans_busses.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/black_dragon_lair.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/demon_spider_lair.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/lake_retreat.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/magic_basement.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/magic_cabin.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/magic_shop.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/multitile_city_buildings.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/overmap_specials.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/overmap_terrain.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/regional_overlay.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/used_bookstore.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/wizard-towers.json
 share/cataclysm-dda/mods/ManualBionicInstall/game_balance.json
 share/cataclysm-dda/mods/ManualBionicInstall/modinfo.json
-share/cataclysm-dda/mods/Medieval_Stuff/ammo.json
 share/cataclysm-dda/mods/Medieval_Stuff/ammo_types.json
-share/cataclysm-dda/mods/Medieval_Stuff/armor.json
 share/cataclysm-dda/mods/Medieval_Stuff/handloaded_bullets.json
 share/cataclysm-dda/mods/Medieval_Stuff/item_groups.json
-share/cataclysm-dda/mods/Medieval_Stuff/martial_arts_manuals.json
-share/cataclysm-dda/mods/Medieval_Stuff/martialarts.json
-share/cataclysm-dda/mods/Medieval_Stuff/materials.json
-share/cataclysm-dda/mods/Medieval_Stuff/melee.json
 share/cataclysm-dda/mods/Medieval_Stuff/modinfo.json
-share/cataclysm-dda/mods/Medieval_Stuff/mutations.json
 share/cataclysm-dda/mods/Medieval_Stuff/professions.json
 share/cataclysm-dda/mods/Medieval_Stuff/ranged.json
 share/cataclysm-dda/mods/Medieval_Stuff/recipe_ammo.json
-share/cataclysm-dda/mods/Medieval_Stuff/recipe_armor.json
-share/cataclysm-dda/mods/Medieval_Stuff/recipe_others.json
 share/cataclysm-dda/mods/Medieval_Stuff/recipe_shields.json
-share/cataclysm-dda/mods/Medieval_Stuff/recipe_weapons.json
-share/cataclysm-dda/mods/Medieval_Stuff/requirements.json
+share/cataclysm-dda/mods/Medieval_Stuff/recipe_weapon.json
 share/cataclysm-dda/mods/Medieval_Stuff/shields.json
-share/cataclysm-dda/mods/Medieval_Stuff/snippets.json
-share/cataclysm-dda/mods/Medieval_Stuff/techniques.json
 share/cataclysm-dda/mods/Medieval_Stuff/tools.json
 share/cataclysm-dda/mods/Modular_Turrets/blacklist.json
 share/cataclysm-dda/mods/Modular_Turrets/corpses.json
@@ -1133,40 +2178,6 @@ share/cataclysm-dda/mods/Modular_Turrets
 share/cataclysm-dda/mods/Modular_Turrets/roboguns.json
 share/cataclysm-dda/mods/Modular_Turrets/uncraft.json
 share/cataclysm-dda/mods/Modular_Turrets/uncraft_corpse.json
-share/cataclysm-dda/mods/More_Buildings/json/baseballfield_a1.json
-share/cataclysm-dda/mods/More_Buildings/json/baseballfield_a2.json
-share/cataclysm-dda/mods/More_Buildings/json/baseballfield_b1.json
-share/cataclysm-dda/mods/More_Buildings/json/baseballfield_b2.json
-share/cataclysm-dda/mods/More_Buildings/json/daycare.json
-share/cataclysm-dda/mods/More_Buildings/json/map_palletes.json
-share/cataclysm-dda/mods/More_Buildings/json/petstore.json
-share/cataclysm-dda/mods/More_Buildings/json/restparking_1.json
-share/cataclysm-dda/mods/More_Buildings/json/restparking_2.json
-share/cataclysm-dda/mods/More_Buildings/json/reststop_1.json
-share/cataclysm-dda/mods/More_Buildings/json/reststop_2.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a1.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a2.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a3.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a4.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a5.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_a6.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b1.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b2.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b3.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b4.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b5.json
-share/cataclysm-dda/mods/More_Buildings/json/shoppingplaza_b6.json
-share/cataclysm-dda/mods/More_Buildings/json/storageunits_1.json
-share/cataclysm-dda/mods/More_Buildings/json/storageunits_2.json
-share/cataclysm-dda/mods/More_Buildings/json/storageunits_3.json
-share/cataclysm-dda/mods/More_Buildings/json/storageunits_small_1.json
-share/cataclysm-dda/mods/More_Buildings/json/storageunits_small_2.json
-share/cataclysm-dda/mods/More_Buildings/json/thrift.json
-share/cataclysm-dda/mods/More_Buildings/json/vfw.json
-share/cataclysm-dda/mods/More_Buildings/modinfo.json
-share/cataclysm-dda/mods/More_Buildings/overmap_specials.json
-share/cataclysm-dda/mods/More_Buildings/overmap_terrain.json
-share/cataclysm-dda/mods/More_Buildings/regional_overlay.json
 share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_01.json
 share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_02.json
 share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_03.json
@@ -1458,7 +2469,6 @@ share/cataclysm-dda/mods/More_Locations/
 share/cataclysm-dda/mods/More_Locations/factory/factory_trc_05.json
 share/cataclysm-dda/mods/More_Locations/factory/overmap_specials.json
 share/cataclysm-dda/mods/More_Locations/factory/overmap_terrain.json
-share/cataclysm-dda/mods/More_Locations/furniture.json
 share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_1be_00.json
 share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_1be_01.json
 share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_1blc_00.json
@@ -1955,32 +2965,50 @@ share/cataclysm-dda/mods/More_Locations/
 share/cataclysm-dda/mods/More_Survival_Tools/ammo.json
 share/cataclysm-dda/mods/More_Survival_Tools/ammo_types.json
 share/cataclysm-dda/mods/More_Survival_Tools/armor.json
-share/cataclysm-dda/mods/More_Survival_Tools/construction.json
 share/cataclysm-dda/mods/More_Survival_Tools/effects.json
-share/cataclysm-dda/mods/More_Survival_Tools/furniture.json
 share/cataclysm-dda/mods/More_Survival_Tools/item_groups.json
 share/cataclysm-dda/mods/More_Survival_Tools/items.json
 share/cataclysm-dda/mods/More_Survival_Tools/modinfo.json
+share/cataclysm-dda/mods/More_Survival_Tools/obsolete.json
 share/cataclysm-dda/mods/More_Survival_Tools/professions.json
 share/cataclysm-dda/mods/More_Survival_Tools/recipes.json
 share/cataclysm-dda/mods/More_Survival_Tools/scenarios.json
 share/cataclysm-dda/mods/More_Survival_Tools/snippets.json
 share/cataclysm-dda/mods/More_Survival_Tools/start_locations.json
-share/cataclysm-dda/mods/More_Survival_Tools/terrain.json
 share/cataclysm-dda/mods/More_Survival_Tools/traps.json
 share/cataclysm-dda/mods/Mundane_Zombies/modinfo.json
 share/cataclysm-dda/mods/Mundane_Zombies/z2keep.txt
 share/cataclysm-dda/mods/Mutant_NPCs/modinfo.json
 share/cataclysm-dda/mods/Mutant_NPCs/npc_classes_mutant.json
 share/cataclysm-dda/mods/Mutant_NPCs/trait_groups.json
-share/cataclysm-dda/mods/NPC_Traits/modinfo.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/modinfo.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_comestibles.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_effect.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_field_type.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_harvest.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_item_groups.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_items.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_materials.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_med.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_monster_factions.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_monster_groups.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_monsters.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_mutation_category.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_mutations.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_professions.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_recipe.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_scenarios.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_scent_types.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_snippets.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_species.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_start_locations.json
 share/cataclysm-dda/mods/NW_Pack/modinfo.json
 share/cataclysm-dda/mods/NW_Pack/nw_archery.json
 share/cataclysm-dda/mods/NW_Pack/nw_books.json
 share/cataclysm-dda/mods/NW_Pack/nw_item_groups.json
+share/cataclysm-dda/mods/NW_Pack/nw_martialarts.json
 share/cataclysm-dda/mods/NW_Pack/nw_melee.json
 share/cataclysm-dda/mods/NW_Pack/nw_recipes.json
-share/cataclysm-dda/mods/NW_Pack/nw_tools.json
 share/cataclysm-dda/mods/National_Guard_Camp/furniture.json
 share/cataclysm-dda/mods/National_Guard_Camp/item_groups.json
 share/cataclysm-dda/mods/National_Guard_Camp/military.json
@@ -1990,12 +3018,14 @@ share/cataclysm-dda/mods/National_Guard_
 share/cataclysm-dda/mods/National_Guard_Camp/national_guard_camp/national_guard_camp_b1.json
 share/cataclysm-dda/mods/National_Guard_Camp/overmap_specials.json
 share/cataclysm-dda/mods/National_Guard_Camp/overmap_terrain.json
+share/cataclysm-dda/mods/National_Guard_Camp/palettes/national_guard_camp.json
+share/cataclysm-dda/mods/National_Guard_Camp/palettes/national_guard_camp_b.json
 share/cataclysm-dda/mods/No_Acid_Zombies/modinfo.json
 share/cataclysm-dda/mods/No_Anthills/modinfo.json
 share/cataclysm-dda/mods/No_Beehives/modinfo.json
 share/cataclysm-dda/mods/No_Big_Zombies/modinfo.json
 share/cataclysm-dda/mods/No_Explosive_Zombies/modinfo.json
-share/cataclysm-dda/mods/No_Faults/modinfo.json
+share/cataclysm-dda/mods/No_Filthy_Clothes/modinfo.json
 share/cataclysm-dda/mods/No_Flaming_Weapons/modinfo.json
 share/cataclysm-dda/mods/No_Fungi/comestibles.json
 share/cataclysm-dda/mods/No_Fungi/furniture.json
@@ -2005,14 +3035,14 @@ share/cataclysm-dda/mods/No_Medieval_Ite
 share/cataclysm-dda/mods/No_Mutagen/modinfo.json
 share/cataclysm-dda/mods/No_NPC_Food/modinfo.json
 share/cataclysm-dda/mods/No_Old_guns/modinfo.json
+share/cataclysm-dda/mods/No_Rail_Stations/modinfo.json
+share/cataclysm-dda/mods/No_Rail_Stations/overmap_specials.json
+share/cataclysm-dda/mods/No_Rail_Stations/region_overlay.json
 share/cataclysm-dda/mods/No_Religious_Books/modinfo.json
-share/cataclysm-dda/mods/No_Reviving/main.lua
 share/cataclysm-dda/mods/No_Reviving/modinfo.json
 share/cataclysm-dda/mods/No_Rivtech_Guns/modinfo.json
 share/cataclysm-dda/mods/No_Survivor_Armor/modinfo.json
 share/cataclysm-dda/mods/No_Survivor_Armor/survivor.json
-share/cataclysm-dda/mods/No_Triffids/modinfo.json
-share/cataclysm-dda/mods/No_Zombie_Animals/modinfo.json
 share/cataclysm-dda/mods/Only_Wildlife/modinfo.json
 share/cataclysm-dda/mods/RL_Classes/classes.json
 share/cataclysm-dda/mods/RL_Classes/modinfo.json
@@ -2049,19 +3079,11 @@ share/cataclysm-dda/mods/Salvaged_Robots
 share/cataclysm-dda/mods/Salvaged_Robots/speech.json
 share/cataclysm-dda/mods/Salvaged_Robots/uncraft.json
 share/cataclysm-dda/mods/Salvaged_Robots/uncraft_corpse.json
-share/cataclysm-dda/mods/Sleep_Deprivation/bionics.json
-share/cataclysm-dda/mods/Sleep_Deprivation/effects.json
-share/cataclysm-dda/mods/Sleep_Deprivation/game_balance.json
-share/cataclysm-dda/mods/Sleep_Deprivation/item_actions.json
-share/cataclysm-dda/mods/Sleep_Deprivation/item_groups.json
-share/cataclysm-dda/mods/Sleep_Deprivation/itemgroups/drugs.json
-share/cataclysm-dda/mods/Sleep_Deprivation/items/bionics.json
-share/cataclysm-dda/mods/Sleep_Deprivation/items/comestibles/med.json
 share/cataclysm-dda/mods/Sleep_Deprivation/modinfo.json
-share/cataclysm-dda/mods/Slow_Zombies/main.lua
-share/cataclysm-dda/mods/Slow_Zombies/modinfo.json
-share/cataclysm-dda/mods/StatsThroughSkills/main.lua
 share/cataclysm-dda/mods/StatsThroughSkills/modinfo.json
+share/cataclysm-dda/mods/TEST_DATA/README.md
+share/cataclysm-dda/mods/TEST_DATA/metal.json
+share/cataclysm-dda/mods/TEST_DATA/modinfo.json
 share/cataclysm-dda/mods/Tanks/ammo_types.json
 share/cataclysm-dda/mods/Tanks/item_groups.json
 share/cataclysm-dda/mods/Tanks/items.json
@@ -2077,8 +3099,6 @@ share/cataclysm-dda/mods/Tolerate_This/c
 share/cataclysm-dda/mods/Tolerate_This/cooking_components.json
 share/cataclysm-dda/mods/Tolerate_This/modinfo.json
 share/cataclysm-dda/mods/Tolerate_This/recipe_food.json
-share/cataclysm-dda/mods/Tough_Zombies/main.lua
-share/cataclysm-dda/mods/Tough_Zombies/modinfo.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_10_house_brick_pool.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_11_house_brick.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_12_house.json
@@ -2113,6 +3133,7 @@ share/cataclysm-dda/mods/Urban_Developme
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_39_market_subway_newspaper.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_3_house.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_40_house.json
+share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_41_library.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_4_house_basement.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_5_house.json
 share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_6_house.json
@@ -2126,14 +3147,10 @@ share/cataclysm-dda/mods/Urban_Developme
 share/cataclysm-dda/mods/Urban_Development/overmap_specials.json
 share/cataclysm-dda/mods/Urban_Development/overmap_terrain.json
 share/cataclysm-dda/mods/Urban_Development/regional_overlay.json
-share/cataclysm-dda/mods/Z-Level_Buildings/modinfo.json
-share/cataclysm-dda/mods/Zombie_Nightvision/main.lua
 share/cataclysm-dda/mods/Zombie_Nightvision/modinfo.json
 share/cataclysm-dda/mods/alt_map_key/modinfo.json
 share/cataclysm-dda/mods/alt_map_key/overmap_terrain.json
 share/cataclysm-dda/mods/alt_map_key/readme.txt
-share/cataclysm-dda/mods/bio_mod/modinfo.json
-share/cataclysm-dda/mods/blazemod/PAQ.txt
 share/cataclysm-dda/mods/blazemod/blaze_ammo.json
 share/cataclysm-dda/mods/blazemod/blaze_ammo_recipes.json
 share/cataclysm-dda/mods/blazemod/blaze_ammo_types.json
@@ -2156,51 +3173,31 @@ share/cataclysm-dda/mods/blazemod/blaze_
 share/cataclysm-dda/mods/blazemod/blaze_weapons_recipes.json
 share/cataclysm-dda/mods/blazemod/modinfo.json
 share/cataclysm-dda/mods/blazemod/snippets.json
+share/cataclysm-dda/mods/cbm_slots/game_balance.json
+share/cataclysm-dda/mods/cbm_slots/modinfo.json
+share/cataclysm-dda/mods/classic_zombies/exclusions.json
+share/cataclysm-dda/mods/classic_zombies/modinfo.json
 share/cataclysm-dda/mods/dda/modinfo.json
 share/cataclysm-dda/mods/default.json
+share/cataclysm-dda/mods/desert_region/desert_insect_spider.json
+share/cataclysm-dda/mods/desert_region/desert_mammal.json
+share/cataclysm-dda/mods/desert_region/desert_monstergroups.json
+share/cataclysm-dda/mods/desert_region/desert_monsters.json
+share/cataclysm-dda/mods/desert_region/desert_overmap_connections.json
+share/cataclysm-dda/mods/desert_region/desert_overmap_terrain.json
+share/cataclysm-dda/mods/desert_region/desert_regional_map_settings.json
+share/cataclysm-dda/mods/desert_region/desert_reptile_amphibian.json
+share/cataclysm-dda/mods/desert_region/desert_special_locations.json
+share/cataclysm-dda/mods/desert_region/desert_terrain.json
+share/cataclysm-dda/mods/desert_region/modinfo.json
+share/cataclysm-dda/mods/fast_healing/effects.json
+share/cataclysm-dda/mods/fast_healing/meds.json
+share/cataclysm-dda/mods/fast_healing/modinfo.json
+share/cataclysm-dda/mods/fast_healing/recipes.json
 share/cataclysm-dda/mods/makeshift/item.json
 share/cataclysm-dda/mods/makeshift/item_groups.json
 share/cataclysm-dda/mods/makeshift/modinfo.json
 share/cataclysm-dda/mods/makeshift/recipe.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_00.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/overmap_specials.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/overmap_terrain.json
-share/cataclysm-dda/mods/mapspecials_demo/FEMA/palettes.json
 share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_01.json
 share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_02.json
 share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_03.json
@@ -2302,41 +3299,20 @@ share/cataclysm-dda/mods/necromancy/modi
 share/cataclysm-dda/mods/necromancy/necronimicron.json
 share/cataclysm-dda/mods/no_scifi/modinfo.json
 share/cataclysm-dda/mods/novitamins/modinfo.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_car_dealership.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_car_showroom.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_city_dump_small.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_gardening_allotment.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_internet_cafe.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_market_small.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_open_sewer_small.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_private_park.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_public_art_piece.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_public_space.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_sex_shop.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_tire_shop.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_fire_lookout_tower.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_giant_sinkhole.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_regional_dump.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_survivor_bunker.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_survivor_camp.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/oa_shared_item_groups.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/overmap_specials.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/overmap_terrain.json
-share/cataclysm-dda/mods/oa_additional_buildings/json/regional_overlay.json
-share/cataclysm-dda/mods/oa_additional_buildings/modinfo.json
-share/cataclysm-dda/mods/realguns/ammo.json
-share/cataclysm-dda/mods/realguns/ammo_types.json
-share/cataclysm-dda/mods/realguns/armor.json
-share/cataclysm-dda/mods/realguns/gun.json
-share/cataclysm-dda/mods/realguns/gunmod.json
-share/cataclysm-dda/mods/realguns/item_groups.json
-share/cataclysm-dda/mods/realguns/magazine.json
-share/cataclysm-dda/mods/realguns/modinfo.json
-share/cataclysm-dda/mods/realguns/obsolete.json
-share/cataclysm-dda/mods/realguns/recipes.json
-share/cataclysm-dda/mods/realguns/requirements.json
-share/cataclysm-dda/mods/realguns/uncraft.json
 share/cataclysm-dda/mods/replacements.json
+share/cataclysm-dda/mods/rural_biome/modinfo.json
+share/cataclysm-dda/mods/rural_biome/rural_regional_map_settings.json
+share/cataclysm-dda/mods/sees_player_hitbutton/mod_tileset.json
+share/cataclysm-dda/mods/sees_player_hitbutton/modinfo.json
+share/cataclysm-dda/mods/sees_player_hitbutton/sees_player_hitbutton_green.png
+share/cataclysm-dda/mods/sees_player_hitbutton/sees_player_hitbutton_pink.png
+share/cataclysm-dda/mods/sees_player_hitbutton/sees_player_hitbutton_red.png
+share/cataclysm-dda/mods/sees_player_hitbutton/sees_player_hitbutton_yellow.png
+share/cataclysm-dda/mods/sees_player_retro/mod_tileset.json
+share/cataclysm-dda/mods/sees_player_retro/modinfo.json
+share/cataclysm-dda/mods/sees_player_retro/sees_player_retro.png
+share/cataclysm-dda/mods/speedydex/modinfo.json
+share/cataclysm-dda/mods/stats_through_kills/modinfo.json
 share/cataclysm-dda/motd/de.motd
 share/cataclysm-dda/motd/en.motd
 share/cataclysm-dda/motd/es_AR.motd
@@ -2362,7 +3338,12 @@ share/cataclysm-dda/sound/Basic/menu_mov
 share/cataclysm-dda/sound/Basic/musicset.json
 share/cataclysm-dda/sound/Basic/soundpack.txt
 share/cataclysm-dda/sound/Basic/soundset.json
+share/cataclysm-dda/title/en.christmas
+share/cataclysm-dda/title/en.easter
 share/cataclysm-dda/title/en.halloween
+share/cataclysm-dda/title/en.independence_day
+share/cataclysm-dda/title/en.new_year
+share/cataclysm-dda/title/en.thanksgiving
 share/cataclysm-dda/title/en.title
 share/cataclysm-dda/title/ru.title
 share/cataclysm-dda/title/zh_CN.title
@@ -2378,10 +3359,12 @@ share/locale/ar/LC_MESSAGES/cataclysm-dd
 share/locale/da/LC_MESSAGES/cataclysm-dda.mo
 share/locale/de/LC_MESSAGES/cataclysm-dda.mo
 share/locale/el/LC_MESSAGES/cataclysm-dda.mo
+share/locale/en/LC_MESSAGES/cataclysm-dda.mo
 share/locale/es_AR/LC_MESSAGES/cataclysm-dda.mo
 share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo
 share/locale/fr/LC_MESSAGES/cataclysm-dda.mo
 share/locale/hu/LC_MESSAGES/cataclysm-dda.mo
+share/locale/id/LC_MESSAGES/cataclysm-dda.mo
 share/locale/is/LC_MESSAGES/cataclysm-dda.mo
 share/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo
 share/locale/ja/LC_MESSAGES/cataclysm-dda.mo

Added files:

Index: pkgsrc/games/cataclysm-dda/patches/patch-lang_compile__mo.sh
diff -u /dev/null pkgsrc/games/cataclysm-dda/patches/patch-lang_compile__mo.sh:1.1
--- /dev/null   Thu Apr 30 14:57:31 2020
+++ pkgsrc/games/cataclysm-dda/patches/patch-lang_compile__mo.sh        Thu Apr 30 14:57:30 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-lang_compile__mo.sh,v 1.1 2020/04/30 14:57:30 nia Exp $
+
+Shell portability.
+
+--- lang/compile_mo.sh.orig    2020-04-01 05:39:38.000000000 +0000
++++ lang/compile_mo.sh
+@@ -24,7 +24,7 @@ then
+     for n in $@
+     do
+         f="lang/po/${n}.po"
+-        if [ $n == "en" ]; then
++        if [ $n = "en" ]; then
+             # English is special: we do not actually need translation for English,
+             # but due to a libintl bug (https://savannah.gnu.org/bugs/index.php?58006),
+             # gettext would be extremely slow on MinGW targets if we do not compile
Index: pkgsrc/games/cataclysm-dda/patches/patch-src_translations.cpp
diff -u /dev/null pkgsrc/games/cataclysm-dda/patches/patch-src_translations.cpp:1.1
--- /dev/null   Thu Apr 30 14:57:31 2020
+++ pkgsrc/games/cataclysm-dda/patches/patch-src_translations.cpp       Thu Apr 30 14:57:30 2020
@@ -0,0 +1,52 @@
+$NetBSD: patch-src_translations.cpp,v 1.1 2020/04/30 14:57:30 nia Exp $
+
+Avoid overriding gettext functions with incompatible versions.
+
+--- src/translations.cpp.orig  2020-04-01 05:39:38.000000000 +0000
++++ src/translations.cpp
+@@ -59,45 +59,6 @@ static bool sanity_checked_genders = fal
+ std::string getOSXSystemLang();
+ #endif
+ 
+-const char *pgettext( const char *context, const char *msgid )
+-{
+-    // need to construct the string manually,
+-    // to correctly handle strings loaded from json.
+-    // could probably do this more efficiently without using std::string.
+-    std::string context_id( context );
+-    context_id += '\004';
+-    context_id += msgid;
+-    // null domain, uses global translation domain
+-    const char *msg_ctxt_id = context_id.c_str();
+-#if defined(__ANDROID__)
+-    const char *translation = gettext( msg_ctxt_id );
+-#else
+-    const char *translation = dcgettext( nullptr, msg_ctxt_id, LC_MESSAGES );
+-#endif
+-    if( translation == msg_ctxt_id ) {
+-        return msgid;
+-    } else {
+-        return translation;
+-    }
+-}
+-
+-const char *npgettext( const char *const context, const char *const msgid,
+-                       const char *const msgid_plural, const unsigned long long n )
+-{
+-    const std::string context_id = std::string( context ) + '\004' + msgid;
+-    const char *const msg_ctxt_id = context_id.c_str();
+-#if defined(__ANDROID__)
+-    const char *const translation = ngettext( msg_ctxt_id, msgid_plural, n );
+-#else
+-    const char *const translation = dcngettext( nullptr, msg_ctxt_id, msgid_plural, n, LC_MESSAGES );
+-#endif
+-    if( translation == msg_ctxt_id ) {
+-        return n == 1 ? msgid : msgid_plural;
+-    } else {
+-        return translation;
+-    }
+-}
+-
+ bool isValidLanguage( const std::string &lang )
+ {
+     const auto languages = get_options().get_option( "USE_LANG" ).getItems();
Index: pkgsrc/games/cataclysm-dda/patches/patch-src_translations.h
diff -u /dev/null pkgsrc/games/cataclysm-dda/patches/patch-src_translations.h:1.1
--- /dev/null   Thu Apr 30 14:57:31 2020
+++ pkgsrc/games/cataclysm-dda/patches/patch-src_translations.h Thu Apr 30 14:57:30 2020
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_translations.h,v 1.1 2020/04/30 14:57:30 nia Exp $
+
+Avoid overriding gettext functions with incompatible versions.
+
+--- src/translations.h.orig    2020-04-01 05:39:38.000000000 +0000
++++ src/translations.h
+@@ -56,26 +56,6 @@ inline std::string _( const std::string 
+ {
+     return _( msg.c_str() );
+ }
+-
+-// ngettext overload taking an unsigned long long so that people don't need
+-// to cast at call sites.  This is particularly relevant on 64-bit Windows where
+-// size_t is bigger than unsigned long, so MSVC will try to encourage you to
+-// add a cast.
+-template<typename T, typename = std::enable_if_t<std::is_same<T, unsigned long long>::value>>
+-ATTRIBUTE_FORMAT_ARG( 1 )
+-inline const char *ngettext( const char *msgid, const char *msgid_plural, T n )
+-{
+-    // Leaving this long because it matches the underlying API.
+-    // NOLINTNEXTLINE(cata-no-long)
+-    return ngettext( msgid, msgid_plural, static_cast<unsigned long>( n ) );
+-}
+-
+-const char *pgettext( const char *context, const char *msgid ) ATTRIBUTE_FORMAT_ARG( 2 );
+-
+-// same as pgettext, but supports plural forms like ngettext
+-const char *npgettext( const char *context, const char *msgid, const char *msgid_plural,
+-                       unsigned long long n ) ATTRIBUTE_FORMAT_ARG( 2 );
+-
+ #else // !LOCALIZE
+ 
+ // on some systems <locale> pulls in libintl.h anyway,