pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games
Module Name: pkgsrc
Committed By: nia
Date: Mon Jul 12 20:54:02 UTC 2021
Modified Files:
pkgsrc/games/cataclysm-dda: Makefile.common PLIST distinfo
pkgsrc/games/cataclysm-dda-sdl: Makefile PLIST
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.F
## Highlights
Nested Containers rationalize inventory management and enable dropping and retrieving go-bags during fights.
Achievements track your deeds and misdeeds across games.
Proficiencies better represent deeper knowledge required for various endeavors, mostly crafting.
Bleeding added to both the player and monsters as the first step toward a more comprehensive wound and wound treatment system.
Weariness tracking added to represent longer-term physical exhaustion.
Elevated bridges over navigable rivers added, allowing better navigability while using boats.
Large-scale audit of weapon and armor values for better representativeness and consistency.
Improved armor handling by separating ballistic damage into its own damage type.
Pervasive performance enhancements throughout the game.
Tileset vehicle support for more cohesive vehicle rendering.
Aftershock changes direction to a total conversion mod with a new far-future setting on a frozen world.
Dinomod added 238 dinosaurs, pterosaurs, mosasaurs, and dino-related NPCs with missions and dino locations.
Added many dino features, including zombie, fungal, evolved, bionic, baby, and mutant dino variants.
Dinomod added many dino interactions, including farming, riding, butchering, cooking, and special attacks.
Magiclysm added a huge content update including many new traits called Attunements that switch up gameplay at the endgame.
## Statistics
3974 files changed, 5440251 insertions(+), 3904330 deletions(-)
10,463 commits
~454 contributors
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/cataclysm-dda/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/cataclysm-dda/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/cataclysm-dda/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/cataclysm-dda-sdl/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/cataclysm-dda-sdl/PLIST
cvs rdiff -u -r1.1 -r1.2 \
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.common
diff -u pkgsrc/games/cataclysm-dda/Makefile.common:1.5 pkgsrc/games/cataclysm-dda/Makefile.common:1.6
--- pkgsrc/games/cataclysm-dda/Makefile.common:1.5 Sat Dec 19 10:54:28 2020
+++ pkgsrc/games/cataclysm-dda/Makefile.common Mon Jul 12 20:54:02 2021
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.5 2020/12/19 10:54:28 nia Exp $
+# $NetBSD: Makefile.common,v 1.6 2021/07/12 20:54:02 nia Exp $
# used by games/cataclysm-dda/Makefile
# used by games/cataclysm-dda-sdl/Makefile
-DISTNAME= cataclysm-dda-0.E.3
+DISTNAME= cataclysm-dda-0.F
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GITHUB:=CleverRaven/}
GITHUB_PROJECT= Cataclysm-DDA
-GITHUB_TAG= 0.E-3
+GITHUB_TAG= 0.F
HOMEPAGE= https://cataclysmdda.org/
LICENSE= cc-by-sa-v3.0
@@ -36,8 +36,7 @@ MAKE_FLAGS+= LANGUAGES=all
MAKE_FLAGS+= RELEASE=1
MAKE_FLAGS+= RUNTESTS=0
MAKE_FLAGS+= USE_XDG_DIR=1
-
-BUILDLINK_TRANSFORM+= rm:-Werror
+MAKE_FLAGS+= PCH=0
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/cataclysm-dda
Index: pkgsrc/games/cataclysm-dda/PLIST
diff -u pkgsrc/games/cataclysm-dda/PLIST:1.2 pkgsrc/games/cataclysm-dda/PLIST:1.3
--- pkgsrc/games/cataclysm-dda/PLIST:1.2 Thu Apr 30 14:57:30 2020
+++ pkgsrc/games/cataclysm-dda/PLIST Mon Jul 12 20:54:02 2021
@@ -1,30 +1,54 @@
-@comment $NetBSD: PLIST,v 1.2 2020/04/30 14:57:30 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/07/12 20:54:02 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/game_balance.json
+share/cataclysm-dda/core/sentinels.json
share/cataclysm-dda/core/tips.json
+share/cataclysm-dda/core/weather.json
share/cataclysm-dda/credits/en.credits
+share/cataclysm-dda/credits/es_AR.credits
+share/cataclysm-dda/credits/es_ES.credits
+share/cataclysm-dda/credits/ja.credits
+share/cataclysm-dda/credits/pl.credits
share/cataclysm-dda/credits/ru.credits
+share/cataclysm-dda/credits/zh_CN.credits
+share/cataclysm-dda/font/Terminus.ttf
share/cataclysm-dda/font/map_font_LARWICK.png
+share/cataclysm-dda/font/map_font_LAWRICK_Colored.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/achievements.json
share/cataclysm-dda/json/ammo_effects.json
share/cataclysm-dda/json/anatomy.json
+share/cataclysm-dda/json/artifact/altered_object_active.json
+share/cataclysm-dda/json/artifact/artifact_item_types.json
+share/cataclysm-dda/json/artifact/legacy_artifact_active.json
+share/cataclysm-dda/json/artifact/legacy_artifact_passive.json
+share/cataclysm-dda/json/artifact/premade_artifacts.json
+share/cataclysm-dda/json/artifact/relic_procgen_data.json
+share/cataclysm-dda/json/ascii_art/generic_ascii.json
+share/cataclysm-dda/json/ascii_art/gun_ascii.json
share/cataclysm-dda/json/bionics.json
share/cataclysm-dda/json/body_parts.json
+share/cataclysm-dda/json/butchery_requirements.json
share/cataclysm-dda/json/clothing_mods.json
+share/cataclysm-dda/json/conducts.json
share/cataclysm-dda/json/construction.json
share/cataclysm-dda/json/construction_category.json
+share/cataclysm-dda/json/construction_group.json
share/cataclysm-dda/json/default_blacklist.json
+share/cataclysm-dda/json/disease.json
share/cataclysm-dda/json/dreams.json
share/cataclysm-dda/json/effects.json
share/cataclysm-dda/json/emit.json
+share/cataclysm-dda/json/enchantments.json
share/cataclysm-dda/json/field_type.json
share/cataclysm-dda/json/flags.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-alien.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
@@ -38,7 +62,6 @@ share/cataclysm-dda/json/furniture_and_t
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
@@ -54,10 +77,12 @@ share/cataclysm-dda/json/furniture_and_t
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-flesh.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-floors-indoor.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-highways.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
@@ -70,21 +95,24 @@ share/cataclysm-dda/json/furniture_and_t
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/hit_range.json
share/cataclysm-dda/json/item_actions.json
share/cataclysm-dda/json/item_category.json
+share/cataclysm-dda/json/item_spell_effects.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/hazmat_gear.json
share/cataclysm-dda/json/itemgroups/Clothing_Gear/jewellery_gems.json
+share/cataclysm-dda/json/itemgroups/Clothing_Gear/wallets.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/Arsonist_stock.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
@@ -98,6 +126,7 @@ share/cataclysm-dda/json/itemgroups/Mons
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/fridges.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
@@ -107,6 +136,7 @@ share/cataclysm-dda/json/itemgroups/Weap
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/altered_item.json
share/cataclysm-dda/json/itemgroups/art_antiques_crafts.json
share/cataclysm-dda/json/itemgroups/bionics.json
share/cataclysm-dda/json/itemgroups/books.json
@@ -178,17 +208,20 @@ share/cataclysm-dda/json/items/ammo/9mm.
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/cannon.json
share/cataclysm-dda/json/items/ammo/chemical_spray.json
+share/cataclysm-dda/json/items/ammo/exodii.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/rpg.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/armor/altered_object_auras.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
@@ -224,9 +257,11 @@ share/cataclysm-dda/json/items/basecamp.
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/abstract.json
share/cataclysm-dda/json/items/book/archery.json
share/cataclysm-dda/json/items/book/barter.json
share/cataclysm-dda/json/items/book/bashing.json
+share/cataclysm-dda/json/items/book/chemistry.json
share/cataclysm-dda/json/items/book/computer.json
share/cataclysm-dda/json/items/book/cooking.json
share/cataclysm-dda/json/items/book/cutting.json
@@ -237,16 +272,23 @@ share/cataclysm-dda/json/items/book/fabr
share/cataclysm-dda/json/items/book/firstaid.json
share/cataclysm-dda/json/items/book/gun.json
share/cataclysm-dda/json/items/book/launcher.json
+share/cataclysm-dda/json/items/book/lockpick.json
share/cataclysm-dda/json/items/book/maps.json
share/cataclysm-dda/json/items/book/martial.json
share/cataclysm-dda/json/items/book/mechanics.json
share/cataclysm-dda/json/items/book/melee.json
share/cataclysm-dda/json/items/book/misc.json
+share/cataclysm-dda/json/items/book/misc_philosophy.json
+share/cataclysm-dda/json/items/book/misc_pulp.json
+share/cataclysm-dda/json/items/book/misc_scifi.json
+share/cataclysm-dda/json/items/book/misc_sports.json
+share/cataclysm-dda/json/items/book/nonfiction.json
share/cataclysm-dda/json/items/book/pistol.json
share/cataclysm-dda/json/items/book/rifle.json
share/cataclysm-dda/json/items/book/shotgun.json
share/cataclysm-dda/json/items/book/smg.json
share/cataclysm-dda/json/items/book/speech.json
+share/cataclysm-dda/json/items/book/spiritual.json
share/cataclysm-dda/json/items/book/stabbing.json
share/cataclysm-dda/json/items/book/survival.json
share/cataclysm-dda/json/items/book/swimming.json
@@ -254,15 +296,17 @@ share/cataclysm-dda/json/items/book/tail
share/cataclysm-dda/json/items/book/throw.json
share/cataclysm-dda/json/items/book/traps.json
share/cataclysm-dda/json/items/book/unarmed.json
+share/cataclysm-dda/json/items/book/young.json
share/cataclysm-dda/json/items/chemicals_and_resources.json
-share/cataclysm-dda/json/items/classes/book.json
share/cataclysm-dda/json/items/classes/comestible.json
share/cataclysm-dda/json/items/classes/gun.json
share/cataclysm-dda/json/items/classes/magazine.json
share/cataclysm-dda/json/items/comestibles/alcohol.json
+share/cataclysm-dda/json/items/comestibles/baked.json
share/cataclysm-dda/json/items/comestibles/bread.json
share/cataclysm-dda/json/items/comestibles/brewing.json
share/cataclysm-dda/json/items/comestibles/carnivore.json
+share/cataclysm-dda/json/items/comestibles/cereal.json
share/cataclysm-dda/json/items/comestibles/dairy.json
share/cataclysm-dda/json/items/comestibles/drink.json
share/cataclysm-dda/json/items/comestibles/drink_other.json
@@ -291,6 +335,7 @@ share/cataclysm-dda/json/items/comestibl
share/cataclysm-dda/json/items/comestibles/wheat.json
share/cataclysm-dda/json/items/containers.json
share/cataclysm-dda/json/items/corpses/corpses.json
+share/cataclysm-dda/json/items/corpses/dead_exodii.json
share/cataclysm-dda/json/items/corpses/inactive_bots.json
share/cataclysm-dda/json/items/electronics.json
share/cataclysm-dda/json/items/fake.json
@@ -304,10 +349,12 @@ share/cataclysm-dda/json/items/generic/b
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/music.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/generic/toys_and_sports.json
+share/cataclysm-dda/json/items/gun/10mm.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
@@ -352,12 +399,13 @@ share/cataclysm-dda/json/items/gun/9x18.
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/cannon.json
share/cataclysm-dda/json/items/gun/chemical_spray.json
share/cataclysm-dda/json/items/gun/combination.json
+share/cataclysm-dda/json/items/gun/exodii.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
@@ -382,6 +430,7 @@ share/cataclysm-dda/json/items/gunmod/st
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/10mm.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
@@ -415,6 +464,7 @@ share/cataclysm-dda/json/items/magazine/
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/exodii.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
@@ -437,6 +487,7 @@ share/cataclysm-dda/json/items/ranged/pn
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/relics/altered_items.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
@@ -445,6 +496,7 @@ share/cataclysm-dda/json/items/resources
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/stone.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
@@ -467,12 +519,14 @@ share/cataclysm-dda/json/items/tool/meta
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/pseudo.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/stoneworking.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
@@ -501,14 +555,13 @@ share/cataclysm-dda/json/items/vehicle/n
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/rotor.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/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
@@ -519,6 +572,8 @@ share/cataclysm-dda/json/mapgen/abandone
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/airport/s_airport_private.json
+share/cataclysm-dda/json/mapgen/airport/s_airport_runway_private.json
share/cataclysm-dda/json/mapgen/animalpound.json
share/cataclysm-dda/json/mapgen/animalshelter.json
share/cataclysm-dda/json/mapgen/antique_store.json
@@ -544,13 +599,16 @@ share/cataclysm-dda/json/mapgen/basecamp
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_log.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_rock.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_firestation_1/modular_firestation1.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_firestation_1/modular_firestation_walls_all.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
@@ -579,6 +637,12 @@ share/cataclysm-dda/json/mapgen/basecamp
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_shelter_2/modular_shelter_2_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_standard.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_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
@@ -608,6 +672,8 @@ share/cataclysm-dda/json/mapgen/basement
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/bridges.json
+share/cataclysm-dda/json/mapgen/bugs/nest_dermatik.json
share/cataclysm-dda/json/mapgen/bunker.json
share/cataclysm-dda/json/mapgen/bus_station.json
share/cataclysm-dda/json/mapgen/butcher.json
@@ -636,13 +702,19 @@ share/cataclysm-dda/json/mapgen/campus/b
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/campus/open_areas/pedestrian_center.json
+share/cataclysm-dda/json/mapgen/campus/open_areas/pedestrian_westside.json
share/cataclysm-dda/json/mapgen/cathedral.json
+share/cataclysm-dda/json/mapgen/cave.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/city_blocks/urban_13_dense_house_apt_house.json
+share/cataclysm-dda/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json
+share/cataclysm-dda/json/mapgen/city_blocks/urban_25_dense_diner_apt.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
@@ -672,10 +744,12 @@ share/cataclysm-dda/json/mapgen/faction_
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_dairy_2.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.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
@@ -715,6 +789,7 @@ share/cataclysm-dda/json/mapgen/fema/FEM
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/fort.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
@@ -738,6 +813,7 @@ share/cataclysm-dda/json/mapgen/homeless
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/2storymodern01.json
share/cataclysm-dda/json/mapgen/house/crack_house.json
share/cataclysm-dda/json/mapgen/house/garden_house_1.json
share/cataclysm-dda/json/mapgen/house/house01.json
@@ -773,6 +849,16 @@ share/cataclysm-dda/json/mapgen/house/ho
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/house33.json
+share/cataclysm-dda/json/mapgen/house/house34.json
+share/cataclysm-dda/json/mapgen/house/house35.json
+share/cataclysm-dda/json/mapgen/house/house36.json
+share/cataclysm-dda/json/mapgen/house/house37.json
+share/cataclysm-dda/json/mapgen/house/house38.json
+share/cataclysm-dda/json/mapgen/house/house39.json
+share/cataclysm-dda/json/mapgen/house/house40.json
+share/cataclysm-dda/json/mapgen/house/house41.json
+share/cataclysm-dda/json/mapgen/house/house42.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
@@ -826,6 +912,23 @@ share/cataclysm-dda/json/mapgen/house/ho
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/house/urban_10_house_brick_pool.json
+share/cataclysm-dda/json/mapgen/house/urban_11_house_brick.json
+share/cataclysm-dda/json/mapgen/house/urban_12_house.json
+share/cataclysm-dda/json/mapgen/house/urban_15_house.json
+share/cataclysm-dda/json/mapgen/house/urban_16_house_ranch.json
+share/cataclysm-dda/json/mapgen/house/urban_17_house_ranch.json
+share/cataclysm-dda/json/mapgen/house/urban_18_victorian.json
+share/cataclysm-dda/json/mapgen/house/urban_1_house.json
+share/cataclysm-dda/json/mapgen/house/urban_29_dense_row.json
+share/cataclysm-dda/json/mapgen/house/urban_2_house.json
+share/cataclysm-dda/json/mapgen/house/urban_3_house.json
+share/cataclysm-dda/json/mapgen/house/urban_4_house_basement.json
+share/cataclysm-dda/json/mapgen/house/urban_5_house.json
+share/cataclysm-dda/json/mapgen/house/urban_6_house.json
+share/cataclysm-dda/json/mapgen/house/urban_7_house_garden.json
+share/cataclysm-dda/json/mapgen/house/urban_8_house_brick_garden.json
+share/cataclysm-dda/json/mapgen/house/urban_9_house_garage_loft.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
@@ -853,8 +956,10 @@ share/cataclysm-dda/json/mapgen/lab/lab_
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/lab_subway_vent_shaft.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/freshwater_research_station.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
@@ -867,23 +972,35 @@ share/cataclysm-dda/json/mapgen/lot_empt
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/mall/mall_basement.json
+share/cataclysm-dda/json/mapgen/mall/mall_ground.json
+share/cataclysm-dda/json/mapgen/mall/mall_roof.json
+share/cataclysm-dda/json/mapgen/mall/mall_second_floor.json
+share/cataclysm-dda/json/mapgen/mall/mall_upper_roof.json
share/cataclysm-dda/json/mapgen/mansion.json
+share/cataclysm-dda/json/mapgen/mansion_roof.json
+share/cataclysm-dda/json/mapgen/map_extras/mass_grave.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/sewers.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_edge_room_connector.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_firebreak.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_hallway.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_hallway_start.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_isolated_stairs.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_reactor.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
@@ -893,8 +1010,7 @@ share/cataclysm-dda/json/mapgen/military
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/miniature_railway/miniature_railway.json
share/cataclysm-dda/json/mapgen/missile_silo.json
share/cataclysm-dda/json/mapgen/moonshine_camp.json
share/cataclysm-dda/json/mapgen/mortuary.json
@@ -908,12 +1024,17 @@ 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/aux_nested.json
share/cataclysm-dda/json/mapgen/nested/basement_nested.json
+share/cataclysm-dda/json/mapgen/nested/cave_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/fema_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/mini_railway_nested.json
share/cataclysm-dda/json/mapgen/nested/nested_chunks_roof.json
+share/cataclysm-dda/json/mapgen/nested/npc_nested_spawns.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
@@ -928,6 +1049,7 @@ share/cataclysm-dda/json/mapgen/orchard_
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_mazes.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
@@ -953,6 +1075,7 @@ share/cataclysm-dda/json/mapgen/radio_to
share/cataclysm-dda/json/mapgen/railroad/railroad_level_crossing.json
share/cataclysm-dda/json/mapgen/railroad/railroad_station.json
share/cataclysm-dda/json/mapgen/ranch_camp.json
+share/cataclysm-dda/json/mapgen/ravine.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
@@ -974,6 +1097,7 @@ share/cataclysm-dda/json/mapgen/restaura
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/potters_cottage.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
@@ -981,6 +1105,8 @@ share/cataclysm-dda/json/mapgen/roadstop
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_apt.json
+share/cataclysm-dda/json/mapgen/s_apt_2.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
@@ -992,6 +1118,7 @@ share/cataclysm-dda/json/mapgen/s_grocer
share/cataclysm-dda/json/mapgen/s_gun.json
share/cataclysm-dda/json/mapgen/s_hardware.json
share/cataclysm-dda/json/mapgen/s_icecream.json
+share/cataclysm-dda/json/mapgen/s_lightindustry.json
share/cataclysm-dda/json/mapgen/s_liquor.json
share/cataclysm-dda/json/mapgen/sai.json
share/cataclysm-dda/json/mapgen/school_1.json
@@ -1010,6 +1137,12 @@ share/cataclysm-dda/json/mapgen/steel_mi
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_camping.json
+share/cataclysm-dda/json/mapgen/store/s_cardealer.json
+share/cataclysm-dda/json/mapgen/store/s_diner.json
+share/cataclysm-dda/json/mapgen/store/s_electronicstore.json
+share/cataclysm-dda/json/mapgen/store/s_games.json
+share/cataclysm-dda/json/mapgen/store/s_gunstore.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
@@ -1024,6 +1157,7 @@ share/cataclysm-dda/json/mapgen/trail_sm
share/cataclysm-dda/json/mapgen/trailer_park.json
share/cataclysm-dda/json/mapgen/trailhead.json
share/cataclysm-dda/json/mapgen/triffid_grove.json
+share/cataclysm-dda/json/mapgen/urban_35_hospital.json
share/cataclysm-dda/json/mapgen/veterinarian.json
share/cataclysm-dda/json/mapgen/vfw.json
share/cataclysm-dda/json/mapgen/warehouse.json
@@ -1050,11 +1184,13 @@ share/cataclysm-dda/json/mapgen_palettes
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/electronic_palette.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/fort_palette.json
share/cataclysm-dda/json/mapgen_palettes/helipad.json
share/cataclysm-dda/json/mapgen_palettes/hospital.json
share/cataclysm-dda/json/mapgen_palettes/hotel_tower_palette.json
@@ -1087,20 +1223,24 @@ share/cataclysm-dda/json/mapgen_palettes
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/restaurant_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/sewers_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/mapgen_palettes/underwater_structures_palette.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_factions.json
+share/cataclysm-dda/json/monster_special_attacks/monster_attacks.json
share/cataclysm-dda/json/monster_special_attacks/spells.json
+share/cataclysm-dda/json/monsterdrops/feral_humans.json
share/cataclysm-dda/json/monsterdrops/marloss.json
share/cataclysm-dda/json/monsterdrops/misc.json
share/cataclysm-dda/json/monsterdrops/mutant_experimental.json
@@ -1127,18 +1267,21 @@ share/cataclysm-dda/json/monstergroups/m
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/mutant_upgrades.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/zanimal_upgrades.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/feral_humans.json
share/cataclysm-dda/json/monsters/fish.json
share/cataclysm-dda/json/monsters/fungus.json
share/cataclysm-dda/json/monsters/insect_spider.json
@@ -1148,23 +1291,30 @@ share/cataclysm-dda/json/monsters/marlos
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/monster_goals.json
share/cataclysm-dda/json/monsters/mutant.json
+share/cataclysm-dda/json/monsters/mutant_mammal.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/robofac_robots.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/zanimal_upgrade.json
share/cataclysm-dda/json/monsters/zed-animal.json
share/cataclysm-dda/json/monsters/zed-classic.json
+share/cataclysm-dda/json/monsters/zed-pupating.json
+share/cataclysm-dda/json/monsters/zed-winged.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_ferrous.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
@@ -1174,14 +1324,18 @@ share/cataclysm-dda/json/monsters/zed_sk
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/move_modes.json
share/cataclysm-dda/json/mutations/mutation_appearance.json
share/cataclysm-dda/json/mutations/mutation_category.json
+share/cataclysm-dda/json/mutations/mutation_enchantments.json
share/cataclysm-dda/json/mutations/mutation_ordering.json
+share/cataclysm-dda/json/mutations/mutation_spells.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
+share/cataclysm-dda/json/npcs/Backgrounds/bg_pizzaiolo.json
share/cataclysm-dda/json/npcs/Backgrounds/burger_flipper_1.json
share/cataclysm-dda/json/npcs/Backgrounds/codger.json
share/cataclysm-dda/json/npcs/Backgrounds/confused_1.json
@@ -1212,6 +1366,7 @@ share/cataclysm-dda/json/npcs/Background
share/cataclysm-dda/json/npcs/Backgrounds/lab_1.json
share/cataclysm-dda/json/npcs/Backgrounds/left_for_dead_1.json
share/cataclysm-dda/json/npcs/Backgrounds/left_for_dead_2.json
+share/cataclysm-dda/json/npcs/Backgrounds/left_for_dead_3.json
share/cataclysm-dda/json/npcs/Backgrounds/lost_partner_1.json
share/cataclysm-dda/json/npcs/Backgrounds/lost_partner_2.json
share/cataclysm-dda/json/npcs/Backgrounds/nerd_1.json
@@ -1236,6 +1391,14 @@ share/cataclysm-dda/json/npcs/Background
share/cataclysm-dda/json/npcs/Backgrounds/soldier_1.json
share/cataclysm-dda/json/npcs/Backgrounds/soldier_2.json
share/cataclysm-dda/json/npcs/Backgrounds/wedding_1.json
+share/cataclysm-dda/json/npcs/Backgrounds/whathappened_table_of_contents.json
+share/cataclysm-dda/json/npcs/Kindred/NPC_Brigitte_LaCroix.json
+share/cataclysm-dda/json/npcs/Kindred/NPC_Darren_Cooper.json
+share/cataclysm-dda/json/npcs/Lighthouse_Family/NPC_lighthouse_girl.json
+share/cataclysm-dda/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
+share/cataclysm-dda/json/npcs/Lighthouse_Family/NPC_lighthouse_woman.json
+share/cataclysm-dda/json/npcs/Lighthouse_Family/TALK_fix_lighthouse.json
+share/cataclysm-dda/json/npcs/Lighthouse_Family/npc_survivor.json
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
@@ -1244,6 +1407,7 @@ share/cataclysm-dda/json/npcs/NC_COWBOY.
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_FARMER.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
@@ -1256,7 +1420,6 @@ share/cataclysm-dda/json/npcs/NC_SURVIVO
share/cataclysm-dda/json/npcs/NC_THUG.json
share/cataclysm-dda/json/npcs/NC_TRADER.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
@@ -1267,6 +1430,7 @@ share/cataclysm-dda/json/npcs/TALK_CYBOR
share/cataclysm-dda/json/npcs/TALK_FACTION_CAMP.json
share/cataclysm-dda/json/npcs/TALK_FRIEND_CONVERSATION.json
share/cataclysm-dda/json/npcs/TALK_MARLOSS_VOICE.json
+share/cataclysm-dda/json/npcs/TALK_NC_FARMER.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
@@ -1279,6 +1443,10 @@ share/cataclysm-dda/json/npcs/godco/cook
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-Cowboy_Friendly.json
+share/cataclysm-dda/json/npcs/holdouts/Rural-Cowboy_Hostile.json
+share/cataclysm-dda/json/npcs/holdouts/Rural-Cowboy_Nihilist.json
+share/cataclysm-dda/json/npcs/holdouts/Rural-Cowboy_Trader.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
@@ -1289,6 +1457,7 @@ share/cataclysm-dda/json/npcs/isherwood_
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/island_prison/prisoners.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
@@ -1296,6 +1465,7 @@ share/cataclysm-dda/json/npcs/necropolis
share/cataclysm-dda/json/npcs/necropolis/NPC_Old_Guard_Soldier.json
share/cataclysm-dda/json/npcs/npc.json
share/cataclysm-dda/json/npcs/npc_behavior.json
+share/cataclysm-dda/json/npcs/other/NPC_pizzaiolo.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
@@ -1320,6 +1490,7 @@ share/cataclysm-dda/json/npcs/refugee_ce
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_refugees/shared_dialogue.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
@@ -1358,9 +1529,11 @@ share/cataclysm-dda/json/npcs/tacoma_ran
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/npcs/talk_tags_chat.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/obsoletion/faults.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
@@ -1388,6 +1561,7 @@ share/cataclysm-dda/json/overmap/overmap
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_ravines.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
@@ -1398,8 +1572,18 @@ share/cataclysm-dda/json/overmap/overmap
share/cataclysm-dda/json/overmap/special_locations.json
share/cataclysm-dda/json/player_activities.json
share/cataclysm-dda/json/professions.json
+share/cataclysm-dda/json/proficiencies/chemistry.json
+share/cataclysm-dda/json/proficiencies/electronics.json
+share/cataclysm-dda/json/proficiencies/gunsmithing.json
+share/cataclysm-dda/json/proficiencies/metalwork.json
+share/cataclysm-dda/json/proficiencies/misc.json
+share/cataclysm-dda/json/proficiencies/tailoring.json
+share/cataclysm-dda/json/proficiencies/traps.json
+share/cataclysm-dda/json/proficiencies/wilderness.json
+share/cataclysm-dda/json/proficiencies/woodworking.json
share/cataclysm-dda/json/recipes/ammo/40x46mm.json
share/cataclysm-dda/json/recipes/ammo/40x53mm.json
+share/cataclysm-dda/json/recipes/ammo/cannon.json
share/cataclysm-dda/json/recipes/ammo/components.json
share/cataclysm-dda/json/recipes/ammo/pistol.json
share/cataclysm-dda/json/recipes/ammo/rifle.json
@@ -1427,13 +1611,16 @@ share/cataclysm-dda/json/recipes/basecam
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_log.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_rock.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_firestation_1/recipe_modular_firestation1.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_firestation_1/recipe_modular_firestation_walls_all.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
@@ -1462,6 +1649,12 @@ share/cataclysm-dda/json/recipes/basecam
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_shelter_2/recipe_modular_shelter_2_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_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
@@ -1478,11 +1671,15 @@ share/cataclysm-dda/json/recipes/basecam
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/chemicals.json
+share/cataclysm-dda/json/recipes/chem/drugs.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/food/baking.json
+share/cataclysm-dda/json/recipes/food/bread.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
@@ -1490,28 +1687,37 @@ share/cataclysm-dda/json/recipes/food/di
share/cataclysm-dda/json/recipes/food/dry.json
share/cataclysm-dda/json/recipes/food/frozen.json
share/cataclysm-dda/json/recipes/food/offal_dishes.json
+share/cataclysm-dda/json/recipes/food/other.json
share/cataclysm-dda/json/recipes/food/pasta.json
share/cataclysm-dda/json/recipes/food/seed.json
-share/cataclysm-dda/json/recipes/other/containers.json
+share/cataclysm-dda/json/recipes/other/bots.json
+share/cataclysm-dda/json/recipes/other/cords_and_ropes.json
share/cataclysm-dda/json/recipes/other/materials.json
share/cataclysm-dda/json/recipes/other/medical.json
share/cataclysm-dda/json/recipes/other/other.json
share/cataclysm-dda/json/recipes/other/parts.json
-share/cataclysm-dda/json/recipes/other/tool.json
+share/cataclysm-dda/json/recipes/other/parts_construction.json
+share/cataclysm-dda/json/recipes/other/parts_rigs.json
+share/cataclysm-dda/json/recipes/other/power_supplies.json
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_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_medsandchemicals.json
share/cataclysm-dda/json/recipes/recipe_obsolete.json
share/cataclysm-dda/json/recipes/recipe_others.json
+share/cataclysm-dda/json/recipes/recipe_traps.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/tools/containers.json
+share/cataclysm-dda/json/recipes/tools/lights.json
+share/cataclysm-dda/json/recipes/tools/tool.json
+share/cataclysm-dda/json/recipes/tools/tools_electronic.json
+share/cataclysm-dda/json/recipes/tools/tools_hand.json
+share/cataclysm-dda/json/recipes/tools/tools_primitive.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
@@ -1521,6 +1727,8 @@ share/cataclysm-dda/json/recipes/weapon/
share/cataclysm-dda/json/recipes/weapon/ranged.json
share/cataclysm-dda/json/regional_map_settings.json
share/cataclysm-dda/json/requirements/ammo.json
+share/cataclysm-dda/json/requirements/butchery.json
+share/cataclysm-dda/json/requirements/chemistry.json
share/cataclysm-dda/json/requirements/cooking_components.json
share/cataclysm-dda/json/requirements/cooking_tools.json
share/cataclysm-dda/json/requirements/explosives.json
@@ -1541,24 +1749,31 @@ share/cataclysm-dda/json/snippets/epilog
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/grave_labels.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/mutant_anatomy.json
share/cataclysm-dda/json/snippets/newspapers.json
+share/cataclysm-dda/json/snippets/nightmares.json
share/cataclysm-dda/json/snippets/radio.json
+share/cataclysm-dda/json/snippets/robot_finds_kitten.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/snippets/tutorial.json
+share/cataclysm-dda/json/snippets/weed_messages.json
share/cataclysm-dda/json/species.json
share/cataclysm-dda/json/speech.json
share/cataclysm-dda/json/start_locations.json
+share/cataclysm-dda/json/statistics.json
share/cataclysm-dda/json/techniques.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/120mm.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
@@ -1573,6 +1788,8 @@ share/cataclysm-dda/json/uncraft/ammo/38
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/40x46mm.json
+share/cataclysm-dda/json/uncraft/ammo/40x53mm.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
@@ -1587,16 +1804,20 @@ share/cataclysm-dda/json/uncraft/ammo/54
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/66mm.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/84x246mm.json
share/cataclysm-dda/json/uncraft/ammo/9mm.json
share/cataclysm-dda/json/uncraft/ammo/9x18mm.json
share/cataclysm-dda/json/uncraft/ammo/atgm.json
+share/cataclysm-dda/json/uncraft/ammo/rpg.json
share/cataclysm-dda/json/uncraft/ammo/shot.json
share/cataclysm-dda/json/uncraft/armor.json
+share/cataclysm-dda/json/uncraft/armor/boots.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
@@ -1618,18 +1839,26 @@ share/cataclysm-dda/json/vehicleparts/ba
share/cataclysm-dda/json/vehicleparts/boards.json
share/cataclysm-dda/json/vehicleparts/cargo.json
share/cataclysm-dda/json/vehicleparts/combustion.json
+share/cataclysm-dda/json/vehicleparts/doors.json
share/cataclysm-dda/json/vehicleparts/engineering.json
share/cataclysm-dda/json/vehicleparts/faults.json
share/cataclysm-dda/json/vehicleparts/frames.json
share/cataclysm-dda/json/vehicleparts/lights.json
share/cataclysm-dda/json/vehicleparts/manual.json
+share/cataclysm-dda/json/vehicleparts/mirrors.json
share/cataclysm-dda/json/vehicleparts/motor.json
+share/cataclysm-dda/json/vehicleparts/obsolete.json
share/cataclysm-dda/json/vehicleparts/rams.json
+share/cataclysm-dda/json/vehicleparts/rotor.json
+share/cataclysm-dda/json/vehicleparts/seats.json
share/cataclysm-dda/json/vehicleparts/tanks.json
share/cataclysm-dda/json/vehicleparts/turret.json
+share/cataclysm-dda/json/vehicleparts/utilities.json
share/cataclysm-dda/json/vehicleparts/vehicle_parts.json
+share/cataclysm-dda/json/vehicleparts/vp_categories.json
share/cataclysm-dda/json/vehicleparts/vp_flags.json
share/cataclysm-dda/json/vehicleparts/wheel.json
+share/cataclysm-dda/json/vehicleparts/windshields.json
share/cataclysm-dda/json/vehicles/bikes.json
share/cataclysm-dda/json/vehicles/boats.json
share/cataclysm-dda/json/vehicles/cars.json
@@ -1646,85 +1875,259 @@ 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/json/weather_type.json
share/cataclysm-dda/mods/Aftershock/README.md
+share/cataclysm-dda/mods/Aftershock/ammo_effects.json
+share/cataclysm-dda/mods/Aftershock/crafting_system.md
+share/cataclysm-dda/mods/Aftershock/effects.json
+share/cataclysm-dda/mods/Aftershock/emit.json
+share/cataclysm-dda/mods/Aftershock/field.json
+share/cataclysm-dda/mods/Aftershock/field_type.json
+share/cataclysm-dda/mods/Aftershock/harvest.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/bionics_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/clothing_group.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/food_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/item_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/nuclear_reactor_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/science_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/scrap_expansion_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/scrap_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/spaceship_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/titanium_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/vending_machine_group.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/weapons/armories.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/weapons/energy_gun_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/weapons/grenade_groups.json
share/cataclysm-dda/mods/Aftershock/items/afs_harvest.json
share/cataclysm-dda/mods/Aftershock/items/ammo.json
+share/cataclysm-dda/mods/Aftershock/items/ammo/foam.json
+share/cataclysm-dda/mods/Aftershock/items/ammo/plasma.json
+share/cataclysm-dda/mods/Aftershock/items/ammo_effects.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/comestibles/alienfood.json
+share/cataclysm-dda/mods/Aftershock/items/comestibles/bug_brew.json
+share/cataclysm-dda/mods/Aftershock/items/comestibles/cheap_food.json
+share/cataclysm-dda/mods/Aftershock/items/comestibles/comestibles.json
+share/cataclysm-dda/mods/Aftershock/items/containers.json
share/cataclysm-dda/mods/Aftershock/items/corpses.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/abstract_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/circuity_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/cloth_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/heat_transfer_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/magnet_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/material_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/optics.json
+share/cataclysm-dda/mods/Aftershock/items/ethereal.json
+share/cataclysm-dda/mods/Aftershock/items/frankenstein_items.json
share/cataclysm-dda/mods/Aftershock/items/furniture.json
+share/cataclysm-dda/mods/Aftershock/items/grenades.json
share/cataclysm-dda/mods/Aftershock/items/gun/5x50.json
+share/cataclysm-dda/mods/Aftershock/items/gun/8x40mm.json
+share/cataclysm-dda/mods/Aftershock/items/gun/advanced.json
+share/cataclysm-dda/mods/Aftershock/items/gun/combination.json
+share/cataclysm-dda/mods/Aftershock/items/gun/foam.json
+share/cataclysm-dda/mods/Aftershock/items/gun/grenade.json
share/cataclysm-dda/mods/Aftershock/items/gun/laser.json
+share/cataclysm-dda/mods/Aftershock/items/gun/migrations.json
+share/cataclysm-dda/mods/Aftershock/items/gun/plasma.json
+share/cataclysm-dda/mods/Aftershock/items/gun/projectile.json
+share/cataclysm-dda/mods/Aftershock/items/gunmods/laser_gunmods.json
+share/cataclysm-dda/mods/Aftershock/items/gunmods/sights.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/magazine/8x40mm.json
+share/cataclysm-dda/mods/Aftershock/items/magazine/alien.json
+share/cataclysm-dda/mods/Aftershock/items/magazine/energy_cell.json
+share/cataclysm-dda/mods/Aftershock/items/magazine/foam.json
+share/cataclysm-dda/mods/Aftershock/items/magazine/plasma.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/mutagen.json
share/cataclysm-dda/mods/Aftershock/items/obsolete.json
+share/cataclysm-dda/mods/Aftershock/items/radio_tools.json
share/cataclysm-dda/mods/Aftershock/items/robotparts.json
+share/cataclysm-dda/mods/Aftershock/items/seed.json
+share/cataclysm-dda/mods/Aftershock/items/tool_armor.json
share/cataclysm-dda/mods/Aftershock/items/tool_quality.json
share/cataclysm-dda/mods/Aftershock/items/tools.json
+share/cataclysm-dda/mods/Aftershock/items/vehicle_items.json
share/cataclysm-dda/mods/Aftershock/items/weapons.json
+share/cataclysm-dda/mods/Aftershock/maps/city_buildings.json
share/cataclysm-dda/mods/Aftershock/maps/furniture.json
-share/cataclysm-dda/mods/Aftershock/maps/item_groups.json
+share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_wall.json
+share/cataclysm-dda/mods/Aftershock/maps/furniture_lab.json
+share/cataclysm-dda/mods/Aftershock/maps/lab_cryo_room.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/astrobiology_lab.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/augmentation_clinic.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/basement_bionic.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/escape_pod.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/formless_ruins/formless_ruins_dynamic.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/millyficent_lab.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/robot_dispatch/dispatch_first_01.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/robot_dispatch/dispatch_second_01.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/robot_dispatch/tpalettes.json
share/cataclysm-dda/mods/Aftershock/maps/mapgen/s_gas.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/sadie_large_storage.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/urban_worm_farm.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/whately_lmoe.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen_pallete/afs_formless_ruins.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen_pallete/afs_generic_building.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen_pallete/augmentation_clinic.json
+share/cataclysm-dda/mods/Aftershock/maps/nested/basement.json
+share/cataclysm-dda/mods/Aftershock/maps/nested/lab.json
+share/cataclysm-dda/mods/Aftershock/maps/nested/sadie_spawn.json
+share/cataclysm-dda/mods/Aftershock/maps/overmap_locations.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/maps/terrain_floraxeno.json
+share/cataclysm-dda/mods/Aftershock/maps/terrain_groundxeno.json
+share/cataclysm-dda/mods/Aftershock/maps/terrain_spaceship.json
share/cataclysm-dda/mods/Aftershock/martialarts.json
+share/cataclysm-dda/mods/Aftershock/migration.json
share/cataclysm-dda/mods/Aftershock/mobs/PrepPhyle_mobs.json
+share/cataclysm-dda/mods/Aftershock/mobs/aliens.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/monster_groups/moxie_monster_groups.json
+share/cataclysm-dda/mods/Aftershock/mobs/monster_groups/robot_monster_groups.json
+share/cataclysm-dda/mods/Aftershock/mobs/mutants.json
+share/cataclysm-dda/mods/Aftershock/mobs/obsolete.json
+share/cataclysm-dda/mods/Aftershock/mobs/robot_groups.json
share/cataclysm-dda/mods/Aftershock/mobs/robots.json
+share/cataclysm-dda/mods/Aftershock/mobs/scavbots.json
+share/cataclysm-dda/mods/Aftershock/mobs/species.json
+share/cataclysm-dda/mods/Aftershock/mobs/turrets.json
+share/cataclysm-dda/mods/Aftershock/mobs/uplifted_monsters.json
+share/cataclysm-dda/mods/Aftershock/mobs/water_mobs.json
share/cataclysm-dda/mods/Aftershock/mobs/zombies.json
share/cataclysm-dda/mods/Aftershock/modinfo.json
+share/cataclysm-dda/mods/Aftershock/monster_attacks.json
+share/cataclysm-dda/mods/Aftershock/monsterdrops/monster_default.json
+share/cataclysm-dda/mods/Aftershock/monsterdrops/monsterdrops.json
+share/cataclysm-dda/mods/Aftershock/mutations/dreams.json
share/cataclysm-dda/mods/Aftershock/mutations/mutations.json
+share/cataclysm-dda/mods/Aftershock/mutations/obsolete.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_afterlife.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/criminal_experiment.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/cyberninja.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/ganger_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/ganger_2.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/ganger_3.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/npc_classes_mutant.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/radiation_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/radiation_2.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/recent_mutation_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/selftest.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/trait_groups.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/uplifted_animal_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/uplifted_animal_2.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/uplifted_animal_3.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/uplifted_animal_4.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/uplifted_animal_5.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/vatgrown_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/whately.json
share/cataclysm-dda/mods/Aftershock/npcs/classes.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/backgrounds/bg_traits_cyborg.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/backgrounds/trait_groups_cyborg.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/item_groups_cyborg.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/npc_classes_cyborg.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyropod_classes.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyrus_whately.json
share/cataclysm-dda/mods/Aftershock/npcs/factions.json
+share/cataclysm-dda/mods/Aftershock/npcs/frankenstein_classes.json
+share/cataclysm-dda/mods/Aftershock/npcs/milly_whately_dialogue.json
+share/cataclysm-dda/mods/Aftershock/npcs/mutant_npcs/npc_classes_mutant.json
+share/cataclysm-dda/mods/Aftershock/npcs/mutant_npcs/trait_groups.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/npcs/sadie.json
+share/cataclysm-dda/mods/Aftershock/npcs/threshold_recruit_dialogue.json
+share/cataclysm-dda/mods/Aftershock/npcs/whately_generic_dialogue.json
+share/cataclysm-dda/mods/Aftershock/options.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/ammo_recipes.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/deconstruction/bionic_deconstruction.json
+share/cataclysm-dda/mods/Aftershock/recipes/deconstruction/robot.json
+share/cataclysm-dda/mods/Aftershock/recipes/electronics_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/frankenstein_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/grenades.json
+share/cataclysm-dda/mods/Aftershock/recipes/mutagens.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/recipes_categories.json
share/cataclysm-dda/mods/Aftershock/recipes/requirements.json
+share/cataclysm-dda/mods/Aftershock/recipes/robot_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/ultratech_tools.json
share/cataclysm-dda/mods/Aftershock/recipes/uncraft.json
+share/cataclysm-dda/mods/Aftershock/region_settings.json
+share/cataclysm-dda/mods/Aftershock/requirements.json
share/cataclysm-dda/mods/Aftershock/scenarios.json
+share/cataclysm-dda/mods/Aftershock/snippets.json
share/cataclysm-dda/mods/Aftershock/speech.json
+share/cataclysm-dda/mods/Aftershock/spells.json
+share/cataclysm-dda/mods/Aftershock/spells/enchantments.json
share/cataclysm-dda/mods/Aftershock/spells/hologram_spells.json
+share/cataclysm-dda/mods/Aftershock/start_locations.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/BlazeIndustries/README.txt
+share/cataclysm-dda/mods/BlazeIndustries/blaze_furniture.json
+share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/blaze_engine.json
+share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/blaze_gun.json
+share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/blaze_other.json
+share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/blaze_solar.json
+share/cataclysm-dda/mods/BlazeIndustries/modinfo.json
+share/cataclysm-dda/mods/BlazeIndustries/recipes/blaze_construction_recipes.json
+share/cataclysm-dda/mods/BlazeIndustries/recipes/blaze_gun_recipes.json
+share/cataclysm-dda/mods/BlazeIndustries/recipes/blaze_other_recipes.json
+share/cataclysm-dda/mods/BlazeIndustries/recipes/construction_group.json
+share/cataclysm-dda/mods/BlazeIndustries/snippets.json
+share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/blaze_combustion.json
+share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/blaze_other_parts.json
+share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/blaze_turrets_vanilla.json
+share/cataclysm-dda/mods/CRT_EXPANSION/construction_group.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/deadspace/deadspaceitems.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
@@ -1732,7 +2135,9 @@ share/cataclysm-dda/mods/CRT_EXPANSION/i
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_enchants.json
share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_item_groups.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_makeshift_survival.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
@@ -1756,8 +2161,11 @@ share/cataclysm-dda/mods/CRT_EXPANSION/m
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/Chibi_Ultica/large.png
+share/cataclysm-dda/mods/Chibi_Ultica/mod_tileset.json
+share/cataclysm-dda/mods/Chibi_Ultica/modinfo.json
+share/cataclysm-dda/mods/Chibi_Ultica/tall.png
+share/cataclysm-dda/mods/Chibi_Ultica/tiles.png
share/cataclysm-dda/mods/CrazyCataclysm/crazy_aperturepotato.json
share/cataclysm-dda/mods/CrazyCataclysm/crazy_comestibles.json
share/cataclysm-dda/mods/CrazyCataclysm/crazy_item_groups.json
@@ -1768,32 +2176,118 @@ share/cataclysm-dda/mods/CrazyCataclysm/
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/DeoxyMod/Deoxy_vehicle_parts.json
-share/cataclysm-dda/mods/DeoxyMod/modinfo.json
-share/cataclysm-dda/mods/DinoMod/dinosaur.json
-share/cataclysm-dda/mods/DinoMod/fieldoffice.json
+share/cataclysm-dda/mods/Dark-Skies-Above/DESIGN.md
+share/cataclysm-dda/mods/Dark-Skies-Above/README.md
+share/cataclysm-dda/mods/Dark-Skies-Above/TODO.md
+share/cataclysm-dda/mods/Dark-Skies-Above/ammo_effect.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/item_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/location_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/mon_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/recipes_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/scenario_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/trait_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/effects.json
+share/cataclysm-dda/mods/Dark-Skies-Above/factions.json
+share/cataclysm-dda/mods/Dark-Skies-Above/harvest.json
+share/cataclysm-dda/mods/Dark-Skies-Above/items/alien-scrap.json
+share/cataclysm-dda/mods/Dark-Skies-Above/items/electronics.json
+share/cataclysm-dda/mods/Dark-Skies-Above/materials.json
+share/cataclysm-dda/mods/Dark-Skies-Above/modinfo.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monattack.json
+share/cataclysm-dda/mods/Dark-Skies-Above/mondrops.json
+share/cataclysm-dda/mods/Dark-Skies-Above/mongun.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monspell.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/alien_cyborgs.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/alien_fauna.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/alien_robots.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/mon_groups/alienanimal_spawns.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/mon_groups/invader_spawns.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/mon_groups/stray_spawns.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/strays.json
+share/cataclysm-dda/mods/Dark-Skies-Above/mutations/traits.json
+share/cataclysm-dda/mods/Dark-Skies-Above/obsolete.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/furniture_terrain/outdoor-furniture.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/armor.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/books.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/carnivore.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/electronic.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/generics.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/newspaper.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/ranged.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/tools.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/vehicle.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/weapons.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/locations/cemetery.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/locations/evac_center.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/locations/overmap_special.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/monsters.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/region_settings.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/scenarios.json
+share/cataclysm-dda/mods/Dark-Skies-Above/recipies/uncraft.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/fliers.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/graffiti.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/newspaper.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/radio.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/survnotes.json
+share/cataclysm-dda/mods/Dark-Skies-Above/species.json
+share/cataclysm-dda/mods/Dark-Skies-Above/speech/neworder_speech.json
+share/cataclysm-dda/mods/DinoMod/DESIGN.md
+share/cataclysm-dda/mods/DinoMod/NPC/BEGGAR_2_Dino_Dave.json
+share/cataclysm-dda/mods/DinoMod/NPC/NC_BO_BARONYX.json
+share/cataclysm-dda/mods/DinoMod/NPC/NC_Red.json
+share/cataclysm-dda/mods/DinoMod/NPC/NPC_old_guard_representative.json
+share/cataclysm-dda/mods/DinoMod/NPC/npc_classes_mutant.json
+share/cataclysm-dda/mods/DinoMod/NPC/trait_groups.json
+share/cataclysm-dda/mods/DinoMod/README.md
+share/cataclysm-dda/mods/DinoMod/cooking_components.json
+share/cataclysm-dda/mods/DinoMod/egg.json
+share/cataclysm-dda/mods/DinoMod/forage.json
share/cataclysm-dda/mods/DinoMod/harvest.json
+share/cataclysm-dda/mods/DinoMod/hints.json
+share/cataclysm-dda/mods/DinoMod/items.json
+share/cataclysm-dda/mods/DinoMod/items/books.json
+share/cataclysm-dda/mods/DinoMod/items/itemgroups.json
+share/cataclysm-dda/mods/DinoMod/items/mutagen.json
+share/cataclysm-dda/mods/DinoMod/lab_notes.json
+share/cataclysm-dda/mods/DinoMod/laser_items.json
+share/cataclysm-dda/mods/DinoMod/mapgen/DinoLabFinale.json
+share/cataclysm-dda/mods/DinoMod/mapgen/basement_chem.json
+share/cataclysm-dda/mods/DinoMod/mapgen/basement_lab_stairs.json
+share/cataclysm-dda/mods/DinoMod/mapgen/church.json
+share/cataclysm-dda/mods/DinoMod/mapgen/dinoexhibit.json
+share/cataclysm-dda/mods/DinoMod/mapgen/farm.json
+share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_maiasaura.json
+share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_tyrannosaurus.json
+share/cataclysm-dda/mods/DinoMod/mapgen/railroad_station.json
+share/cataclysm-dda/mods/DinoMod/mapgen/zoo.json
share/cataclysm-dda/mods/DinoMod/modinfo.json
+share/cataclysm-dda/mods/DinoMod/monster_factions.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/dinosaur.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/fungi.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/lab.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/monstergroups_egg.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/wilderness.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/zinosaur.json
+share/cataclysm-dda/mods/DinoMod/monsters/dinosaur.json
+share/cataclysm-dda/mods/DinoMod/monsters/dinosaur_CBM.json
+share/cataclysm-dda/mods/DinoMod/monsters/fungus.json
+share/cataclysm-dda/mods/DinoMod/monsters/hatchling.json
+share/cataclysm-dda/mods/DinoMod/monsters/juvenile.json
+share/cataclysm-dda/mods/DinoMod/monsters/zed-dinosaur.json
+share/cataclysm-dda/mods/DinoMod/monsters/zed-dinosaur_CBM.json
+share/cataclysm-dda/mods/DinoMod/monsters/zinosaur_upgrade.json
+share/cataclysm-dda/mods/DinoMod/mutations/dreams.json
+share/cataclysm-dda/mods/DinoMod/mutations/mutations.json
+share/cataclysm-dda/mods/DinoMod/obsolete/fieldoffice.json
+share/cataclysm-dda/mods/DinoMod/obsolete/monsters.json
+share/cataclysm-dda/mods/DinoMod/overmap/map_extras.json
+share/cataclysm-dda/mods/DinoMod/overmap/overmap_specials.json
+share/cataclysm-dda/mods/DinoMod/overmap/overmap_terrain.json
+share/cataclysm-dda/mods/DinoMod/recipe_medsandchemicals.json
share/cataclysm-dda/mods/DinoMod/regional_overlay.json
share/cataclysm-dda/mods/DinoMod/snippets.json
-share/cataclysm-dda/mods/EW_Pack/ew_ammo.json
-share/cataclysm-dda/mods/EW_Pack/ew_ammo_handloaded.json
-share/cataclysm-dda/mods/EW_Pack/ew_ammo_t.json
-share/cataclysm-dda/mods/EW_Pack/ew_books.json
-share/cataclysm-dda/mods/EW_Pack/ew_bullet_pulling.json
-share/cataclysm-dda/mods/EW_Pack/ew_item_groups.json
-share/cataclysm-dda/mods/EW_Pack/ew_magazines.json
-share/cataclysm-dda/mods/EW_Pack/ew_recipes.json
-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/FictonalWeapons/fic_item_groups.json
-share/cataclysm-dda/mods/FictonalWeapons/fic_mods.json
-share/cataclysm-dda/mods/FictonalWeapons/fic_recipes.json
-share/cataclysm-dda/mods/FictonalWeapons/fic_weapons.json
-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/DinoMod/startlocations.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
@@ -1802,9 +2296,6 @@ share/cataclysm-dda/mods/Fuji_Mil_Prof/p
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
share/cataclysm-dda/mods/Fuji_Structures/modinfo.json
share/cataclysm-dda/mods/Fuji_Structures/monsters/monstergroups.json
share/cataclysm-dda/mods/Fuji_Structures/npc/NC_BUNKER_MERCHANT.json
@@ -1814,17 +2305,6 @@ share/cataclysm-dda/mods/Fuji_Structures
share/cataclysm-dda/mods/Fuji_Structures/starts/professions.json
share/cataclysm-dda/mods/Fuji_Structures/starts/scenarios.json
share/cataclysm-dda/mods/Fuji_Structures/starts/start_locations.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_atc.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_atc_2.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_atc_3.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_hangars.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_parking.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_hangars.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_l.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_r.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_term.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_term.json
share/cataclysm-dda/mods/Fuji_Structures/worldgen/bunker_shop/s_bunker_shop_b.json
share/cataclysm-dda/mods/Fuji_Structures/worldgen/bunker_shop/s_bunker_shop_g.json
share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_b11.json
@@ -1832,36 +2312,8 @@ share/cataclysm-dda/mods/Fuji_Structures
share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_b21.json
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/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/ammo/black_powder.json
share/cataclysm-dda/mods/Generic_Guns/ammo/casings.json
share/cataclysm-dda/mods/Generic_Guns/ammo/gg_ammo_migration.json
@@ -1875,6 +2327,7 @@ share/cataclysm-dda/mods/Generic_Guns/am
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/bandoliers/holster.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
@@ -1899,6 +2352,7 @@ share/cataclysm-dda/mods/Generic_Guns/ma
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/obsolete.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
@@ -1911,8 +2365,13 @@ share/cataclysm-dda/mods/Generic_Guns/re
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/uncraft/ammo/grenade_propelled.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/pistol.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/pistol_magnum.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/pistol_tiny.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/rifle.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/rifle_huge.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/shot.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
@@ -1949,28 +2408,12 @@ share/cataclysm-dda/mods/Graphical_Overm
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_Magiclysm/go_overmap_terrain_magical.json
+share/cataclysm-dda/mods/Graphical_Overmap_Magiclysm/modinfo.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
@@ -1979,7 +2422,30 @@ share/cataclysm-dda/mods/MMA/mutations.j
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/attunements/Artificer.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Biotek.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Blood_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Boreal_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Cleansing_Flame.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Earth_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Fire_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Force_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Glacier_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Golemancer.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Gravity_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Ice_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Illusionist.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Magnetism_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Overclocker.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Radiation_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Soulfire.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Storm_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Sun_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Tundra_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Vulcanist.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Wither_Mage.json
share/cataclysm-dda/mods/Magiclysm/Spells/biomancer.json
+share/cataclysm-dda/mods/Magiclysm/Spells/black_dragon.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
@@ -1989,25 +2455,24 @@ share/cataclysm-dda/mods/Magiclysm/Spell
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/manatouched.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/achievements/spells.json
+share/cataclysm-dda/mods/Magiclysm/achievements/statistics.json
share/cataclysm-dda/mods/Magiclysm/bionics.json
+share/cataclysm-dda/mods/Magiclysm/construction_group.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/emitter.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Fire_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Gaias_Chosen.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Ice_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Soulfire.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Storm_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Sun_Mage.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Void_Mage.json
share/cataclysm-dda/mods/Magiclysm/field.json
share/cataclysm-dda/mods/Magiclysm/furniture.json
share/cataclysm-dda/mods/Magiclysm/harvest.json
@@ -2020,16 +2485,32 @@ share/cataclysm-dda/mods/Magiclysm/items
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/books_lore.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/containers.json
share/cataclysm-dda/mods/Magiclysm/items/enchanted.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_belts.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_boots.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_bracers.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_cloaks.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_gunmods.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_masks.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_melee.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_misc.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_ranged.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_rings.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_tokens.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_unarmed.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_wands.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/mutagen.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
@@ -2048,11 +2529,23 @@ share/cataclysm-dda/mods/Magiclysm/monst
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/Ogre.json
+share/cataclysm-dda/mods/Magiclysm/monsters/Orcs.json
share/cataclysm-dda/mods/Magiclysm/monsters/demon_spider.json
share/cataclysm-dda/mods/Magiclysm/monsters/dragon.json
+share/cataclysm-dda/mods/Magiclysm/monsters/forgedwellers.json
+share/cataclysm-dda/mods/Magiclysm/monsters/goblin.json
share/cataclysm-dda/mods/Magiclysm/monsters/golems.json
+share/cataclysm-dda/mods/Magiclysm/monsters/holiday_magiclysm.json
share/cataclysm-dda/mods/Magiclysm/monsters/lizardfolk.json
share/cataclysm-dda/mods/Magiclysm/monsters/monsters.json
+share/cataclysm-dda/mods/Magiclysm/monsters/zombified_monsters.json
+share/cataclysm-dda/mods/Magiclysm/mutations/dragon_mutation_category.json
+share/cataclysm-dda/mods/Magiclysm/mutations/mutation_effects.json
+share/cataclysm-dda/mods/Magiclysm/mutations/mutation_enchantments.json
+share/cataclysm-dda/mods/Magiclysm/mutations/mutations.json
+share/cataclysm-dda/mods/Magiclysm/mutations/overlay_ordering.json
+share/cataclysm-dda/mods/Magiclysm/npc/TALK_FORGE_MERCHANT.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
@@ -2061,9 +2554,14 @@ share/cataclysm-dda/mods/Magiclysm/npc/f
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/npc/trait_groups.json
share/cataclysm-dda/mods/Magiclysm/professions.json
+share/cataclysm-dda/mods/Magiclysm/proficiencies.json
+share/cataclysm-dda/mods/Magiclysm/qualities.json
share/cataclysm-dda/mods/Magiclysm/recipes.json
share/cataclysm-dda/mods/Magiclysm/recipes/alchemy.json
+share/cataclysm-dda/mods/Magiclysm/recipes/armor.json
+share/cataclysm-dda/mods/Magiclysm/recipes/blacksmithing.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
@@ -2071,64 +2569,49 @@ share/cataclysm-dda/mods/Magiclysm/recip
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/recipe_vehicle.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/requirements/spell_components.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/attunements.json
share/cataclysm-dda/mods/Magiclysm/traits/classes.json
+share/cataclysm-dda/mods/Magiclysm/traits/manatouched.json
share/cataclysm-dda/mods/Magiclysm/traits/mutation.json
+share/cataclysm-dda/mods/Magiclysm/traits/temporary_demon_traits.json
+share/cataclysm-dda/mods/Magiclysm/traps.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/summoned_vehicles.json
share/cataclysm-dda/mods/Magiclysm/vehicles/vans_busses.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/attunement_altar.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/forest_tomb.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/forge_of_wonders.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/goblin_encampment.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/house_technomancer.json
share/cataclysm-dda/mods/Magiclysm/worldgen/lake_retreat.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/magic_academy.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/nested_mapgen.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/orc_village.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_types.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/modinfo.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_shields.json
-share/cataclysm-dda/mods/Medieval_Stuff/recipe_weapon.json
-share/cataclysm-dda/mods/Medieval_Stuff/shields.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
-share/cataclysm-dda/mods/Modular_Turrets/emit.json
-share/cataclysm-dda/mods/Modular_Turrets/furniture.json
-share/cataclysm-dda/mods/Modular_Turrets/item_groups.json
-share/cataclysm-dda/mods/Modular_Turrets/items.json
-share/cataclysm-dda/mods/Modular_Turrets/modinfo.json
-share/cataclysm-dda/mods/Modular_Turrets/monster.json
-share/cataclysm-dda/mods/Modular_Turrets/monster_attacks.json
-share/cataclysm-dda/mods/Modular_Turrets/monster_drops.json
-share/cataclysm-dda/mods/Modular_Turrets/monster_override.json
-share/cataclysm-dda/mods/Modular_Turrets/monstergroups.json
-share/cataclysm-dda/mods/Modular_Turrets/recipe.json
-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_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
@@ -2913,22 +3396,6 @@ share/cataclysm-dda/mods/More_Locations/
share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_ubrc_01.json
share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_utlc_01.json
share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_utrc_01.json
-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/effects.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/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
@@ -2936,9 +3403,14 @@ share/cataclysm-dda/mods/My_Sweet_Catacl
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_furniture.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_mapgen/sweet_overmap_locations.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_overmap_terrain.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_specials.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_terrain.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
@@ -2953,13 +3425,6 @@ share/cataclysm-dda/mods/My_Sweet_Catacl
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/National_Guard_Camp/furniture.json
share/cataclysm-dda/mods/National_Guard_Camp/item_groups.json
share/cataclysm-dda/mods/National_Guard_Camp/military.json
@@ -2971,126 +3436,51 @@ share/cataclysm-dda/mods/National_Guard_
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_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
share/cataclysm-dda/mods/No_Fungi/modinfo.json
share/cataclysm-dda/mods/No_Fungi/terrain.json
-share/cataclysm-dda/mods/No_Medieval_Items/modinfo.json
-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/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/Only_Wildlife/modinfo.json
-share/cataclysm-dda/mods/RL_Classes/classes.json
-share/cataclysm-dda/mods/RL_Classes/modinfo.json
-share/cataclysm-dda/mods/Safe_autodoc/game_balance.json
-share/cataclysm-dda/mods/Safe_autodoc/modinfo.json
-share/cataclysm-dda/mods/Salvaged_Robots/corpses.json
-share/cataclysm-dda/mods/Salvaged_Robots/emit.json
-share/cataclysm-dda/mods/Salvaged_Robots/harvest.json
-share/cataclysm-dda/mods/Salvaged_Robots/item_groups.json
-share/cataclysm-dda/mods/Salvaged_Robots/items.json
-share/cataclysm-dda/mods/Salvaged_Robots/modinfo.json
-share/cataclysm-dda/mods/Salvaged_Robots/monster_attacks.json
-share/cataclysm-dda/mods/Salvaged_Robots/monster_drops.json
-share/cataclysm-dda/mods/Salvaged_Robots/monstergroups.json
-share/cataclysm-dda/mods/Salvaged_Robots/monsters.json
-share/cataclysm-dda/mods/Salvaged_Robots/recipe.json
-share/cataclysm-dda/mods/Salvaged_Robots/roboguns.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/40mm.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/item_groups.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/items.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/overmap_special.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/overmap_terrain.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/paintball.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/professions.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/readme.txt
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_first_01.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_second_01.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/scenarios.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/start_locations.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/tpalettes.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/vehicle_groups.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/vehicle_parts.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/vehicles.json
-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/modinfo.json
share/cataclysm-dda/mods/StatsThroughSkills/modinfo.json
share/cataclysm-dda/mods/TEST_DATA/README.md
+share/cataclysm-dda/mods/TEST_DATA/ammo.json
+share/cataclysm-dda/mods/TEST_DATA/basecamp.json
+share/cataclysm-dda/mods/TEST_DATA/bionics.json
+share/cataclysm-dda/mods/TEST_DATA/effects.json
+share/cataclysm-dda/mods/TEST_DATA/enchantments.json
+share/cataclysm-dda/mods/TEST_DATA/itemgroups.json
+share/cataclysm-dda/mods/TEST_DATA/items.json
+share/cataclysm-dda/mods/TEST_DATA/magic.json
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
-share/cataclysm-dda/mods/Tanks/modinfo.json
-share/cataclysm-dda/mods/Tanks/monster_drops.json
-share/cataclysm-dda/mods/Tanks/monsters.json
-share/cataclysm-dda/mods/Tanks/parts.json
-share/cataclysm-dda/mods/Tanks/recipes.json
-share/cataclysm-dda/mods/Tanks/snippets.json
-share/cataclysm-dda/mods/Tanks/vehicle_groups.json
-share/cataclysm-dda/mods/Tanks/vehicles.json
-share/cataclysm-dda/mods/Tolerate_This/comestibles.json
-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/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
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_13_dense_house_apt_house.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_14_dense_house_mart_food.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_15_house.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_16_house_ranch.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_17_house_ranch.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_18_victorian.json
+share/cataclysm-dda/mods/TEST_DATA/mutations.json
+share/cataclysm-dda/mods/TEST_DATA/recipes.json
+share/cataclysm-dda/mods/TEST_DATA/uncraft.json
+share/cataclysm-dda/mods/TEST_DATA/vehicle.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_19_victorian.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_1_house.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_20_duplex.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_21_house.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_22_house_pool.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_23_dense_office_theater.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_24_dense_bank_house.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_25_dense_diner_apt.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_26_dense_club.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_27_dense_barber_apt.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_28_dense_cafe_laundry.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_29_dense_row.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_2_house.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_30_dense_subway.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_31_police_station.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_32_fire_station.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_33_hotel.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_34_school.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_35_hospital.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_36_projects.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_37_office_tower_beehive.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_38_bar_hardware_house.json
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
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_7_house_garden.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_8_house_brick_garden.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_9_house_garage_loft.json
share/cataclysm-dda/mods/Urban_Development/mapgen_palettes/acidia_commercial_destroyed_palette.json
share/cataclysm-dda/mods/Urban_Development/mapgen_palettes/acidia_commercial_palette.json
share/cataclysm-dda/mods/Urban_Development/mapgen_palettes/acidia_residential_commercial_palette.json
@@ -3098,40 +3488,19 @@ 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/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/blazemod/blaze_ammo.json
-share/cataclysm-dda/mods/blazemod/blaze_ammo_recipes.json
-share/cataclysm-dda/mods/blazemod/blaze_ammo_types.json
-share/cataclysm-dda/mods/blazemod/blaze_autoweapons_parts.json
-share/cataclysm-dda/mods/blazemod/blaze_blob.json
-share/cataclysm-dda/mods/blazemod/blaze_blob_construct.json
-share/cataclysm-dda/mods/blazemod/blaze_blob_monster.json
-share/cataclysm-dda/mods/blazemod/blaze_blob_parts.json
-share/cataclysm-dda/mods/blazemod/blaze_blob_recipes.json
-share/cataclysm-dda/mods/blazemod/blaze_magazine_recipes.json
-share/cataclysm-dda/mods/blazemod/blaze_magazines.json
-share/cataclysm-dda/mods/blazemod/blaze_migration.json
-share/cataclysm-dda/mods/blazemod/blaze_other.json
-share/cataclysm-dda/mods/blazemod/blaze_other_parts.json
-share/cataclysm-dda/mods/blazemod/blaze_other_recipes.json
-share/cataclysm-dda/mods/blazemod/blaze_override.json
-share/cataclysm-dda/mods/blazemod/blaze_test.json
-share/cataclysm-dda/mods/blazemod/blaze_weapons.json
-share/cataclysm-dda/mods/blazemod/blaze_weapons_parts.json
-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/missiondef.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_monster_factions.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
@@ -3141,115 +3510,9 @@ share/cataclysm-dda/mods/desert_region/d
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/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
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2be_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2blc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2brc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2le_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2mid_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2re_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2te_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2tlc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2trc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3be_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3blc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3brc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3le_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3mid_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3re_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3te_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3tlc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3trc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_entrance_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_entrance_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_parking_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/overmap_specials.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/overmap_terrain.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/palettes.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/monster_groups.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/overmap_specials.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/overmap_terrain.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/palettes.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_blc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_brc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_entrance_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_fblc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_fbrc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ftlc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ftrc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_trc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ublc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ublc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ublc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ubrc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ubrc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ubrc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlca_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlca_02.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlca_03.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_02.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_03.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_04.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utrc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utrc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utrc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/modinfo.json
-share/cataclysm-dda/mods/more_classes_scenarios/cs_classes.json
-share/cataclysm-dda/mods/more_classes_scenarios/cs_scenarios.json
-share/cataclysm-dda/mods/more_classes_scenarios/cs_start_locations.json
-share/cataclysm-dda/mods/more_classes_scenarios/modinfo.json
-share/cataclysm-dda/mods/necromancy/modinfo.json
-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/package_bionic_professions/bionic_professions.json
+share/cataclysm-dda/mods/package_bionic_professions/modinfo.json
+share/cataclysm-dda/mods/package_bionic_professions/scenarios.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
@@ -3279,11 +3542,13 @@ share/cataclysm-dda/names/ko.json
share/cataclysm-dda/names/ru.json
share/cataclysm-dda/names/zh_CN.json
share/cataclysm-dda/names/zh_TW.json
+share/cataclysm-dda/raw/color_templates/default.json
share/cataclysm-dda/raw/color_templates/no_bright_background.json
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.alt1
share/cataclysm-dda/title/en.christmas
share/cataclysm-dda/title/en.easter
share/cataclysm-dda/title/en.halloween
@@ -3291,15 +3556,17 @@ share/cataclysm-dda/title/en.independenc
share/cataclysm-dda/title/en.new_year
share/cataclysm-dda/title/en.thanksgiving
share/cataclysm-dda/title/en.title
+share/cataclysm-dda/title/ru.alt1
share/cataclysm-dda/title/ru.title
share/cataclysm-dda/title/zh_CN.title
share/locale/ar/LC_MESSAGES/cataclysm-dda.mo
+share/locale/cs/LC_MESSAGES/cataclysm-dda.mo
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/fil_PH/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
Index: pkgsrc/games/cataclysm-dda/distinfo
diff -u pkgsrc/games/cataclysm-dda/distinfo:1.4 pkgsrc/games/cataclysm-dda/distinfo:1.5
--- pkgsrc/games/cataclysm-dda/distinfo:1.4 Sat Dec 19 10:54:28 2020
+++ pkgsrc/games/cataclysm-dda/distinfo Mon Jul 12 20:54:02 2021
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.4 2020/12/19 10:54:28 nia Exp $
+$NetBSD: distinfo,v 1.5 2021/07/12 20:54:02 nia Exp $
-SHA1 (cataclysm-dda-0.E.3.tar.gz) = 8603f79a261960f520d55a98ce58cb628086994e
-RMD160 (cataclysm-dda-0.E.3.tar.gz) = d9cc848fa0ef24a2772d1f294de1b3a14ddaa578
-SHA512 (cataclysm-dda-0.E.3.tar.gz) = 6d8c330c01a1f9ca4708f424da67ad08117b71db5ba24ad86718d22140bf911ddd49d54460fbb8d58d20478a75df3b79479841dd8b160a8557dd8e34ac63a7c5
-Size (cataclysm-dda-0.E.3.tar.gz) = 70144192 bytes
-SHA1 (patch-lang_compile__mo.sh) = d62c0cd564ed67d0401eba3f571db546748b6b3d
-SHA1 (patch-src_translations.cpp) = 6d7650746dbe661f7442409beacbf93cd94dddf8
-SHA1 (patch-src_translations.h) = 13bbd0d1fd5ce1ec9588fbf89f63ff8ed2894e9e
+SHA1 (cataclysm-dda-0.F.tar.gz) = 59865f66e9bf46954d30d85c063f2c570341220b
+RMD160 (cataclysm-dda-0.F.tar.gz) = 770001ee2f64737f11d852dc337aa17139b04826
+SHA512 (cataclysm-dda-0.F.tar.gz) = 9dd32f6fda936b77007a1f0e3fca85c25c3c87f41819fa55b0c454c2cc756664a688c910bd981bc1ba14859401d0d8eebd1515d1b9d4a34d6ffe0303e699eb0b
+Size (cataclysm-dda-0.F.tar.gz) = 88591910 bytes
+SHA1 (patch-Makefile) = cee0c0e1a6293b5beafe06fe2282d469bcd995a2
+SHA1 (patch-lang_compile__mo.sh) = 1a2e65a5f5a5b8c4f56ceb9ddc8e3383856fac57
+SHA1 (patch-src_translations.cpp) = 90d55c1b526bcf44c8b0c902ac2c4df5c87ba68f
+SHA1 (patch-src_translations.h) = 106413eefeaff7b99661f781e2fb4002a3eace52
Index: pkgsrc/games/cataclysm-dda-sdl/Makefile
diff -u pkgsrc/games/cataclysm-dda-sdl/Makefile:1.7 pkgsrc/games/cataclysm-dda-sdl/Makefile:1.8
--- pkgsrc/games/cataclysm-dda-sdl/Makefile:1.7 Tue Dec 8 12:08:20 2020
+++ pkgsrc/games/cataclysm-dda-sdl/Makefile Mon Jul 12 20:54:02 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/12/08 12:08:20 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/07/12 20:54:02 nia Exp $
.include "../../games/cataclysm-dda/Makefile.common"
@@ -40,14 +40,14 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/LICENSE.txt \
${DESTDIR}${PREFIX}/share/cataclysm-dda
cd ${WRKSRC} && LOCALE_DIR=${DESTDIR}${PREFIX}/share/locale ${SH} lang/compile_mo.sh
- ${INSTALL_DATA} ${WRKSRC}/data/xdg/cataclysm-dda.desktop \
+ ${INSTALL_DATA} ${WRKSRC}/data/xdg/org.cataclysmdda.CataclysmDDA.desktop \
${DESTDIR}${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/data/xdg/cataclysm-dda.appdata.xml \
+ ${INSTALL_DATA} ${WRKSRC}/data/xdg/org.cataclysmdda.CataclysmDDA.appdata.xml \
${DESTDIR}${PREFIX}/share/appdata
- ${INSTALL_DATA} ${WRKSRC}/data/xdg/cataclysm-dda.svg \
+ ${INSTALL_DATA} ${WRKSRC}/data/xdg/org.cataclysmdda.CataclysmDDA.svg \
${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
.for s in ${ICON_SIZES}
- ${INSTALL_DATA} ${WRKSRC}/data/osx/AppIcon.iconset/icon_${s}x${s}.png \
+ ${INSTALL_DATA} ${WRKSRC}/build-data/osx/AppIcon.iconset/icon_${s}x${s}.png \
${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/cataclysm-dda.png
.endfor
Index: pkgsrc/games/cataclysm-dda-sdl/PLIST
diff -u pkgsrc/games/cataclysm-dda-sdl/PLIST:1.2 pkgsrc/games/cataclysm-dda-sdl/PLIST:1.3
--- pkgsrc/games/cataclysm-dda-sdl/PLIST:1.2 Thu Apr 30 14:57:30 2020
+++ pkgsrc/games/cataclysm-dda-sdl/PLIST Mon Jul 12 20:54:02 2021
@@ -1,15 +1,24 @@
-@comment $NetBSD: PLIST,v 1.2 2020/04/30 14:57:30 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/07/12 20:54:02 nia Exp $
bin/cataclysm-tiles
-share/appdata/cataclysm-dda.appdata.xml
-share/applications/cataclysm-dda.desktop
+share/appdata/org.cataclysmdda.CataclysmDDA.appdata.xml
+share/applications/org.cataclysmdda.CataclysmDDA.desktop
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/game_balance.json
+share/cataclysm-dda/core/sentinels.json
share/cataclysm-dda/core/tips.json
+share/cataclysm-dda/core/weather.json
share/cataclysm-dda/credits/en.credits
+share/cataclysm-dda/credits/es_AR.credits
+share/cataclysm-dda/credits/es_ES.credits
+share/cataclysm-dda/credits/ja.credits
+share/cataclysm-dda/credits/pl.credits
share/cataclysm-dda/credits/ru.credits
+share/cataclysm-dda/credits/zh_CN.credits
+share/cataclysm-dda/font/Terminus.ttf
share/cataclysm-dda/font/map_font_LARWICK.png
+share/cataclysm-dda/font/map_font_LAWRICK_Colored.png
share/cataclysm-dda/font/terminus.fon
share/cataclysm-dda/font/unifont.ttf
share/cataclysm-dda/fontdata.json
@@ -17,16 +26,69 @@ share/cataclysm-dda/gfx/ASCIITileset/ASC
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/big.png
share/cataclysm-dda/gfx/BrownLikeBears/fallback.png
+share/cataclysm-dda/gfx/BrownLikeBears/mods.png
+share/cataclysm-dda/gfx/BrownLikeBears/tall.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/BrownLikeBears/toped.png
+share/cataclysm-dda/gfx/BrownLikeBears/wide.png
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/ChibiUltica/ChibiHugeAftershockMonster.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiLargeMonster.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiLargeMonsterMagiclysm.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiLargeOverlay.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiNormalCharacter.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiNormalCharacterMagiclysm.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiNormalMonster.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiNormalMonsterMSC.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiNormalMonsterMagiclysm.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiTallMonster.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiTallMonsterMSC.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiTallMonsterMagiclysm.png
+share/cataclysm-dda/gfx/ChibiUltica/ChibiTallOverlay.png
+share/cataclysm-dda/gfx/ChibiUltica/centered.png
+share/cataclysm-dda/gfx/ChibiUltica/fallback.png
+share/cataclysm-dda/gfx/ChibiUltica/fillergiant.png
+share/cataclysm-dda/gfx/ChibiUltica/fillerhoder.png
+share/cataclysm-dda/gfx/ChibiUltica/giant.png
+share/cataclysm-dda/gfx/ChibiUltica/huge.png
+share/cataclysm-dda/gfx/ChibiUltica/incomplete.png
+share/cataclysm-dda/gfx/ChibiUltica/incomplete_large.png
+share/cataclysm-dda/gfx/ChibiUltica/incomplete_tall.png
+share/cataclysm-dda/gfx/ChibiUltica/large.png
+share/cataclysm-dda/gfx/ChibiUltica/normal.png
+share/cataclysm-dda/gfx/ChibiUltica/small.png
+share/cataclysm-dda/gfx/ChibiUltica/tallfurniture.png
+share/cataclysm-dda/gfx/ChibiUltica/tallmonsters.png
+share/cataclysm-dda/gfx/ChibiUltica/tallshadows.png
+share/cataclysm-dda/gfx/ChibiUltica/tallterrain.png
+share/cataclysm-dda/gfx/ChibiUltica/tallvehicle.png
+share/cataclysm-dda/gfx/ChibiUltica/tile_config.json
+share/cataclysm-dda/gfx/ChibiUltica/tileset.txt
+share/cataclysm-dda/gfx/Cuteclysm/backdrop.png
+share/cataclysm-dda/gfx/Cuteclysm/backdropoffset.png
+share/cataclysm-dda/gfx/Cuteclysm/creatures.png
+share/cataclysm-dda/gfx/Cuteclysm/expandedcreatures.png
+share/cataclysm-dda/gfx/Cuteclysm/fallback.png
+share/cataclysm-dda/gfx/Cuteclysm/fields.png
+share/cataclysm-dda/gfx/Cuteclysm/fillerItems.png
+share/cataclysm-dda/gfx/Cuteclysm/fillerVehicles.png
+share/cataclysm-dda/gfx/Cuteclysm/hugebackdrop.png
+share/cataclysm-dda/gfx/Cuteclysm/items.png
+share/cataclysm-dda/gfx/Cuteclysm/tallbackdrop.png
+share/cataclysm-dda/gfx/Cuteclysm/tallexpandedcreatures.png
+share/cataclysm-dda/gfx/Cuteclysm/tile_config.json
+share/cataclysm-dda/gfx/Cuteclysm/tileset.txt
+share/cataclysm-dda/gfx/Cuteclysm/ui.png
+share/cataclysm-dda/gfx/Cuteclysm/ultratallbackdrop.png
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
@@ -36,44 +98,74 @@ 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/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/MshockXotto+/fallback.png
+share/cataclysm-dda/gfx/MshockXotto+/fillerlarge.png
+share/cataclysm-dda/gfx/MshockXotto+/fillernormal.png
+share/cataclysm-dda/gfx/MshockXotto+/fillersmall.png
+share/cataclysm-dda/gfx/MshockXotto+/fillertall.png
+share/cataclysm-dda/gfx/MshockXotto+/huge.png
+share/cataclysm-dda/gfx/MshockXotto+/large.png
+share/cataclysm-dda/gfx/MshockXotto+/tall.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/NeoDaysTileset/fallback.png
+share/cataclysm-dda/gfx/NeoDaysTileset/large.png
+share/cataclysm-dda/gfx/NeoDaysTileset/tile_config.json
+share/cataclysm-dda/gfx/NeoDaysTileset/tiles.png
+share/cataclysm-dda/gfx/NeoDaysTileset/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/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/UltimateCataclysm/centered.png
+share/cataclysm-dda/gfx/UltimateCataclysm/fallback.png
+share/cataclysm-dda/gfx/UltimateCataclysm/fillergiant.png
+share/cataclysm-dda/gfx/UltimateCataclysm/fillerhoder.png
+share/cataclysm-dda/gfx/UltimateCataclysm/giant.png
+share/cataclysm-dda/gfx/UltimateCataclysm/huge.png
+share/cataclysm-dda/gfx/UltimateCataclysm/incomplete.png
+share/cataclysm-dda/gfx/UltimateCataclysm/incomplete_large.png
+share/cataclysm-dda/gfx/UltimateCataclysm/incomplete_tall.png
+share/cataclysm-dda/gfx/UltimateCataclysm/large.png
+share/cataclysm-dda/gfx/UltimateCataclysm/normal.png
+share/cataclysm-dda/gfx/UltimateCataclysm/small.png
+share/cataclysm-dda/gfx/UltimateCataclysm/tall.png
+share/cataclysm-dda/gfx/UltimateCataclysm/tile_config.json
+share/cataclysm-dda/gfx/UltimateCataclysm/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/achievements.json
share/cataclysm-dda/json/ammo_effects.json
share/cataclysm-dda/json/anatomy.json
+share/cataclysm-dda/json/artifact/altered_object_active.json
+share/cataclysm-dda/json/artifact/artifact_item_types.json
+share/cataclysm-dda/json/artifact/legacy_artifact_active.json
+share/cataclysm-dda/json/artifact/legacy_artifact_passive.json
+share/cataclysm-dda/json/artifact/premade_artifacts.json
+share/cataclysm-dda/json/artifact/relic_procgen_data.json
+share/cataclysm-dda/json/ascii_art/generic_ascii.json
+share/cataclysm-dda/json/ascii_art/gun_ascii.json
share/cataclysm-dda/json/bionics.json
share/cataclysm-dda/json/body_parts.json
+share/cataclysm-dda/json/butchery_requirements.json
share/cataclysm-dda/json/clothing_mods.json
+share/cataclysm-dda/json/conducts.json
share/cataclysm-dda/json/construction.json
share/cataclysm-dda/json/construction_category.json
+share/cataclysm-dda/json/construction_group.json
share/cataclysm-dda/json/default_blacklist.json
+share/cataclysm-dda/json/disease.json
share/cataclysm-dda/json/dreams.json
share/cataclysm-dda/json/effects.json
share/cataclysm-dda/json/emit.json
+share/cataclysm-dda/json/enchantments.json
share/cataclysm-dda/json/field_type.json
share/cataclysm-dda/json/flags.json
+share/cataclysm-dda/json/furniture_and_terrain/furniture-alien.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
@@ -87,7 +179,6 @@ share/cataclysm-dda/json/furniture_and_t
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
@@ -103,10 +194,12 @@ share/cataclysm-dda/json/furniture_and_t
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-flesh.json
+share/cataclysm-dda/json/furniture_and_terrain/terrain-floors-indoor.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-highways.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
@@ -119,21 +212,24 @@ share/cataclysm-dda/json/furniture_and_t
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/hit_range.json
share/cataclysm-dda/json/item_actions.json
share/cataclysm-dda/json/item_category.json
+share/cataclysm-dda/json/item_spell_effects.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/hazmat_gear.json
share/cataclysm-dda/json/itemgroups/Clothing_Gear/jewellery_gems.json
+share/cataclysm-dda/json/itemgroups/Clothing_Gear/wallets.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/Arsonist_stock.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
@@ -147,6 +243,7 @@ share/cataclysm-dda/json/itemgroups/Mons
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/fridges.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
@@ -156,6 +253,7 @@ share/cataclysm-dda/json/itemgroups/Weap
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/altered_item.json
share/cataclysm-dda/json/itemgroups/art_antiques_crafts.json
share/cataclysm-dda/json/itemgroups/bionics.json
share/cataclysm-dda/json/itemgroups/books.json
@@ -227,17 +325,20 @@ share/cataclysm-dda/json/items/ammo/9mm.
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/cannon.json
share/cataclysm-dda/json/items/ammo/chemical_spray.json
+share/cataclysm-dda/json/items/ammo/exodii.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/rpg.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/armor/altered_object_auras.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
@@ -273,9 +374,11 @@ share/cataclysm-dda/json/items/basecamp.
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/abstract.json
share/cataclysm-dda/json/items/book/archery.json
share/cataclysm-dda/json/items/book/barter.json
share/cataclysm-dda/json/items/book/bashing.json
+share/cataclysm-dda/json/items/book/chemistry.json
share/cataclysm-dda/json/items/book/computer.json
share/cataclysm-dda/json/items/book/cooking.json
share/cataclysm-dda/json/items/book/cutting.json
@@ -286,16 +389,23 @@ share/cataclysm-dda/json/items/book/fabr
share/cataclysm-dda/json/items/book/firstaid.json
share/cataclysm-dda/json/items/book/gun.json
share/cataclysm-dda/json/items/book/launcher.json
+share/cataclysm-dda/json/items/book/lockpick.json
share/cataclysm-dda/json/items/book/maps.json
share/cataclysm-dda/json/items/book/martial.json
share/cataclysm-dda/json/items/book/mechanics.json
share/cataclysm-dda/json/items/book/melee.json
share/cataclysm-dda/json/items/book/misc.json
+share/cataclysm-dda/json/items/book/misc_philosophy.json
+share/cataclysm-dda/json/items/book/misc_pulp.json
+share/cataclysm-dda/json/items/book/misc_scifi.json
+share/cataclysm-dda/json/items/book/misc_sports.json
+share/cataclysm-dda/json/items/book/nonfiction.json
share/cataclysm-dda/json/items/book/pistol.json
share/cataclysm-dda/json/items/book/rifle.json
share/cataclysm-dda/json/items/book/shotgun.json
share/cataclysm-dda/json/items/book/smg.json
share/cataclysm-dda/json/items/book/speech.json
+share/cataclysm-dda/json/items/book/spiritual.json
share/cataclysm-dda/json/items/book/stabbing.json
share/cataclysm-dda/json/items/book/survival.json
share/cataclysm-dda/json/items/book/swimming.json
@@ -303,15 +413,17 @@ share/cataclysm-dda/json/items/book/tail
share/cataclysm-dda/json/items/book/throw.json
share/cataclysm-dda/json/items/book/traps.json
share/cataclysm-dda/json/items/book/unarmed.json
+share/cataclysm-dda/json/items/book/young.json
share/cataclysm-dda/json/items/chemicals_and_resources.json
-share/cataclysm-dda/json/items/classes/book.json
share/cataclysm-dda/json/items/classes/comestible.json
share/cataclysm-dda/json/items/classes/gun.json
share/cataclysm-dda/json/items/classes/magazine.json
share/cataclysm-dda/json/items/comestibles/alcohol.json
+share/cataclysm-dda/json/items/comestibles/baked.json
share/cataclysm-dda/json/items/comestibles/bread.json
share/cataclysm-dda/json/items/comestibles/brewing.json
share/cataclysm-dda/json/items/comestibles/carnivore.json
+share/cataclysm-dda/json/items/comestibles/cereal.json
share/cataclysm-dda/json/items/comestibles/dairy.json
share/cataclysm-dda/json/items/comestibles/drink.json
share/cataclysm-dda/json/items/comestibles/drink_other.json
@@ -340,6 +452,7 @@ share/cataclysm-dda/json/items/comestibl
share/cataclysm-dda/json/items/comestibles/wheat.json
share/cataclysm-dda/json/items/containers.json
share/cataclysm-dda/json/items/corpses/corpses.json
+share/cataclysm-dda/json/items/corpses/dead_exodii.json
share/cataclysm-dda/json/items/corpses/inactive_bots.json
share/cataclysm-dda/json/items/electronics.json
share/cataclysm-dda/json/items/fake.json
@@ -353,10 +466,12 @@ share/cataclysm-dda/json/items/generic/b
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/music.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/generic/toys_and_sports.json
+share/cataclysm-dda/json/items/gun/10mm.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
@@ -401,12 +516,13 @@ share/cataclysm-dda/json/items/gun/9x18.
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/cannon.json
share/cataclysm-dda/json/items/gun/chemical_spray.json
share/cataclysm-dda/json/items/gun/combination.json
+share/cataclysm-dda/json/items/gun/exodii.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
@@ -431,6 +547,7 @@ share/cataclysm-dda/json/items/gunmod/st
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/10mm.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
@@ -464,6 +581,7 @@ share/cataclysm-dda/json/items/magazine/
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/exodii.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
@@ -486,6 +604,7 @@ share/cataclysm-dda/json/items/ranged/pn
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/relics/altered_items.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
@@ -494,6 +613,7 @@ share/cataclysm-dda/json/items/resources
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/stone.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
@@ -516,12 +636,14 @@ share/cataclysm-dda/json/items/tool/meta
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/pseudo.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/stoneworking.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
@@ -550,14 +672,13 @@ share/cataclysm-dda/json/items/vehicle/n
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/rotor.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/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
@@ -568,6 +689,8 @@ share/cataclysm-dda/json/mapgen/abandone
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/airport/s_airport_private.json
+share/cataclysm-dda/json/mapgen/airport/s_airport_runway_private.json
share/cataclysm-dda/json/mapgen/animalpound.json
share/cataclysm-dda/json/mapgen/animalshelter.json
share/cataclysm-dda/json/mapgen/antique_store.json
@@ -593,13 +716,16 @@ share/cataclysm-dda/json/mapgen/basecamp
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_log.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_rock.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_firestation_1/modular_firestation1.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_firestation_1/modular_firestation_walls_all.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
@@ -628,6 +754,12 @@ share/cataclysm-dda/json/mapgen/basecamp
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_shelter_2/modular_shelter_2_common.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_log.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_rock.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_standard.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_wad.json
+share/cataclysm-dda/json/mapgen/basecamps/modular_shelter_2/modular_shelter_2_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
@@ -657,6 +789,8 @@ share/cataclysm-dda/json/mapgen/basement
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/bridges.json
+share/cataclysm-dda/json/mapgen/bugs/nest_dermatik.json
share/cataclysm-dda/json/mapgen/bunker.json
share/cataclysm-dda/json/mapgen/bus_station.json
share/cataclysm-dda/json/mapgen/butcher.json
@@ -685,13 +819,19 @@ share/cataclysm-dda/json/mapgen/campus/b
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/campus/open_areas/pedestrian_center.json
+share/cataclysm-dda/json/mapgen/campus/open_areas/pedestrian_westside.json
share/cataclysm-dda/json/mapgen/cathedral.json
+share/cataclysm-dda/json/mapgen/cave.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/city_blocks/urban_13_dense_house_apt_house.json
+share/cataclysm-dda/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json
+share/cataclysm-dda/json/mapgen/city_blocks/urban_25_dense_diner_apt.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
@@ -721,10 +861,12 @@ share/cataclysm-dda/json/mapgen/faction_
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_dairy_2.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.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
@@ -764,6 +906,7 @@ share/cataclysm-dda/json/mapgen/fema/FEM
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/fort.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
@@ -787,6 +930,7 @@ share/cataclysm-dda/json/mapgen/homeless
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/2storymodern01.json
share/cataclysm-dda/json/mapgen/house/crack_house.json
share/cataclysm-dda/json/mapgen/house/garden_house_1.json
share/cataclysm-dda/json/mapgen/house/house01.json
@@ -822,6 +966,16 @@ share/cataclysm-dda/json/mapgen/house/ho
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/house33.json
+share/cataclysm-dda/json/mapgen/house/house34.json
+share/cataclysm-dda/json/mapgen/house/house35.json
+share/cataclysm-dda/json/mapgen/house/house36.json
+share/cataclysm-dda/json/mapgen/house/house37.json
+share/cataclysm-dda/json/mapgen/house/house38.json
+share/cataclysm-dda/json/mapgen/house/house39.json
+share/cataclysm-dda/json/mapgen/house/house40.json
+share/cataclysm-dda/json/mapgen/house/house41.json
+share/cataclysm-dda/json/mapgen/house/house42.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
@@ -875,6 +1029,23 @@ share/cataclysm-dda/json/mapgen/house/ho
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/house/urban_10_house_brick_pool.json
+share/cataclysm-dda/json/mapgen/house/urban_11_house_brick.json
+share/cataclysm-dda/json/mapgen/house/urban_12_house.json
+share/cataclysm-dda/json/mapgen/house/urban_15_house.json
+share/cataclysm-dda/json/mapgen/house/urban_16_house_ranch.json
+share/cataclysm-dda/json/mapgen/house/urban_17_house_ranch.json
+share/cataclysm-dda/json/mapgen/house/urban_18_victorian.json
+share/cataclysm-dda/json/mapgen/house/urban_1_house.json
+share/cataclysm-dda/json/mapgen/house/urban_29_dense_row.json
+share/cataclysm-dda/json/mapgen/house/urban_2_house.json
+share/cataclysm-dda/json/mapgen/house/urban_3_house.json
+share/cataclysm-dda/json/mapgen/house/urban_4_house_basement.json
+share/cataclysm-dda/json/mapgen/house/urban_5_house.json
+share/cataclysm-dda/json/mapgen/house/urban_6_house.json
+share/cataclysm-dda/json/mapgen/house/urban_7_house_garden.json
+share/cataclysm-dda/json/mapgen/house/urban_8_house_brick_garden.json
+share/cataclysm-dda/json/mapgen/house/urban_9_house_garage_loft.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
@@ -902,8 +1073,10 @@ share/cataclysm-dda/json/mapgen/lab/lab_
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/lab_subway_vent_shaft.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/freshwater_research_station.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
@@ -916,23 +1089,35 @@ share/cataclysm-dda/json/mapgen/lot_empt
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/mall/mall_basement.json
+share/cataclysm-dda/json/mapgen/mall/mall_ground.json
+share/cataclysm-dda/json/mapgen/mall/mall_roof.json
+share/cataclysm-dda/json/mapgen/mall/mall_second_floor.json
+share/cataclysm-dda/json/mapgen/mall/mall_upper_roof.json
share/cataclysm-dda/json/mapgen/mansion.json
+share/cataclysm-dda/json/mapgen/mansion_roof.json
+share/cataclysm-dda/json/mapgen/map_extras/mass_grave.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/sewers.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_edge_room_connector.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_firebreak.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_hallway.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_hallway_start.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_isolated_stairs.json
+share/cataclysm-dda/json/mapgen/microlab/microlab_reactor.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
@@ -942,8 +1127,7 @@ share/cataclysm-dda/json/mapgen/military
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/miniature_railway/miniature_railway.json
share/cataclysm-dda/json/mapgen/missile_silo.json
share/cataclysm-dda/json/mapgen/moonshine_camp.json
share/cataclysm-dda/json/mapgen/mortuary.json
@@ -957,12 +1141,17 @@ 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/aux_nested.json
share/cataclysm-dda/json/mapgen/nested/basement_nested.json
+share/cataclysm-dda/json/mapgen/nested/cave_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/fema_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/mini_railway_nested.json
share/cataclysm-dda/json/mapgen/nested/nested_chunks_roof.json
+share/cataclysm-dda/json/mapgen/nested/npc_nested_spawns.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
@@ -977,6 +1166,7 @@ share/cataclysm-dda/json/mapgen/orchard_
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_mazes.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
@@ -1002,6 +1192,7 @@ share/cataclysm-dda/json/mapgen/radio_to
share/cataclysm-dda/json/mapgen/railroad/railroad_level_crossing.json
share/cataclysm-dda/json/mapgen/railroad/railroad_station.json
share/cataclysm-dda/json/mapgen/ranch_camp.json
+share/cataclysm-dda/json/mapgen/ravine.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
@@ -1023,6 +1214,7 @@ share/cataclysm-dda/json/mapgen/restaura
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/potters_cottage.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
@@ -1030,6 +1222,8 @@ share/cataclysm-dda/json/mapgen/roadstop
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_apt.json
+share/cataclysm-dda/json/mapgen/s_apt_2.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
@@ -1041,6 +1235,7 @@ share/cataclysm-dda/json/mapgen/s_grocer
share/cataclysm-dda/json/mapgen/s_gun.json
share/cataclysm-dda/json/mapgen/s_hardware.json
share/cataclysm-dda/json/mapgen/s_icecream.json
+share/cataclysm-dda/json/mapgen/s_lightindustry.json
share/cataclysm-dda/json/mapgen/s_liquor.json
share/cataclysm-dda/json/mapgen/sai.json
share/cataclysm-dda/json/mapgen/school_1.json
@@ -1059,6 +1254,12 @@ share/cataclysm-dda/json/mapgen/steel_mi
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_camping.json
+share/cataclysm-dda/json/mapgen/store/s_cardealer.json
+share/cataclysm-dda/json/mapgen/store/s_diner.json
+share/cataclysm-dda/json/mapgen/store/s_electronicstore.json
+share/cataclysm-dda/json/mapgen/store/s_games.json
+share/cataclysm-dda/json/mapgen/store/s_gunstore.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
@@ -1073,6 +1274,7 @@ share/cataclysm-dda/json/mapgen/trail_sm
share/cataclysm-dda/json/mapgen/trailer_park.json
share/cataclysm-dda/json/mapgen/trailhead.json
share/cataclysm-dda/json/mapgen/triffid_grove.json
+share/cataclysm-dda/json/mapgen/urban_35_hospital.json
share/cataclysm-dda/json/mapgen/veterinarian.json
share/cataclysm-dda/json/mapgen/vfw.json
share/cataclysm-dda/json/mapgen/warehouse.json
@@ -1099,11 +1301,13 @@ share/cataclysm-dda/json/mapgen_palettes
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/electronic_palette.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/fort_palette.json
share/cataclysm-dda/json/mapgen_palettes/helipad.json
share/cataclysm-dda/json/mapgen_palettes/hospital.json
share/cataclysm-dda/json/mapgen_palettes/hotel_tower_palette.json
@@ -1136,20 +1340,24 @@ share/cataclysm-dda/json/mapgen_palettes
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/restaurant_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/sewers_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/mapgen_palettes/underwater_structures_palette.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_factions.json
+share/cataclysm-dda/json/monster_special_attacks/monster_attacks.json
share/cataclysm-dda/json/monster_special_attacks/spells.json
+share/cataclysm-dda/json/monsterdrops/feral_humans.json
share/cataclysm-dda/json/monsterdrops/marloss.json
share/cataclysm-dda/json/monsterdrops/misc.json
share/cataclysm-dda/json/monsterdrops/mutant_experimental.json
@@ -1176,18 +1384,21 @@ share/cataclysm-dda/json/monstergroups/m
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/mutant_upgrades.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/zanimal_upgrades.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/feral_humans.json
share/cataclysm-dda/json/monsters/fish.json
share/cataclysm-dda/json/monsters/fungus.json
share/cataclysm-dda/json/monsters/insect_spider.json
@@ -1197,23 +1408,30 @@ share/cataclysm-dda/json/monsters/marlos
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/monster_goals.json
share/cataclysm-dda/json/monsters/mutant.json
+share/cataclysm-dda/json/monsters/mutant_mammal.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/robofac_robots.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/zanimal_upgrade.json
share/cataclysm-dda/json/monsters/zed-animal.json
share/cataclysm-dda/json/monsters/zed-classic.json
+share/cataclysm-dda/json/monsters/zed-pupating.json
+share/cataclysm-dda/json/monsters/zed-winged.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_ferrous.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
@@ -1223,14 +1441,18 @@ share/cataclysm-dda/json/monsters/zed_sk
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/move_modes.json
share/cataclysm-dda/json/mutations/mutation_appearance.json
share/cataclysm-dda/json/mutations/mutation_category.json
+share/cataclysm-dda/json/mutations/mutation_enchantments.json
share/cataclysm-dda/json/mutations/mutation_ordering.json
+share/cataclysm-dda/json/mutations/mutation_spells.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
+share/cataclysm-dda/json/npcs/Backgrounds/bg_pizzaiolo.json
share/cataclysm-dda/json/npcs/Backgrounds/burger_flipper_1.json
share/cataclysm-dda/json/npcs/Backgrounds/codger.json
share/cataclysm-dda/json/npcs/Backgrounds/confused_1.json
@@ -1261,6 +1483,7 @@ share/cataclysm-dda/json/npcs/Background
share/cataclysm-dda/json/npcs/Backgrounds/lab_1.json
share/cataclysm-dda/json/npcs/Backgrounds/left_for_dead_1.json
share/cataclysm-dda/json/npcs/Backgrounds/left_for_dead_2.json
+share/cataclysm-dda/json/npcs/Backgrounds/left_for_dead_3.json
share/cataclysm-dda/json/npcs/Backgrounds/lost_partner_1.json
share/cataclysm-dda/json/npcs/Backgrounds/lost_partner_2.json
share/cataclysm-dda/json/npcs/Backgrounds/nerd_1.json
@@ -1285,6 +1508,14 @@ share/cataclysm-dda/json/npcs/Background
share/cataclysm-dda/json/npcs/Backgrounds/soldier_1.json
share/cataclysm-dda/json/npcs/Backgrounds/soldier_2.json
share/cataclysm-dda/json/npcs/Backgrounds/wedding_1.json
+share/cataclysm-dda/json/npcs/Backgrounds/whathappened_table_of_contents.json
+share/cataclysm-dda/json/npcs/Kindred/NPC_Brigitte_LaCroix.json
+share/cataclysm-dda/json/npcs/Kindred/NPC_Darren_Cooper.json
+share/cataclysm-dda/json/npcs/Lighthouse_Family/NPC_lighthouse_girl.json
+share/cataclysm-dda/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
+share/cataclysm-dda/json/npcs/Lighthouse_Family/NPC_lighthouse_woman.json
+share/cataclysm-dda/json/npcs/Lighthouse_Family/TALK_fix_lighthouse.json
+share/cataclysm-dda/json/npcs/Lighthouse_Family/npc_survivor.json
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
@@ -1293,6 +1524,7 @@ share/cataclysm-dda/json/npcs/NC_COWBOY.
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_FARMER.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
@@ -1305,7 +1537,6 @@ share/cataclysm-dda/json/npcs/NC_SURVIVO
share/cataclysm-dda/json/npcs/NC_THUG.json
share/cataclysm-dda/json/npcs/NC_TRADER.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
@@ -1316,6 +1547,7 @@ share/cataclysm-dda/json/npcs/TALK_CYBOR
share/cataclysm-dda/json/npcs/TALK_FACTION_CAMP.json
share/cataclysm-dda/json/npcs/TALK_FRIEND_CONVERSATION.json
share/cataclysm-dda/json/npcs/TALK_MARLOSS_VOICE.json
+share/cataclysm-dda/json/npcs/TALK_NC_FARMER.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
@@ -1328,6 +1560,10 @@ share/cataclysm-dda/json/npcs/godco/cook
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-Cowboy_Friendly.json
+share/cataclysm-dda/json/npcs/holdouts/Rural-Cowboy_Hostile.json
+share/cataclysm-dda/json/npcs/holdouts/Rural-Cowboy_Nihilist.json
+share/cataclysm-dda/json/npcs/holdouts/Rural-Cowboy_Trader.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
@@ -1338,6 +1574,7 @@ share/cataclysm-dda/json/npcs/isherwood_
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/island_prison/prisoners.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
@@ -1345,6 +1582,7 @@ share/cataclysm-dda/json/npcs/necropolis
share/cataclysm-dda/json/npcs/necropolis/NPC_Old_Guard_Soldier.json
share/cataclysm-dda/json/npcs/npc.json
share/cataclysm-dda/json/npcs/npc_behavior.json
+share/cataclysm-dda/json/npcs/other/NPC_pizzaiolo.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
@@ -1369,6 +1607,7 @@ share/cataclysm-dda/json/npcs/refugee_ce
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_refugees/shared_dialogue.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
@@ -1407,9 +1646,11 @@ share/cataclysm-dda/json/npcs/tacoma_ran
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/npcs/talk_tags_chat.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/obsoletion/faults.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
@@ -1437,6 +1678,7 @@ share/cataclysm-dda/json/overmap/overmap
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_ravines.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
@@ -1447,8 +1689,18 @@ share/cataclysm-dda/json/overmap/overmap
share/cataclysm-dda/json/overmap/special_locations.json
share/cataclysm-dda/json/player_activities.json
share/cataclysm-dda/json/professions.json
+share/cataclysm-dda/json/proficiencies/chemistry.json
+share/cataclysm-dda/json/proficiencies/electronics.json
+share/cataclysm-dda/json/proficiencies/gunsmithing.json
+share/cataclysm-dda/json/proficiencies/metalwork.json
+share/cataclysm-dda/json/proficiencies/misc.json
+share/cataclysm-dda/json/proficiencies/tailoring.json
+share/cataclysm-dda/json/proficiencies/traps.json
+share/cataclysm-dda/json/proficiencies/wilderness.json
+share/cataclysm-dda/json/proficiencies/woodworking.json
share/cataclysm-dda/json/recipes/ammo/40x46mm.json
share/cataclysm-dda/json/recipes/ammo/40x53mm.json
+share/cataclysm-dda/json/recipes/ammo/cannon.json
share/cataclysm-dda/json/recipes/ammo/components.json
share/cataclysm-dda/json/recipes/ammo/pistol.json
share/cataclysm-dda/json/recipes/ammo/rifle.json
@@ -1476,13 +1728,16 @@ share/cataclysm-dda/json/recipes/basecam
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_log.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_rock.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_firestation_1/recipe_modular_firestation1.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_firestation_1/recipe_modular_firestation_walls_all.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
@@ -1511,6 +1766,12 @@ share/cataclysm-dda/json/recipes/basecam
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_shelter_2/recipe_modular_shelter_2_common.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json
+share/cataclysm-dda/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_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
@@ -1527,11 +1788,15 @@ share/cataclysm-dda/json/recipes/basecam
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/chemicals.json
+share/cataclysm-dda/json/recipes/chem/drugs.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/food/baking.json
+share/cataclysm-dda/json/recipes/food/bread.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
@@ -1539,28 +1804,37 @@ share/cataclysm-dda/json/recipes/food/di
share/cataclysm-dda/json/recipes/food/dry.json
share/cataclysm-dda/json/recipes/food/frozen.json
share/cataclysm-dda/json/recipes/food/offal_dishes.json
+share/cataclysm-dda/json/recipes/food/other.json
share/cataclysm-dda/json/recipes/food/pasta.json
share/cataclysm-dda/json/recipes/food/seed.json
-share/cataclysm-dda/json/recipes/other/containers.json
+share/cataclysm-dda/json/recipes/other/bots.json
+share/cataclysm-dda/json/recipes/other/cords_and_ropes.json
share/cataclysm-dda/json/recipes/other/materials.json
share/cataclysm-dda/json/recipes/other/medical.json
share/cataclysm-dda/json/recipes/other/other.json
share/cataclysm-dda/json/recipes/other/parts.json
-share/cataclysm-dda/json/recipes/other/tool.json
+share/cataclysm-dda/json/recipes/other/parts_construction.json
+share/cataclysm-dda/json/recipes/other/parts_rigs.json
+share/cataclysm-dda/json/recipes/other/power_supplies.json
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_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_medsandchemicals.json
share/cataclysm-dda/json/recipes/recipe_obsolete.json
share/cataclysm-dda/json/recipes/recipe_others.json
+share/cataclysm-dda/json/recipes/recipe_traps.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/tools/containers.json
+share/cataclysm-dda/json/recipes/tools/lights.json
+share/cataclysm-dda/json/recipes/tools/tool.json
+share/cataclysm-dda/json/recipes/tools/tools_electronic.json
+share/cataclysm-dda/json/recipes/tools/tools_hand.json
+share/cataclysm-dda/json/recipes/tools/tools_primitive.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
@@ -1570,6 +1844,8 @@ share/cataclysm-dda/json/recipes/weapon/
share/cataclysm-dda/json/recipes/weapon/ranged.json
share/cataclysm-dda/json/regional_map_settings.json
share/cataclysm-dda/json/requirements/ammo.json
+share/cataclysm-dda/json/requirements/butchery.json
+share/cataclysm-dda/json/requirements/chemistry.json
share/cataclysm-dda/json/requirements/cooking_components.json
share/cataclysm-dda/json/requirements/cooking_tools.json
share/cataclysm-dda/json/requirements/explosives.json
@@ -1590,24 +1866,31 @@ share/cataclysm-dda/json/snippets/epilog
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/grave_labels.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/mutant_anatomy.json
share/cataclysm-dda/json/snippets/newspapers.json
+share/cataclysm-dda/json/snippets/nightmares.json
share/cataclysm-dda/json/snippets/radio.json
+share/cataclysm-dda/json/snippets/robot_finds_kitten.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/snippets/tutorial.json
+share/cataclysm-dda/json/snippets/weed_messages.json
share/cataclysm-dda/json/species.json
share/cataclysm-dda/json/speech.json
share/cataclysm-dda/json/start_locations.json
+share/cataclysm-dda/json/statistics.json
share/cataclysm-dda/json/techniques.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/120mm.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
@@ -1622,6 +1905,8 @@ share/cataclysm-dda/json/uncraft/ammo/38
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/40x46mm.json
+share/cataclysm-dda/json/uncraft/ammo/40x53mm.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
@@ -1636,16 +1921,20 @@ share/cataclysm-dda/json/uncraft/ammo/54
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/66mm.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/84x246mm.json
share/cataclysm-dda/json/uncraft/ammo/9mm.json
share/cataclysm-dda/json/uncraft/ammo/9x18mm.json
share/cataclysm-dda/json/uncraft/ammo/atgm.json
+share/cataclysm-dda/json/uncraft/ammo/rpg.json
share/cataclysm-dda/json/uncraft/ammo/shot.json
share/cataclysm-dda/json/uncraft/armor.json
+share/cataclysm-dda/json/uncraft/armor/boots.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
@@ -1667,18 +1956,26 @@ share/cataclysm-dda/json/vehicleparts/ba
share/cataclysm-dda/json/vehicleparts/boards.json
share/cataclysm-dda/json/vehicleparts/cargo.json
share/cataclysm-dda/json/vehicleparts/combustion.json
+share/cataclysm-dda/json/vehicleparts/doors.json
share/cataclysm-dda/json/vehicleparts/engineering.json
share/cataclysm-dda/json/vehicleparts/faults.json
share/cataclysm-dda/json/vehicleparts/frames.json
share/cataclysm-dda/json/vehicleparts/lights.json
share/cataclysm-dda/json/vehicleparts/manual.json
+share/cataclysm-dda/json/vehicleparts/mirrors.json
share/cataclysm-dda/json/vehicleparts/motor.json
+share/cataclysm-dda/json/vehicleparts/obsolete.json
share/cataclysm-dda/json/vehicleparts/rams.json
+share/cataclysm-dda/json/vehicleparts/rotor.json
+share/cataclysm-dda/json/vehicleparts/seats.json
share/cataclysm-dda/json/vehicleparts/tanks.json
share/cataclysm-dda/json/vehicleparts/turret.json
+share/cataclysm-dda/json/vehicleparts/utilities.json
share/cataclysm-dda/json/vehicleparts/vehicle_parts.json
+share/cataclysm-dda/json/vehicleparts/vp_categories.json
share/cataclysm-dda/json/vehicleparts/vp_flags.json
share/cataclysm-dda/json/vehicleparts/wheel.json
+share/cataclysm-dda/json/vehicleparts/windshields.json
share/cataclysm-dda/json/vehicles/bikes.json
share/cataclysm-dda/json/vehicles/boats.json
share/cataclysm-dda/json/vehicles/cars.json
@@ -1695,85 +1992,259 @@ 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/json/weather_type.json
share/cataclysm-dda/mods/Aftershock/README.md
+share/cataclysm-dda/mods/Aftershock/ammo_effects.json
+share/cataclysm-dda/mods/Aftershock/crafting_system.md
+share/cataclysm-dda/mods/Aftershock/effects.json
+share/cataclysm-dda/mods/Aftershock/emit.json
+share/cataclysm-dda/mods/Aftershock/field.json
+share/cataclysm-dda/mods/Aftershock/field_type.json
+share/cataclysm-dda/mods/Aftershock/harvest.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/bionics_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/clothing_group.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/food_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/item_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/nuclear_reactor_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/science_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/scrap_expansion_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/scrap_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/spaceship_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/titanium_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/vending_machine_group.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/weapons/armories.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/weapons/energy_gun_groups.json
+share/cataclysm-dda/mods/Aftershock/itemgroups/weapons/grenade_groups.json
share/cataclysm-dda/mods/Aftershock/items/afs_harvest.json
share/cataclysm-dda/mods/Aftershock/items/ammo.json
+share/cataclysm-dda/mods/Aftershock/items/ammo/foam.json
+share/cataclysm-dda/mods/Aftershock/items/ammo/plasma.json
+share/cataclysm-dda/mods/Aftershock/items/ammo_effects.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/comestibles/alienfood.json
+share/cataclysm-dda/mods/Aftershock/items/comestibles/bug_brew.json
+share/cataclysm-dda/mods/Aftershock/items/comestibles/cheap_food.json
+share/cataclysm-dda/mods/Aftershock/items/comestibles/comestibles.json
+share/cataclysm-dda/mods/Aftershock/items/containers.json
share/cataclysm-dda/mods/Aftershock/items/corpses.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/abstract_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/circuity_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/cloth_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/heat_transfer_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/magnet_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/material_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json
+share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/optics.json
+share/cataclysm-dda/mods/Aftershock/items/ethereal.json
+share/cataclysm-dda/mods/Aftershock/items/frankenstein_items.json
share/cataclysm-dda/mods/Aftershock/items/furniture.json
+share/cataclysm-dda/mods/Aftershock/items/grenades.json
share/cataclysm-dda/mods/Aftershock/items/gun/5x50.json
+share/cataclysm-dda/mods/Aftershock/items/gun/8x40mm.json
+share/cataclysm-dda/mods/Aftershock/items/gun/advanced.json
+share/cataclysm-dda/mods/Aftershock/items/gun/combination.json
+share/cataclysm-dda/mods/Aftershock/items/gun/foam.json
+share/cataclysm-dda/mods/Aftershock/items/gun/grenade.json
share/cataclysm-dda/mods/Aftershock/items/gun/laser.json
+share/cataclysm-dda/mods/Aftershock/items/gun/migrations.json
+share/cataclysm-dda/mods/Aftershock/items/gun/plasma.json
+share/cataclysm-dda/mods/Aftershock/items/gun/projectile.json
+share/cataclysm-dda/mods/Aftershock/items/gunmods/laser_gunmods.json
+share/cataclysm-dda/mods/Aftershock/items/gunmods/sights.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/magazine/8x40mm.json
+share/cataclysm-dda/mods/Aftershock/items/magazine/alien.json
+share/cataclysm-dda/mods/Aftershock/items/magazine/energy_cell.json
+share/cataclysm-dda/mods/Aftershock/items/magazine/foam.json
+share/cataclysm-dda/mods/Aftershock/items/magazine/plasma.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/mutagen.json
share/cataclysm-dda/mods/Aftershock/items/obsolete.json
+share/cataclysm-dda/mods/Aftershock/items/radio_tools.json
share/cataclysm-dda/mods/Aftershock/items/robotparts.json
+share/cataclysm-dda/mods/Aftershock/items/seed.json
+share/cataclysm-dda/mods/Aftershock/items/tool_armor.json
share/cataclysm-dda/mods/Aftershock/items/tool_quality.json
share/cataclysm-dda/mods/Aftershock/items/tools.json
+share/cataclysm-dda/mods/Aftershock/items/vehicle_items.json
share/cataclysm-dda/mods/Aftershock/items/weapons.json
+share/cataclysm-dda/mods/Aftershock/maps/city_buildings.json
share/cataclysm-dda/mods/Aftershock/maps/furniture.json
-share/cataclysm-dda/mods/Aftershock/maps/item_groups.json
+share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_wall.json
+share/cataclysm-dda/mods/Aftershock/maps/furniture_lab.json
+share/cataclysm-dda/mods/Aftershock/maps/lab_cryo_room.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/astrobiology_lab.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/augmentation_clinic.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/basement_bionic.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/escape_pod.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/formless_ruins/formless_ruins_dynamic.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/millyficent_lab.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/robot_dispatch/dispatch_first_01.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/robot_dispatch/dispatch_second_01.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/robot_dispatch/tpalettes.json
share/cataclysm-dda/mods/Aftershock/maps/mapgen/s_gas.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/sadie_large_storage.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/urban_worm_farm.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen/whately_lmoe.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen_pallete/afs_formless_ruins.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen_pallete/afs_generic_building.json
+share/cataclysm-dda/mods/Aftershock/maps/mapgen_pallete/augmentation_clinic.json
+share/cataclysm-dda/mods/Aftershock/maps/nested/basement.json
+share/cataclysm-dda/mods/Aftershock/maps/nested/lab.json
+share/cataclysm-dda/mods/Aftershock/maps/nested/sadie_spawn.json
+share/cataclysm-dda/mods/Aftershock/maps/overmap_locations.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/maps/terrain_floraxeno.json
+share/cataclysm-dda/mods/Aftershock/maps/terrain_groundxeno.json
+share/cataclysm-dda/mods/Aftershock/maps/terrain_spaceship.json
share/cataclysm-dda/mods/Aftershock/martialarts.json
+share/cataclysm-dda/mods/Aftershock/migration.json
share/cataclysm-dda/mods/Aftershock/mobs/PrepPhyle_mobs.json
+share/cataclysm-dda/mods/Aftershock/mobs/aliens.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/monster_groups/moxie_monster_groups.json
+share/cataclysm-dda/mods/Aftershock/mobs/monster_groups/robot_monster_groups.json
+share/cataclysm-dda/mods/Aftershock/mobs/mutants.json
+share/cataclysm-dda/mods/Aftershock/mobs/obsolete.json
+share/cataclysm-dda/mods/Aftershock/mobs/robot_groups.json
share/cataclysm-dda/mods/Aftershock/mobs/robots.json
+share/cataclysm-dda/mods/Aftershock/mobs/scavbots.json
+share/cataclysm-dda/mods/Aftershock/mobs/species.json
+share/cataclysm-dda/mods/Aftershock/mobs/turrets.json
+share/cataclysm-dda/mods/Aftershock/mobs/uplifted_monsters.json
+share/cataclysm-dda/mods/Aftershock/mobs/water_mobs.json
share/cataclysm-dda/mods/Aftershock/mobs/zombies.json
share/cataclysm-dda/mods/Aftershock/modinfo.json
+share/cataclysm-dda/mods/Aftershock/monster_attacks.json
+share/cataclysm-dda/mods/Aftershock/monsterdrops/monster_default.json
+share/cataclysm-dda/mods/Aftershock/monsterdrops/monsterdrops.json
+share/cataclysm-dda/mods/Aftershock/mutations/dreams.json
share/cataclysm-dda/mods/Aftershock/mutations/mutations.json
+share/cataclysm-dda/mods/Aftershock/mutations/obsolete.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_afterlife.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/criminal_experiment.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/cyberninja.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/ganger_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/ganger_2.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/ganger_3.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/npc_classes_mutant.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/radiation_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/radiation_2.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/recent_mutation_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/selftest.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/trait_groups.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/uplifted_animal_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/uplifted_animal_2.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/uplifted_animal_3.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/uplifted_animal_4.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/uplifted_animal_5.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/vatgrown_1.json
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/whately.json
share/cataclysm-dda/mods/Aftershock/npcs/classes.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/backgrounds/bg_traits_cyborg.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/backgrounds/trait_groups_cyborg.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/item_groups_cyborg.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/npc_classes_cyborg.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyropod_classes.json
+share/cataclysm-dda/mods/Aftershock/npcs/cyrus_whately.json
share/cataclysm-dda/mods/Aftershock/npcs/factions.json
+share/cataclysm-dda/mods/Aftershock/npcs/frankenstein_classes.json
+share/cataclysm-dda/mods/Aftershock/npcs/milly_whately_dialogue.json
+share/cataclysm-dda/mods/Aftershock/npcs/mutant_npcs/npc_classes_mutant.json
+share/cataclysm-dda/mods/Aftershock/npcs/mutant_npcs/trait_groups.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/npcs/sadie.json
+share/cataclysm-dda/mods/Aftershock/npcs/threshold_recruit_dialogue.json
+share/cataclysm-dda/mods/Aftershock/npcs/whately_generic_dialogue.json
+share/cataclysm-dda/mods/Aftershock/options.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/ammo_recipes.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/deconstruction/bionic_deconstruction.json
+share/cataclysm-dda/mods/Aftershock/recipes/deconstruction/robot.json
+share/cataclysm-dda/mods/Aftershock/recipes/electronics_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/frankenstein_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/grenades.json
+share/cataclysm-dda/mods/Aftershock/recipes/mutagens.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/recipes_categories.json
share/cataclysm-dda/mods/Aftershock/recipes/requirements.json
+share/cataclysm-dda/mods/Aftershock/recipes/robot_recipes.json
+share/cataclysm-dda/mods/Aftershock/recipes/ultratech_tools.json
share/cataclysm-dda/mods/Aftershock/recipes/uncraft.json
+share/cataclysm-dda/mods/Aftershock/region_settings.json
+share/cataclysm-dda/mods/Aftershock/requirements.json
share/cataclysm-dda/mods/Aftershock/scenarios.json
+share/cataclysm-dda/mods/Aftershock/snippets.json
share/cataclysm-dda/mods/Aftershock/speech.json
+share/cataclysm-dda/mods/Aftershock/spells.json
+share/cataclysm-dda/mods/Aftershock/spells/enchantments.json
share/cataclysm-dda/mods/Aftershock/spells/hologram_spells.json
+share/cataclysm-dda/mods/Aftershock/start_locations.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/BlazeIndustries/README.txt
+share/cataclysm-dda/mods/BlazeIndustries/blaze_furniture.json
+share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/blaze_engine.json
+share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/blaze_gun.json
+share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/blaze_other.json
+share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/blaze_solar.json
+share/cataclysm-dda/mods/BlazeIndustries/modinfo.json
+share/cataclysm-dda/mods/BlazeIndustries/recipes/blaze_construction_recipes.json
+share/cataclysm-dda/mods/BlazeIndustries/recipes/blaze_gun_recipes.json
+share/cataclysm-dda/mods/BlazeIndustries/recipes/blaze_other_recipes.json
+share/cataclysm-dda/mods/BlazeIndustries/recipes/construction_group.json
+share/cataclysm-dda/mods/BlazeIndustries/snippets.json
+share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/blaze_combustion.json
+share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/blaze_other_parts.json
+share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/blaze_turrets_vanilla.json
+share/cataclysm-dda/mods/CRT_EXPANSION/construction_group.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/deadspace/deadspaceitems.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
@@ -1781,7 +2252,9 @@ share/cataclysm-dda/mods/CRT_EXPANSION/i
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_enchants.json
share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_item_groups.json
+share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_makeshift_survival.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
@@ -1805,8 +2278,11 @@ share/cataclysm-dda/mods/CRT_EXPANSION/m
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/Chibi_Ultica/large.png
+share/cataclysm-dda/mods/Chibi_Ultica/mod_tileset.json
+share/cataclysm-dda/mods/Chibi_Ultica/modinfo.json
+share/cataclysm-dda/mods/Chibi_Ultica/tall.png
+share/cataclysm-dda/mods/Chibi_Ultica/tiles.png
share/cataclysm-dda/mods/CrazyCataclysm/crazy_aperturepotato.json
share/cataclysm-dda/mods/CrazyCataclysm/crazy_comestibles.json
share/cataclysm-dda/mods/CrazyCataclysm/crazy_item_groups.json
@@ -1817,32 +2293,118 @@ share/cataclysm-dda/mods/CrazyCataclysm/
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/DeoxyMod/Deoxy_vehicle_parts.json
-share/cataclysm-dda/mods/DeoxyMod/modinfo.json
-share/cataclysm-dda/mods/DinoMod/dinosaur.json
-share/cataclysm-dda/mods/DinoMod/fieldoffice.json
+share/cataclysm-dda/mods/Dark-Skies-Above/DESIGN.md
+share/cataclysm-dda/mods/Dark-Skies-Above/README.md
+share/cataclysm-dda/mods/Dark-Skies-Above/TODO.md
+share/cataclysm-dda/mods/Dark-Skies-Above/ammo_effect.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/item_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/location_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/mon_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/recipes_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/scenario_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/trait_blacklist.json
+share/cataclysm-dda/mods/Dark-Skies-Above/effects.json
+share/cataclysm-dda/mods/Dark-Skies-Above/factions.json
+share/cataclysm-dda/mods/Dark-Skies-Above/harvest.json
+share/cataclysm-dda/mods/Dark-Skies-Above/items/alien-scrap.json
+share/cataclysm-dda/mods/Dark-Skies-Above/items/electronics.json
+share/cataclysm-dda/mods/Dark-Skies-Above/materials.json
+share/cataclysm-dda/mods/Dark-Skies-Above/modinfo.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monattack.json
+share/cataclysm-dda/mods/Dark-Skies-Above/mondrops.json
+share/cataclysm-dda/mods/Dark-Skies-Above/mongun.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monspell.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/alien_cyborgs.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/alien_fauna.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/alien_robots.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/mon_groups/alienanimal_spawns.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/mon_groups/invader_spawns.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/mon_groups/stray_spawns.json
+share/cataclysm-dda/mods/Dark-Skies-Above/monsters/strays.json
+share/cataclysm-dda/mods/Dark-Skies-Above/mutations/traits.json
+share/cataclysm-dda/mods/Dark-Skies-Above/obsolete.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/furniture_terrain/outdoor-furniture.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/armor.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/books.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/carnivore.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/electronic.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/generics.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/newspaper.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/ranged.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/tools.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/vehicle.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/weapons.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/locations/cemetery.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/locations/evac_center.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/locations/overmap_special.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/monsters.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/region_settings.json
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/scenarios.json
+share/cataclysm-dda/mods/Dark-Skies-Above/recipies/uncraft.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/fliers.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/graffiti.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/newspaper.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/radio.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/survnotes.json
+share/cataclysm-dda/mods/Dark-Skies-Above/species.json
+share/cataclysm-dda/mods/Dark-Skies-Above/speech/neworder_speech.json
+share/cataclysm-dda/mods/DinoMod/DESIGN.md
+share/cataclysm-dda/mods/DinoMod/NPC/BEGGAR_2_Dino_Dave.json
+share/cataclysm-dda/mods/DinoMod/NPC/NC_BO_BARONYX.json
+share/cataclysm-dda/mods/DinoMod/NPC/NC_Red.json
+share/cataclysm-dda/mods/DinoMod/NPC/NPC_old_guard_representative.json
+share/cataclysm-dda/mods/DinoMod/NPC/npc_classes_mutant.json
+share/cataclysm-dda/mods/DinoMod/NPC/trait_groups.json
+share/cataclysm-dda/mods/DinoMod/README.md
+share/cataclysm-dda/mods/DinoMod/cooking_components.json
+share/cataclysm-dda/mods/DinoMod/egg.json
+share/cataclysm-dda/mods/DinoMod/forage.json
share/cataclysm-dda/mods/DinoMod/harvest.json
+share/cataclysm-dda/mods/DinoMod/hints.json
+share/cataclysm-dda/mods/DinoMod/items.json
+share/cataclysm-dda/mods/DinoMod/items/books.json
+share/cataclysm-dda/mods/DinoMod/items/itemgroups.json
+share/cataclysm-dda/mods/DinoMod/items/mutagen.json
+share/cataclysm-dda/mods/DinoMod/lab_notes.json
+share/cataclysm-dda/mods/DinoMod/laser_items.json
+share/cataclysm-dda/mods/DinoMod/mapgen/DinoLabFinale.json
+share/cataclysm-dda/mods/DinoMod/mapgen/basement_chem.json
+share/cataclysm-dda/mods/DinoMod/mapgen/basement_lab_stairs.json
+share/cataclysm-dda/mods/DinoMod/mapgen/church.json
+share/cataclysm-dda/mods/DinoMod/mapgen/dinoexhibit.json
+share/cataclysm-dda/mods/DinoMod/mapgen/farm.json
+share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_maiasaura.json
+share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_tyrannosaurus.json
+share/cataclysm-dda/mods/DinoMod/mapgen/railroad_station.json
+share/cataclysm-dda/mods/DinoMod/mapgen/zoo.json
share/cataclysm-dda/mods/DinoMod/modinfo.json
+share/cataclysm-dda/mods/DinoMod/monster_factions.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/dinosaur.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/fungi.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/lab.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/monstergroups_egg.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/wilderness.json
+share/cataclysm-dda/mods/DinoMod/monstergroups/zinosaur.json
+share/cataclysm-dda/mods/DinoMod/monsters/dinosaur.json
+share/cataclysm-dda/mods/DinoMod/monsters/dinosaur_CBM.json
+share/cataclysm-dda/mods/DinoMod/monsters/fungus.json
+share/cataclysm-dda/mods/DinoMod/monsters/hatchling.json
+share/cataclysm-dda/mods/DinoMod/monsters/juvenile.json
+share/cataclysm-dda/mods/DinoMod/monsters/zed-dinosaur.json
+share/cataclysm-dda/mods/DinoMod/monsters/zed-dinosaur_CBM.json
+share/cataclysm-dda/mods/DinoMod/monsters/zinosaur_upgrade.json
+share/cataclysm-dda/mods/DinoMod/mutations/dreams.json
+share/cataclysm-dda/mods/DinoMod/mutations/mutations.json
+share/cataclysm-dda/mods/DinoMod/obsolete/fieldoffice.json
+share/cataclysm-dda/mods/DinoMod/obsolete/monsters.json
+share/cataclysm-dda/mods/DinoMod/overmap/map_extras.json
+share/cataclysm-dda/mods/DinoMod/overmap/overmap_specials.json
+share/cataclysm-dda/mods/DinoMod/overmap/overmap_terrain.json
+share/cataclysm-dda/mods/DinoMod/recipe_medsandchemicals.json
share/cataclysm-dda/mods/DinoMod/regional_overlay.json
share/cataclysm-dda/mods/DinoMod/snippets.json
-share/cataclysm-dda/mods/EW_Pack/ew_ammo.json
-share/cataclysm-dda/mods/EW_Pack/ew_ammo_handloaded.json
-share/cataclysm-dda/mods/EW_Pack/ew_ammo_t.json
-share/cataclysm-dda/mods/EW_Pack/ew_books.json
-share/cataclysm-dda/mods/EW_Pack/ew_bullet_pulling.json
-share/cataclysm-dda/mods/EW_Pack/ew_item_groups.json
-share/cataclysm-dda/mods/EW_Pack/ew_magazines.json
-share/cataclysm-dda/mods/EW_Pack/ew_recipes.json
-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/FictonalWeapons/fic_item_groups.json
-share/cataclysm-dda/mods/FictonalWeapons/fic_mods.json
-share/cataclysm-dda/mods/FictonalWeapons/fic_recipes.json
-share/cataclysm-dda/mods/FictonalWeapons/fic_weapons.json
-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/DinoMod/startlocations.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
@@ -1851,9 +2413,6 @@ share/cataclysm-dda/mods/Fuji_Mil_Prof/p
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
share/cataclysm-dda/mods/Fuji_Structures/modinfo.json
share/cataclysm-dda/mods/Fuji_Structures/monsters/monstergroups.json
share/cataclysm-dda/mods/Fuji_Structures/npc/NC_BUNKER_MERCHANT.json
@@ -1863,17 +2422,6 @@ share/cataclysm-dda/mods/Fuji_Structures
share/cataclysm-dda/mods/Fuji_Structures/starts/professions.json
share/cataclysm-dda/mods/Fuji_Structures/starts/scenarios.json
share/cataclysm-dda/mods/Fuji_Structures/starts/start_locations.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_atc.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_atc_2.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_atc_3.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_hangars.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_parking.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_hangars.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_l.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_r.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_term.json
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_term.json
share/cataclysm-dda/mods/Fuji_Structures/worldgen/bunker_shop/s_bunker_shop_b.json
share/cataclysm-dda/mods/Fuji_Structures/worldgen/bunker_shop/s_bunker_shop_g.json
share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_b11.json
@@ -1881,36 +2429,8 @@ share/cataclysm-dda/mods/Fuji_Structures
share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_b21.json
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/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/ammo/black_powder.json
share/cataclysm-dda/mods/Generic_Guns/ammo/casings.json
share/cataclysm-dda/mods/Generic_Guns/ammo/gg_ammo_migration.json
@@ -1924,6 +2444,7 @@ share/cataclysm-dda/mods/Generic_Guns/am
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/bandoliers/holster.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
@@ -1948,6 +2469,7 @@ share/cataclysm-dda/mods/Generic_Guns/ma
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/obsolete.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
@@ -1960,8 +2482,13 @@ share/cataclysm-dda/mods/Generic_Guns/re
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/uncraft/ammo/grenade_propelled.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/pistol.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/pistol_magnum.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/pistol_tiny.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/rifle.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/rifle_huge.json
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/shot.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
@@ -1998,28 +2525,12 @@ share/cataclysm-dda/mods/Graphical_Overm
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_Magiclysm/go_overmap_terrain_magical.json
+share/cataclysm-dda/mods/Graphical_Overmap_Magiclysm/modinfo.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
@@ -2028,7 +2539,30 @@ share/cataclysm-dda/mods/MMA/mutations.j
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/attunements/Artificer.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Biotek.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Blood_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Boreal_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Cleansing_Flame.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Earth_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Fire_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Force_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Glacier_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Golemancer.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Gravity_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Ice_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Illusionist.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Magnetism_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Overclocker.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Radiation_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Soulfire.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Storm_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Sun_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Tundra_Mage.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Vulcanist.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Wither_Mage.json
share/cataclysm-dda/mods/Magiclysm/Spells/biomancer.json
+share/cataclysm-dda/mods/Magiclysm/Spells/black_dragon.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
@@ -2038,25 +2572,24 @@ share/cataclysm-dda/mods/Magiclysm/Spell
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/manatouched.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/achievements/spells.json
+share/cataclysm-dda/mods/Magiclysm/achievements/statistics.json
share/cataclysm-dda/mods/Magiclysm/bionics.json
+share/cataclysm-dda/mods/Magiclysm/construction_group.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/emitter.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Fire_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Gaias_Chosen.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Ice_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Soulfire.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Storm_Elemental.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Sun_Mage.json
+share/cataclysm-dda/mods/Magiclysm/enchantments/Void_Mage.json
share/cataclysm-dda/mods/Magiclysm/field.json
share/cataclysm-dda/mods/Magiclysm/furniture.json
share/cataclysm-dda/mods/Magiclysm/harvest.json
@@ -2069,16 +2602,32 @@ share/cataclysm-dda/mods/Magiclysm/items
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/books_lore.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/containers.json
share/cataclysm-dda/mods/Magiclysm/items/enchanted.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_belts.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_boots.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_bracers.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_cloaks.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_gunmods.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_masks.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_melee.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_misc.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_ranged.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_rings.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_tokens.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_unarmed.json
+share/cataclysm-dda/mods/Magiclysm/items/enchanted_wands.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/mutagen.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
@@ -2097,11 +2646,23 @@ share/cataclysm-dda/mods/Magiclysm/monst
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/Ogre.json
+share/cataclysm-dda/mods/Magiclysm/monsters/Orcs.json
share/cataclysm-dda/mods/Magiclysm/monsters/demon_spider.json
share/cataclysm-dda/mods/Magiclysm/monsters/dragon.json
+share/cataclysm-dda/mods/Magiclysm/monsters/forgedwellers.json
+share/cataclysm-dda/mods/Magiclysm/monsters/goblin.json
share/cataclysm-dda/mods/Magiclysm/monsters/golems.json
+share/cataclysm-dda/mods/Magiclysm/monsters/holiday_magiclysm.json
share/cataclysm-dda/mods/Magiclysm/monsters/lizardfolk.json
share/cataclysm-dda/mods/Magiclysm/monsters/monsters.json
+share/cataclysm-dda/mods/Magiclysm/monsters/zombified_monsters.json
+share/cataclysm-dda/mods/Magiclysm/mutations/dragon_mutation_category.json
+share/cataclysm-dda/mods/Magiclysm/mutations/mutation_effects.json
+share/cataclysm-dda/mods/Magiclysm/mutations/mutation_enchantments.json
+share/cataclysm-dda/mods/Magiclysm/mutations/mutations.json
+share/cataclysm-dda/mods/Magiclysm/mutations/overlay_ordering.json
+share/cataclysm-dda/mods/Magiclysm/npc/TALK_FORGE_MERCHANT.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
@@ -2110,9 +2671,14 @@ share/cataclysm-dda/mods/Magiclysm/npc/f
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/npc/trait_groups.json
share/cataclysm-dda/mods/Magiclysm/professions.json
+share/cataclysm-dda/mods/Magiclysm/proficiencies.json
+share/cataclysm-dda/mods/Magiclysm/qualities.json
share/cataclysm-dda/mods/Magiclysm/recipes.json
share/cataclysm-dda/mods/Magiclysm/recipes/alchemy.json
+share/cataclysm-dda/mods/Magiclysm/recipes/armor.json
+share/cataclysm-dda/mods/Magiclysm/recipes/blacksmithing.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
@@ -2120,64 +2686,49 @@ share/cataclysm-dda/mods/Magiclysm/recip
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/recipe_vehicle.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/requirements/spell_components.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/attunements.json
share/cataclysm-dda/mods/Magiclysm/traits/classes.json
+share/cataclysm-dda/mods/Magiclysm/traits/manatouched.json
share/cataclysm-dda/mods/Magiclysm/traits/mutation.json
+share/cataclysm-dda/mods/Magiclysm/traits/temporary_demon_traits.json
+share/cataclysm-dda/mods/Magiclysm/traps.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/summoned_vehicles.json
share/cataclysm-dda/mods/Magiclysm/vehicles/vans_busses.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/attunement_altar.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/forest_tomb.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/forge_of_wonders.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/goblin_encampment.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/house_technomancer.json
share/cataclysm-dda/mods/Magiclysm/worldgen/lake_retreat.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/magic_academy.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/nested_mapgen.json
+share/cataclysm-dda/mods/Magiclysm/worldgen/orc_village.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_types.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/modinfo.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_shields.json
-share/cataclysm-dda/mods/Medieval_Stuff/recipe_weapon.json
-share/cataclysm-dda/mods/Medieval_Stuff/shields.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
-share/cataclysm-dda/mods/Modular_Turrets/emit.json
-share/cataclysm-dda/mods/Modular_Turrets/furniture.json
-share/cataclysm-dda/mods/Modular_Turrets/item_groups.json
-share/cataclysm-dda/mods/Modular_Turrets/items.json
-share/cataclysm-dda/mods/Modular_Turrets/modinfo.json
-share/cataclysm-dda/mods/Modular_Turrets/monster.json
-share/cataclysm-dda/mods/Modular_Turrets/monster_attacks.json
-share/cataclysm-dda/mods/Modular_Turrets/monster_drops.json
-share/cataclysm-dda/mods/Modular_Turrets/monster_override.json
-share/cataclysm-dda/mods/Modular_Turrets/monstergroups.json
-share/cataclysm-dda/mods/Modular_Turrets/recipe.json
-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_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
@@ -2962,22 +3513,6 @@ share/cataclysm-dda/mods/More_Locations/
share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_ubrc_01.json
share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_utlc_01.json
share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_utrc_01.json
-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/effects.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/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
@@ -2985,9 +3520,14 @@ share/cataclysm-dda/mods/My_Sweet_Catacl
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_furniture.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_mapgen/sweet_overmap_locations.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_overmap_terrain.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_specials.json
+share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_terrain.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
@@ -3002,13 +3542,6 @@ share/cataclysm-dda/mods/My_Sweet_Catacl
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/National_Guard_Camp/furniture.json
share/cataclysm-dda/mods/National_Guard_Camp/item_groups.json
share/cataclysm-dda/mods/National_Guard_Camp/military.json
@@ -3020,126 +3553,51 @@ share/cataclysm-dda/mods/National_Guard_
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_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
share/cataclysm-dda/mods/No_Fungi/modinfo.json
share/cataclysm-dda/mods/No_Fungi/terrain.json
-share/cataclysm-dda/mods/No_Medieval_Items/modinfo.json
-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/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/Only_Wildlife/modinfo.json
-share/cataclysm-dda/mods/RL_Classes/classes.json
-share/cataclysm-dda/mods/RL_Classes/modinfo.json
-share/cataclysm-dda/mods/Safe_autodoc/game_balance.json
-share/cataclysm-dda/mods/Safe_autodoc/modinfo.json
-share/cataclysm-dda/mods/Salvaged_Robots/corpses.json
-share/cataclysm-dda/mods/Salvaged_Robots/emit.json
-share/cataclysm-dda/mods/Salvaged_Robots/harvest.json
-share/cataclysm-dda/mods/Salvaged_Robots/item_groups.json
-share/cataclysm-dda/mods/Salvaged_Robots/items.json
-share/cataclysm-dda/mods/Salvaged_Robots/modinfo.json
-share/cataclysm-dda/mods/Salvaged_Robots/monster_attacks.json
-share/cataclysm-dda/mods/Salvaged_Robots/monster_drops.json
-share/cataclysm-dda/mods/Salvaged_Robots/monstergroups.json
-share/cataclysm-dda/mods/Salvaged_Robots/monsters.json
-share/cataclysm-dda/mods/Salvaged_Robots/recipe.json
-share/cataclysm-dda/mods/Salvaged_Robots/roboguns.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/40mm.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/item_groups.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/items.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/overmap_special.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/overmap_terrain.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/paintball.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/professions.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/readme.txt
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_first_01.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_second_01.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/scenarios.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/start_locations.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/tpalettes.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/vehicle_groups.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/vehicle_parts.json
-share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/vehicles.json
-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/modinfo.json
share/cataclysm-dda/mods/StatsThroughSkills/modinfo.json
share/cataclysm-dda/mods/TEST_DATA/README.md
+share/cataclysm-dda/mods/TEST_DATA/ammo.json
+share/cataclysm-dda/mods/TEST_DATA/basecamp.json
+share/cataclysm-dda/mods/TEST_DATA/bionics.json
+share/cataclysm-dda/mods/TEST_DATA/effects.json
+share/cataclysm-dda/mods/TEST_DATA/enchantments.json
+share/cataclysm-dda/mods/TEST_DATA/itemgroups.json
+share/cataclysm-dda/mods/TEST_DATA/items.json
+share/cataclysm-dda/mods/TEST_DATA/magic.json
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
-share/cataclysm-dda/mods/Tanks/modinfo.json
-share/cataclysm-dda/mods/Tanks/monster_drops.json
-share/cataclysm-dda/mods/Tanks/monsters.json
-share/cataclysm-dda/mods/Tanks/parts.json
-share/cataclysm-dda/mods/Tanks/recipes.json
-share/cataclysm-dda/mods/Tanks/snippets.json
-share/cataclysm-dda/mods/Tanks/vehicle_groups.json
-share/cataclysm-dda/mods/Tanks/vehicles.json
-share/cataclysm-dda/mods/Tolerate_This/comestibles.json
-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/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
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_13_dense_house_apt_house.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_14_dense_house_mart_food.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_15_house.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_16_house_ranch.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_17_house_ranch.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_18_victorian.json
+share/cataclysm-dda/mods/TEST_DATA/mutations.json
+share/cataclysm-dda/mods/TEST_DATA/recipes.json
+share/cataclysm-dda/mods/TEST_DATA/uncraft.json
+share/cataclysm-dda/mods/TEST_DATA/vehicle.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_19_victorian.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_1_house.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_20_duplex.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_21_house.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_22_house_pool.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_23_dense_office_theater.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_24_dense_bank_house.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_25_dense_diner_apt.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_26_dense_club.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_27_dense_barber_apt.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_28_dense_cafe_laundry.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_29_dense_row.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_2_house.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_30_dense_subway.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_31_police_station.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_32_fire_station.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_33_hotel.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_34_school.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_35_hospital.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_36_projects.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_37_office_tower_beehive.json
share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_38_bar_hardware_house.json
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
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_7_house_garden.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_8_house_brick_garden.json
-share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_9_house_garage_loft.json
share/cataclysm-dda/mods/Urban_Development/mapgen_palettes/acidia_commercial_destroyed_palette.json
share/cataclysm-dda/mods/Urban_Development/mapgen_palettes/acidia_commercial_palette.json
share/cataclysm-dda/mods/Urban_Development/mapgen_palettes/acidia_residential_commercial_palette.json
@@ -3147,40 +3605,19 @@ 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/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/blazemod/blaze_ammo.json
-share/cataclysm-dda/mods/blazemod/blaze_ammo_recipes.json
-share/cataclysm-dda/mods/blazemod/blaze_ammo_types.json
-share/cataclysm-dda/mods/blazemod/blaze_autoweapons_parts.json
-share/cataclysm-dda/mods/blazemod/blaze_blob.json
-share/cataclysm-dda/mods/blazemod/blaze_blob_construct.json
-share/cataclysm-dda/mods/blazemod/blaze_blob_monster.json
-share/cataclysm-dda/mods/blazemod/blaze_blob_parts.json
-share/cataclysm-dda/mods/blazemod/blaze_blob_recipes.json
-share/cataclysm-dda/mods/blazemod/blaze_magazine_recipes.json
-share/cataclysm-dda/mods/blazemod/blaze_magazines.json
-share/cataclysm-dda/mods/blazemod/blaze_migration.json
-share/cataclysm-dda/mods/blazemod/blaze_other.json
-share/cataclysm-dda/mods/blazemod/blaze_other_parts.json
-share/cataclysm-dda/mods/blazemod/blaze_other_recipes.json
-share/cataclysm-dda/mods/blazemod/blaze_override.json
-share/cataclysm-dda/mods/blazemod/blaze_test.json
-share/cataclysm-dda/mods/blazemod/blaze_weapons.json
-share/cataclysm-dda/mods/blazemod/blaze_weapons_parts.json
-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/missiondef.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_monster_factions.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
@@ -3190,115 +3627,9 @@ share/cataclysm-dda/mods/desert_region/d
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/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
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_04.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_05.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2be_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2blc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2brc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2le_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2mid_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2re_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2te_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2tlc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2trc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3be_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3blc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3brc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3le_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3mid_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3re_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3te_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3tlc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3trc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_entrance_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_entrance_02.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_parking_01.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/overmap_specials.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/overmap_terrain.json
-share/cataclysm-dda/mods/mapspecials_demo/megastore/palettes.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/monster_groups.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/overmap_specials.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/overmap_terrain.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/palettes.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_blc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_brc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_entrance_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_fblc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_fbrc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ftlc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ftrc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_trc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ublc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ublc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ublc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ubrc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ubrc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ubrc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlca_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlca_02.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlca_03.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_02.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_03.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_04.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utrc_01.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utrc_02.json
-share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utrc_03.json
-share/cataclysm-dda/mods/mapspecials_demo/modinfo.json
-share/cataclysm-dda/mods/more_classes_scenarios/cs_classes.json
-share/cataclysm-dda/mods/more_classes_scenarios/cs_scenarios.json
-share/cataclysm-dda/mods/more_classes_scenarios/cs_start_locations.json
-share/cataclysm-dda/mods/more_classes_scenarios/modinfo.json
-share/cataclysm-dda/mods/necromancy/modinfo.json
-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/package_bionic_professions/bionic_professions.json
+share/cataclysm-dda/mods/package_bionic_professions/modinfo.json
+share/cataclysm-dda/mods/package_bionic_professions/scenarios.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
@@ -3328,6 +3659,7 @@ share/cataclysm-dda/names/ko.json
share/cataclysm-dda/names/ru.json
share/cataclysm-dda/names/zh_CN.json
share/cataclysm-dda/names/zh_TW.json
+share/cataclysm-dda/raw/color_templates/default.json
share/cataclysm-dda/raw/color_templates/no_bright_background.json
share/cataclysm-dda/raw/colors.json
share/cataclysm-dda/raw/keybindings.json
@@ -3338,6 +3670,7 @@ 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.alt1
share/cataclysm-dda/title/en.christmas
share/cataclysm-dda/title/en.easter
share/cataclysm-dda/title/en.halloween
@@ -3345,6 +3678,7 @@ share/cataclysm-dda/title/en.independenc
share/cataclysm-dda/title/en.new_year
share/cataclysm-dda/title/en.thanksgiving
share/cataclysm-dda/title/en.title
+share/cataclysm-dda/title/ru.alt1
share/cataclysm-dda/title/ru.title
share/cataclysm-dda/title/zh_CN.title
share/icons/hicolor/1024x1024/apps/cataclysm-dda.png
@@ -3354,14 +3688,15 @@ share/icons/hicolor/256x256/apps/catacly
share/icons/hicolor/32x32/apps/cataclysm-dda.png
share/icons/hicolor/512x512/apps/cataclysm-dda.png
share/icons/hicolor/64x64/apps/cataclysm-dda.png
-share/icons/hicolor/scalable/apps/cataclysm-dda.svg
+share/icons/hicolor/scalable/apps/org.cataclysmdda.CataclysmDDA.svg
share/locale/ar/LC_MESSAGES/cataclysm-dda.mo
+share/locale/cs/LC_MESSAGES/cataclysm-dda.mo
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/fil_PH/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
Index: pkgsrc/games/cataclysm-dda/patches/patch-lang_compile__mo.sh
diff -u pkgsrc/games/cataclysm-dda/patches/patch-lang_compile__mo.sh:1.1 pkgsrc/games/cataclysm-dda/patches/patch-lang_compile__mo.sh:1.2
--- pkgsrc/games/cataclysm-dda/patches/patch-lang_compile__mo.sh:1.1 Thu Apr 30 14:57:30 2020
+++ pkgsrc/games/cataclysm-dda/patches/patch-lang_compile__mo.sh Mon Jul 12 20:54:02 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-lang_compile__mo.sh,v 1.1 2020/04/30 14:57:30 nia Exp $
+$NetBSD: patch-lang_compile__mo.sh,v 1.2 2021/07/12 20:54:02 nia Exp $
Shell portability.
---- lang/compile_mo.sh.orig 2020-04-01 05:39:38.000000000 +0000
+--- lang/compile_mo.sh.orig 2021-07-03 05:00:06.000000000 +0000
+++ lang/compile_mo.sh
-@@ -24,7 +24,7 @@ then
+@@ -26,7 +26,7 @@ then
for n in $@
do
f="lang/po/${n}.po"
-- if [ $n == "en" ]; then
-+ if [ $n = "en" ]; then
+- if ( [ "$n" == "en" ]) && ((! [ "${os##CYGWIN*}" ]) || (! [ "${os##MINGW*}" ])); then
++ if ( [ "$n" = "en" ]) && ((! [ "${os##CYGWIN*}" ]) || (! [ "${os##MINGW*}" ])); 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 pkgsrc/games/cataclysm-dda/patches/patch-src_translations.cpp:1.1 pkgsrc/games/cataclysm-dda/patches/patch-src_translations.cpp:1.2
--- pkgsrc/games/cataclysm-dda/patches/patch-src_translations.cpp:1.1 Thu Apr 30 14:57:30 2020
+++ pkgsrc/games/cataclysm-dda/patches/patch-src_translations.cpp Mon Jul 12 20:54:02 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_translations.cpp,v 1.1 2020/04/30 14:57:30 nia Exp $
+$NetBSD: patch-src_translations.cpp,v 1.2 2021/07/12 20:54:02 nia Exp $
Avoid overriding gettext functions with incompatible versions.
---- src/translations.cpp.orig 2020-04-01 05:39:38.000000000 +0000
+--- src/translations.cpp.orig 2021-07-03 05:00:06.000000000 +0000
+++ src/translations.cpp
-@@ -59,45 +59,6 @@ static bool sanity_checked_genders = fal
- std::string getOSXSystemLang();
+@@ -75,45 +75,6 @@ static std::string getAppleSystemLanguag
+ static std::string getAndroidSystemLanguage();
#endif
-const char *pgettext( const char *context, const char *msgid )
@@ -47,6 +47,6 @@ Avoid overriding gettext functions with
- }
-}
-
- bool isValidLanguage( const std::string &lang )
+ void select_language()
{
- const auto languages = get_options().get_option( "USE_LANG" ).getItems();
+ auto languages = get_options().get_option( "USE_LANG" ).getItems();
Index: pkgsrc/games/cataclysm-dda/patches/patch-src_translations.h
diff -u pkgsrc/games/cataclysm-dda/patches/patch-src_translations.h:1.1 pkgsrc/games/cataclysm-dda/patches/patch-src_translations.h:1.2
--- pkgsrc/games/cataclysm-dda/patches/patch-src_translations.h:1.1 Thu Apr 30 14:57:30 2020
+++ pkgsrc/games/cataclysm-dda/patches/patch-src_translations.h Mon Jul 12 20:54:02 2021
@@ -1,14 +1,13 @@
-$NetBSD: patch-src_translations.h,v 1.1 2020/04/30 14:57:30 nia Exp $
+$NetBSD: patch-src_translations.h,v 1.2 2021/07/12 20:54:02 nia Exp $
Avoid overriding gettext functions with incompatible versions.
---- src/translations.h.orig 2020-04-01 05:39:38.000000000 +0000
+--- src/translations.h.orig 2021-07-03 05:00:06.000000000 +0000
+++ src/translations.h
-@@ -56,26 +56,6 @@ inline std::string _( const std::string
- {
- return _( msg.c_str() );
- }
--
+@@ -144,25 +144,6 @@ static inline local_translation_cache<st
+ return cache( arg ); \
+ } )( msg ) )
+
-// 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
Home |
Main Index |
Thread Index |
Old Index