[update] cataclysm-dda 0.E.3 -> 0.F

Updates to the next major release of Cataclysm: Dark Days Ahead.

I moved the packaged Terminus font and its license to the no-no_x11
package fragment, since they're not needed by the no_x11 flavor.

patch-test_Makefile is needed or catch/catch.hpp isn't included
properly when building pch tests (clang & gcc inconsistency?)

Port also attached as tgz.

Thoughts/Tests/OK? @trondd


Index: Makefile
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 26 Jun 2021 06:25:41 -0000 1.17
+++ Makefile 5 Jul 2021 18:33:59 -0000
@@ -5,10 +5,8 @@ CATEGORIES= games

GH_ACCOUNT= CleverRaven
GH_PROJECT= Cataclysm-DDA
-GH_TAGNAME= 0.E-3
-DISTNAME= cataclysm-dda-0.E.3
-EPOCH= 0
-REVISION= 1
+GH_TAGNAME= 0.F
+DISTNAME= cataclysm-dda-0.F

HOMEPAGE= https://cataclysmdda.org
MAINTAINER= Tim Meunier <trondd@kagu-tsuchi.com>
@@ -19,14 +17,18 @@ PERMIT_PACKAGE= Yes
FLAVORS= no_x11
FLAVOR?=

-WANTLIB= ${COMPILER_LIBCXX} c execinfo iconv intl m pthread
+WANTLIB= ${COMPILER_LIBCXX} c execinfo iconv intl m

# C++14
COMPILER= base-clang ports-gcc

MODULES= textproc/intltool

-LIB_DEPENDS= devel/gettext,-runtime
+RUN_DEPENDS= devel/desktop-file-utils \
+ x11/gtk+3,-guic
+
+LIB_DEPENDS= devel/gettext,-runtime \
+ devel/libexecinfo

MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"

Index: distinfo
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 4 Jan 2021 17:00:36 -0000 1.11
+++ distinfo 5 Jul 2021 18:33:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (cataclysm-dda-0.E.3.tar.gz) = IaxSJqmWrEZYQvGIyt6ogV6ucwn+OM+NlN4visl82CA=
-SIZE (cataclysm-dda-0.E.3.tar.gz) = 70144192
+SHA256 (cataclysm-dda-0.F.tar.gz) = 98NzzSRQNT+ZpcOTenKudF9UQFMSZtLVluW/eYABrFc=
+SIZE (cataclysm-dda-0.F.tar.gz) = 88591910
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 patch-Makefile
--- patches/patch-Makefile 25 Jun 2021 17:42:59 -0000 1.10
+++ patches/patch-Makefile 5 Jul 2021 18:33:59 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.10 2021/06/
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -92,7 +92,7 @@
+@@ -97,7 +97,7 @@
# RELEASE_FLAGS is flags for release builds.
RELEASE_FLAGS =
WARNINGS = \
@@ -12,15 +12,15 @@ Index: Makefile
-Wformat-signedness \
-Wlogical-op \
-Wmissing-declarations \
-@@ -310,7 +310,6 @@ ifdef RELEASE
+@@ -362,7 +362,6 @@ ifeq ($(RELEASE), 1)
OPTLEVEL = -O3
endif
endif
- CXXFLAGS += $(OPTLEVEL)

- ifdef LTO
+ ifeq ($(LTO), 1)
ifeq ($(NATIVE), osx)
-@@ -368,7 +367,7 @@ endif
+@@ -419,7 +418,7 @@ endif
ifeq ($(shell sh -c 'uname -o 2>/dev/null || echo not'),Cygwin)
OTHERS += -std=gnu++14
else
@@ -29,7 +29,7 @@ Index: Makefile
endif

ifeq ($(CYGWIN),1)
-@@ -522,11 +521,6 @@ ifdef MAPSIZE
+@@ -625,11 +624,6 @@ ifdef MAPSIZE
CXXFLAGS += -DMAPSIZE=$(MAPSIZE)
endif

@@ -39,44 +39,37 @@ Index: Makefile
-endif
-
PKG_CONFIG = $(CROSS)pkg-config
- SDL2_CONFIG = $(CROSS)sdl2-config

-@@ -699,7 +693,7 @@ ifeq ($(BSD), 1)
+ ifeq ($(SOUND), 1)
+@@ -798,7 +792,7 @@ ifeq ($(BSD), 1)

# And similarly, their libcs don't have gettext built in
ifeq ($(LOCALIZE),1)
- LDFLAGS += -lintl -liconv
+ LDFLAGS += -L$(LOCALBASE)/lib -lintl -liconv
endif
- endif
-
-@@ -825,7 +819,7 @@ ifdef LTO
- endif
- endif

--all: version $(CHECKS) $(TARGET) $(L10N) $(TESTS) validate-pr
-+all: version $(CHECKS) $(TARGET) $(L10N) $(TESTS)
- @
-
- $(TARGET): $(OBJS)
-@@ -844,7 +838,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(OBJS)
+ # libexecinfo, libintl and libiconv may be located in /usr/local on BSD
+@@ -950,7 +944,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(OBJS)
.PHONY: version
version:
@( VERSION_STRING=$(VERSION) ; \
-- [ -e ".git" ] && GITVERSION=$$( git describe --tags --always --dirty --match "[0-9A-Z]*.[0-9A-Z]*" ) && VERSION_STRING=$$GITVERSION ; \
+- [ -e ".git" ] && GITVERSION=$$( git describe --tags --always --match "[0-9A-Z]*.[0-9A-Z]*" ) && DIRTYFLAG=$$( [ -z "$$(git diff --numstat | grep -v lang/po/)" ] || echo "-dirty") && VERSION_STRING=$$GITVERSION$$DIRTYFLAG ; \
[ -e "$(SRC_DIR)/version.h" ] && OLDVERSION=$$(grep VERSION $(SRC_DIR)/version.h|cut -d '"' -f2) ; \
- if [ "x$$VERSION_STRING" != "x$$OLDVERSION" ]; then echo "#define VERSION \"$$VERSION_STRING\"" | tee $(SRC_DIR)/version.h ; fi \
+ if [ "x$$VERSION_STRING" != "x$$OLDVERSION" ]; then printf '// NOLINT(cata-header-guard)\n#define VERSION "%s"\n' "$$VERSION_STRING" | tee $(SRC_DIR)/version.h ; fi \
)
-@@ -891,31 +884,31 @@ distclean:
+@@ -997,35 +990,36 @@ distclean:
bindist: $(BINDIST)

ifeq ($(TARGETSYSTEM), LINUX)
-DATA_PREFIX=$(DESTDIR)$(PREFIX)/share/cataclysm-dda/
-BIN_PREFIX=$(DESTDIR)$(PREFIX)/bin
-LOCALE_DIR=$(DESTDIR)$(PREFIX)/share/locale
+-SHARE_DIR=$(DESTDIR)$(PREFIX)/share
+DATA_PREFIX=$(PREFIX)/share/cataclysm-dda/
+BIN_PREFIX=$(PREFIX)/bin
+LOCALE_DIR=$(PREFIX)/share/locale
++SHARE_DIR=$(PREFIX)/share
install: version $(TARGET)
mkdir -p $(DATA_PREFIX)
mkdir -p $(BIN_PREFIX)
@@ -91,7 +84,7 @@ Index: Makefile
- cp -R --no-preserve=ownership data/credits $(DATA_PREFIX)
- cp -R --no-preserve=ownership data/title $(DATA_PREFIX)
- cp -R --no-preserve=ownership data/help $(DATA_PREFIX)
-+ install -m 755 $(TARGET) $(BIN_PREFIX)
++ install -m755 $(TARGET) $(BIN_PREFIX)
+ cp -R data/core $(DATA_PREFIX)
+ cp -R data/font $(DATA_PREFIX)
+ cp -R data/json $(DATA_PREFIX)
@@ -102,39 +95,37 @@ Index: Makefile
+ cp -R data/credits $(DATA_PREFIX)
+ cp -R data/title $(DATA_PREFIX)
+ cp -R data/help $(DATA_PREFIX)
- ifdef TILES
+ ifeq ($(TILES), 1)
- cp -R --no-preserve=ownership gfx $(DATA_PREFIX)
+- install -Dm755 -t $(SHARE_DIR)/applications/ data/xdg/org.cataclysmdda.CataclysmDDA.desktop
+- install -Dm644 -t $(SHARE_DIR)/metainfo/ data/xdg/org.cataclysmdda.CataclysmDDA.appdata.xml
+- install -Dm644 -t $(SHARE_DIR)/icons/hicolor/scalable/apps/ data/xdg/org.cataclysmdda.CataclysmDDA.svg
+ cp -R gfx $(DATA_PREFIX)
++ mkdir -p $(SHARE_DIR)/{applications,metainfo,icons/hicolor/scalable/apps}
++ install -m755 data/xdg/org.cataclysmdda.CataclysmDDA.desktop $(SHARE_DIR)/applications/
++ install -m644 data/xdg/org.cataclysmdda.CataclysmDDA.appdata.xml $(SHARE_DIR)/metainfo/
++ install -m644 data/xdg/org.cataclysmdda.CataclysmDDA.svg $(SHARE_DIR)/icons/hicolor/scalable/apps/
endif
- ifdef SOUND
+ ifeq ($(SOUND), 1)
- cp -R --no-preserve=ownership data/sound $(DATA_PREFIX)
+ cp -R data/sound $(DATA_PREFIX)
endif
- install --mode=644 data/changelog.txt data/cataicon.ico data/fontdata.json \
- LICENSE.txt LICENSE-OFL-Terminus-Font.txt -t $(DATA_PREFIX)
-+ install -m 644 data/changelog.txt data/cataicon.ico data/fontdata.json \
++ install -m644 data/changelog.txt data/cataicon.ico data/fontdata.json \
+ LICENSE.txt LICENSE-OFL-Terminus-Font.txt $(DATA_PREFIX)
mkdir -p $(LOCALE_DIR)
ifdef LANGUAGES
LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
-@@ -1074,11 +1067,6 @@ etags: $(ASTYLE_SOURCES)
+@@ -1188,11 +1182,6 @@ etags: $(ASTYLE_SOURCES)
+
astyle: $(ASTYLE_SOURCES)
$(ASTYLE_BINARY) --options=.astylerc -n $(ASTYLE_SOURCES)
-
+-
-# Test whether the system has a version of astyle that supports --dry-run
-ifeq ($(shell if $(ASTYLE_BINARY) -Q -X --dry-run src/game.h > /dev/null; then echo foo; fi),foo)
-- ASTYLE_CHECK=$(shell LC_ALL=C $(ASTYLE_BINARY) --options=.astylerc --dry-run -X -Q $(ASTYLE_SOURCES))
+- ASTYLE_CHECK=$(shell $(ASTYLE_BINARY) --options=.astylerc --dry-run -X -Q --ascii $(ASTYLE_SOURCES))
-endif
--
+
astyle-check:
ifdef ASTYLE_CHECK
- $(info $(ASTYLE_BINARY) -V: $(shell $(ASTYLE_BINARY) -V))
-@@ -1121,7 +1109,7 @@ ifneq ($(CYGWIN),1)
- @build-scripts/validate_pr_in_jenkins
- endif
-
--.PHONY: tests check ctags etags clean-tests install lint validate-pr
-+.PHONY: tests check ctags etags clean-tests install lint
-
- -include $(SOURCES:$(SRC_DIR)/%.cpp=$(DEPDIR)/%.P)
- -include ${OBJS:.o=.d}
Index: patches/patch-src_translations_cpp
===================================================================
RCS file: patches/patch-src_translations_cpp
diff -N patches/patch-src_translations_cpp
--- patches/patch-src_translations_cpp 11 Apr 2020 06:41:47 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_translations_cpp,v 1.5 2020/04/11 06:41:47 kirby Exp $
-
-Index: src/translations.cpp
---- src/translations.cpp.orig
-+++ src/translations.cpp
-@@ -212,7 +212,7 @@ void set_language()
- auto env = getenv( "LANGUAGE" );
- locale_dir = std::string( PATH_INFO::base_path() + "lang/mo/" + ( env ? env : "none" ) +
- "/LC_MESSAGES/cataclysm-dda.mo" );
--#elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES)))
-+#elif (defined(__linux__) || defined(__OpenBSD__) || (defined(MACOSX) && !defined(TILES)))
- if( !PATH_INFO::base_path().empty() ) {
- locale_dir = PATH_INFO::base_path() + "share/locale";
- } else {
Index: patches/patch-tests_Makefile
===================================================================
RCS file: patches/patch-tests_Makefile
diff -N patches/patch-tests_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_Makefile 5 Jul 2021 18:33:59 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: tests/Makefile
+--- tests/Makefile.orig
++++ tests/Makefile
+@@ -81,7 +81,7 @@ $(shell mkdir -p $(ODIR))
+
+ # Adding ../tests/ so that the directory appears in __FILE__ for log messages
+ $(ODIR)/%.o: %.cpp $(PCH_P)
+- $(CXX) $(CPPFLAGS) $(DEFINES) $(CXXFLAGS) $(subst main-pch,tests-pch,$(PCHFLAGS)) -c ../tests/$< -o $@
++ $(CXX) $(CPPFLAGS) $(DEFINES) $(CXXFLAGS) $(subst main-pch,tests-pch,$(PCHFLAGS)) -I. -c ../tests/$< -o $@
+
+ .PHONY: clean check check-single tests precompile_header
+
Index: pkg/PFRAG.no-no_x11
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11,v
retrieving revision 1.7
diff -u -p -r1.7 PFRAG.no-no_x11
--- pkg/PFRAG.no-no_x11 11 Jul 2020 17:52:19 -0000 1.7
+++ pkg/PFRAG.no-no_x11 5 Jul 2021 18:33:59 -0000
@@ -1,6 +1,16 @@
-@comment $OpenBSD: PFRAG.no-no_x11,v 1.7 2020/07/11 17:52:19 kirby Exp $
+@comment $OpenBSD: PFRAG.no-no_x11,v$
@bin bin/cataclysm-tiles
@man man/man6/cataclysm-tiles.6
+share/applications/org.cataclysmdda.CataclysmDDA.desktop
+share/cataclysm-dda/LICENSE-OFL-Terminus-Font.txt
+share/cataclysm-dda/LICENSE.txt
+share/cataclysm-dda/font/
+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/gfx/
share/cataclysm-dda/gfx/ASCIITileset/
share/cataclysm-dda/gfx/ASCIITileset/ASCIITiles.png
@@ -8,10 +18,15 @@ share/cataclysm-dda/gfx/ASCIITileset/fal
share/cataclysm-dda/gfx/ASCIITileset/tile_config.json
share/cataclysm-dda/gfx/ASCIITileset/tileset.txt
share/cataclysm-dda/gfx/BrownLikeBears/
+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/
share/cataclysm-dda/gfx/ChestHole16Tileset/fallback.png
share/cataclysm-dda/gfx/ChestHole16Tileset/tile_config.json
@@ -19,6 +34,56 @@ share/cataclysm-dda/gfx/ChestHole16Tiles
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/
+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/
+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/
share/cataclysm-dda/gfx/HitButton_iso/HitButton_iso.png
share/cataclysm-dda/gfx/HitButton_iso/fallback.png
@@ -30,30 +95,46 @@ 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/
-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+/
+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/
+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/
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/
-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/
+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
@@ -64,3 +145,5 @@ 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/icons/hicolor/scalable/apps/org.cataclysmdda.CataclysmDDA.svg
+share/metainfo/org.cataclysmdda.CataclysmDDA.appdata.xml
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 11 Apr 2020 06:41:47 -0000 1.9
+++ pkg/PLIST 5 Jul 2021 18:34:00 -0000
@@ -1,40 +1,57 @@
-@comment $OpenBSD: PLIST,v 1.9 2020/04/11 06:41:47 kirby Exp $
+@comment $OpenBSD: PLIST,v$
%%no_x11%%
!%%no_x11%%
share/cataclysm-dda/
-share/cataclysm-dda/LICENSE-OFL-Terminus-Font.txt
-share/cataclysm-dda/LICENSE.txt
share/cataclysm-dda/cataicon.ico
share/cataclysm-dda/changelog.txt
share/cataclysm-dda/core/
-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/
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/font/
-share/cataclysm-dda/font/map_font_LARWICK.png
-share/cataclysm-dda/font/terminus.fon
-share/cataclysm-dda/font/unifont.ttf
-share/cataclysm-dda/fontdata.json
+share/cataclysm-dda/credits/zh_CN.credits
share/cataclysm-dda/help/
share/cataclysm-dda/help/texts.json
share/cataclysm-dda/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/
+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/
+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/
+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
@@ -48,7 +65,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
@@ -64,10 +80,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
@@ -80,12 +98,12 @@ 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/
share/cataclysm-dda/json/itemgroups/Agriculture_Forage_Excavation/
share/cataclysm-dda/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
@@ -94,13 +112,16 @@ share/cataclysm-dda/json/itemgroups/Clot
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/
share/cataclysm-dda/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
share/cataclysm-dda/json/itemgroups/Food/
share/cataclysm-dda/json/itemgroups/Food/food.json
share/cataclysm-dda/json/itemgroups/Food/irradiated.json
share/cataclysm-dda/json/itemgroups/Locations_MapExtras/
+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
@@ -116,6 +137,7 @@ share/cataclysm-dda/json/itemgroups/SUS/
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
@@ -126,6 +148,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
@@ -199,18 +222,21 @@ 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/
+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
@@ -247,9 +273,11 @@ share/cataclysm-dda/json/items/battery.j
share/cataclysm-dda/json/items/bionics.json
share/cataclysm-dda/json/items/biosignatures.json
share/cataclysm-dda/json/items/book/
+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
@@ -260,16 +288,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
@@ -277,17 +312,19 @@ 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/
-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/
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
@@ -317,6 +354,7 @@ share/cataclysm-dda/json/items/comestibl
share/cataclysm-dda/json/items/containers.json
share/cataclysm-dda/json/items/corpses/
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
@@ -331,11 +369,13 @@ 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/
+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
@@ -380,12 +420,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
@@ -412,6 +453,7 @@ share/cataclysm-dda/json/items/gunmod/un
share/cataclysm-dda/json/items/handloaded_bullets.json
share/cataclysm-dda/json/items/items_holiday.json
share/cataclysm-dda/json/items/magazine/
+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
@@ -445,6 +487,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
@@ -469,6 +512,8 @@ 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/
+share/cataclysm-dda/json/items/relics/altered_items.json
share/cataclysm-dda/json/items/resources/
share/cataclysm-dda/json/items/resources/alien.json
share/cataclysm-dda/json/items/resources/chemicals.json
@@ -478,6 +523,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
@@ -501,12 +547,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
@@ -536,14 +584,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/
share/cataclysm-dda/json/mapgen/Glassblower.json
@@ -555,6 +602,9 @@ 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/
+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
@@ -582,13 +632,17 @@ 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/
+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/
share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_common.json
share/cataclysm-dda/json/mapgen/basecamps/modular_livestock/modular_livestock_log.json
@@ -621,6 +675,13 @@ 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/
+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/
share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_log.json
share/cataclysm-dda/json/mapgen/basecamps/modular_storehouse/modular_storehouse_metal.json
@@ -653,6 +714,9 @@ 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/
+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
@@ -683,7 +747,11 @@ 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/
+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
@@ -691,6 +759,9 @@ share/cataclysm-dda/json/mapgen/cground3
share/cataclysm-dda/json/mapgen/church.json
share/cataclysm-dda/json/mapgen/city_blocks/
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
@@ -720,11 +791,13 @@ 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/
+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 +837,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/
share/cataclysm-dda/json/mapgen/fungal/fungal_bloom.json
share/cataclysm-dda/json/mapgen/fungal/fungal_flowers.json
@@ -789,6 +863,7 @@ share/cataclysm-dda/json/mapgen/homeless
share/cataclysm-dda/json/mapgen/hospital.json
share/cataclysm-dda/json/mapgen/hotel_tower.json
share/cataclysm-dda/json/mapgen/house/
+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
@@ -824,6 +899,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
@@ -877,6 +962,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/
@@ -907,9 +1009,11 @@ 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/
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
@@ -922,16 +1026,23 @@ 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/
+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/
+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/
@@ -940,8 +1051,14 @@ share/cataclysm-dda/json/mapgen/mi-go/mi
share/cataclysm-dda/json/mapgen/mi-go/mi-go_scout_tower.json
share/cataclysm-dda/json/mapgen/microlab/
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
@@ -954,8 +1071,7 @@ share/cataclysm-dda/json/mapgen/military
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/
-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
@@ -971,12 +1087,17 @@ share/cataclysm-dda/json/mapgen/necropol
share/cataclysm-dda/json/mapgen/necropolis/necropolisB2.json
share/cataclysm-dda/json/mapgen/necropolis/necropolisB3.json
share/cataclysm-dda/json/mapgen/nested/
+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
@@ -991,6 +1112,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
@@ -1017,6 +1139,7 @@ share/cataclysm-dda/json/mapgen/railroad
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/
share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_e.json
@@ -1040,6 +1163,7 @@ share/cataclysm-dda/json/mapgen/restaura
share/cataclysm-dda/json/mapgen/reststop.json
share/cataclysm-dda/json/mapgen/river_shipwreck.json
share/cataclysm-dda/json/mapgen/riverside/
+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
@@ -1048,6 +1172,8 @@ share/cataclysm-dda/json/mapgen/robofach
share/cataclysm-dda/json/mapgen/robofaq_locs/
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
@@ -1059,6 +1185,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
@@ -1079,6 +1206,12 @@ share/cataclysm-dda/json/mapgen/storage_
share/cataclysm-dda/json/mapgen/storage_units_medium.json
share/cataclysm-dda/json/mapgen/storage_units_small.json
share/cataclysm-dda/json/mapgen/store/
+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
@@ -1093,6 +1226,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
@@ -1121,11 +1255,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
@@ -1160,22 +1296,26 @@ 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/
+share/cataclysm-dda/json/monster_special_attacks/monster_attacks.json
share/cataclysm-dda/json/monster_special_attacks/spells.json
share/cataclysm-dda/json/monsterdrops/
+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
@@ -1203,12 +1343,14 @@ 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/
@@ -1216,6 +1358,7 @@ share/cataclysm-dda/json/monsters/bird.j
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
@@ -1225,23 +1368,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
@@ -1251,10 +1401,13 @@ 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/
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/
@@ -1262,6 +1415,7 @@ share/cataclysm-dda/json/npcs/BG_trait_g
share/cataclysm-dda/json/npcs/BG_traits.json
share/cataclysm-dda/json/npcs/Backgrounds/
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
@@ -1292,6 +1446,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
@@ -1316,6 +1471,16 @@ 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/
+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/
+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
@@ -1324,6 +1489,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
@@ -1336,7 +1502,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
@@ -1347,6 +1512,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
@@ -1361,6 +1527,10 @@ share/cataclysm-dda/json/npcs/godco/food
share/cataclysm-dda/json/npcs/hints.json
share/cataclysm-dda/json/npcs/holdouts/
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/
share/cataclysm-dda/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
@@ -1372,6 +1542,8 @@ 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/
+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/
@@ -1380,6 +1552,8 @@ 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/
+share/cataclysm-dda/json/npcs/other/NPC_pizzaiolo.json
share/cataclysm-dda/json/npcs/prisoners/
share/cataclysm-dda/json/npcs/prisoners/mi-go_prisoners.json
share/cataclysm-dda/json/npcs/refugee_center/
@@ -1408,6 +1582,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/
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
@@ -1450,10 +1625,12 @@ 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/
share/cataclysm-dda/json/obsoletion/charge_removal.json
+share/cataclysm-dda/json/obsoletion/faults.json
share/cataclysm-dda/json/overmap/
share/cataclysm-dda/json/overmap/map_extras.json
share/cataclysm-dda/json/overmap/multitile_city_buildings.json
@@ -1484,6 +1661,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
@@ -1494,10 +1672,21 @@ 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/
+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/
share/cataclysm-dda/json/recipes/ammo/
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
@@ -1528,13 +1717,17 @@ 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/
+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/
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
@@ -1567,6 +1760,13 @@ 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/
+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/
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
@@ -1586,6 +1786,8 @@ share/cataclysm-dda/json/recipes/basecam
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/
+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
@@ -1593,6 +1795,8 @@ share/cataclysm-dda/json/recipes/electro
share/cataclysm-dda/json/recipes/electronics/parts.json
share/cataclysm-dda/json/recipes/electronics/toolmod.json
share/cataclysm-dda/json/recipes/food/
+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
@@ -1600,29 +1804,39 @@ 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/
-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/
+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/
share/cataclysm-dda/json/recipes/weapon/bashing.json
share/cataclysm-dda/json/recipes/weapon/cutting.json
@@ -1634,6 +1848,8 @@ share/cataclysm-dda/json/recipes/weapon/
share/cataclysm-dda/json/regional_map_settings.json
share/cataclysm-dda/json/requirements/
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
@@ -1655,26 +1871,33 @@ 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/
share/cataclysm-dda/json/uncraft/ammo/
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
@@ -1689,6 +1912,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
@@ -1703,17 +1928,21 @@ 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/
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
@@ -1742,18 +1971,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/
share/cataclysm-dda/json/vehicles/bikes.json
share/cataclysm-dda/json/vehicles/boats.json
@@ -1771,101 +2008,300 @@ 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/
share/cataclysm-dda/mods/Aftershock/
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/
+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/
+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/
share/cataclysm-dda/mods/Aftershock/items/afs_harvest.json
+share/cataclysm-dda/mods/Aftershock/items/ammo/
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/
+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/
+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/
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/
+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/
+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/
+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/
+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/
+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/
+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/
+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/
+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/
+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/
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/
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/
+share/cataclysm-dda/mods/Aftershock/monsterdrops/monster_default.json
+share/cataclysm-dda/mods/Aftershock/monsterdrops/monsterdrops.json
share/cataclysm-dda/mods/Aftershock/mutations/
+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/
+share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/
+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/
+share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/backgrounds/
+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/
+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/
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/
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/
+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/
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/
+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/
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/
+share/cataclysm-dda/mods/BlazeIndustries/README.txt
+share/cataclysm-dda/mods/BlazeIndustries/blaze_furniture.json
+share/cataclysm-dda/mods/BlazeIndustries/items/
+share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/
+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/
+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/
+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/
+share/cataclysm-dda/mods/CRT_EXPANSION/construction_group.json
share/cataclysm-dda/mods/CRT_EXPANSION/constructions/
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/
+share/cataclysm-dda/mods/CRT_EXPANSION/deadspace/deadspaceitems.json
share/cataclysm-dda/mods/CRT_EXPANSION/items/
share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_ammo.json
share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_ammotypes.json
@@ -1874,7 +2310,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
@@ -1903,9 +2341,12 @@ share/cataclysm-dda/mods/CRT_EXPANSION/r
share/cataclysm-dda/mods/CRT_EXPANSION/scenarios/
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/
-share/cataclysm-dda/mods/Craft_Gunpowder/cgp_recipes.json
-share/cataclysm-dda/mods/Craft_Gunpowder/modinfo.json
+share/cataclysm-dda/mods/Chibi_Ultica/
+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/
share/cataclysm-dda/mods/CrazyCataclysm/crazy_aperturepotato.json
share/cataclysm-dda/mods/CrazyCataclysm/crazy_comestibles.json
@@ -1917,36 +2358,141 @@ 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/
-share/cataclysm-dda/mods/DeoxyMod/Deoxy_vehicle_parts.json
-share/cataclysm-dda/mods/DeoxyMod/modinfo.json
+share/cataclysm-dda/mods/Dark-Skies-Above/
+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/
+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/
+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/
+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/
+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/
+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/
+share/cataclysm-dda/mods/Dark-Skies-Above/overrides/furniture_terrain/
+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/
+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/
+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/
+share/cataclysm-dda/mods/Dark-Skies-Above/recipies/uncraft.json
+share/cataclysm-dda/mods/Dark-Skies-Above/snippets/
+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/
+share/cataclysm-dda/mods/Dark-Skies-Above/speech/neworder_speech.json
share/cataclysm-dda/mods/DinoMod/
-share/cataclysm-dda/mods/DinoMod/dinosaur.json
-share/cataclysm-dda/mods/DinoMod/fieldoffice.json
+share/cataclysm-dda/mods/DinoMod/DESIGN.md
+share/cataclysm-dda/mods/DinoMod/NPC/
+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/
+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/
+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/
+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/
+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/
+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/
+share/cataclysm-dda/mods/DinoMod/mutations/dreams.json
+share/cataclysm-dda/mods/DinoMod/mutations/mutations.json
+share/cataclysm-dda/mods/DinoMod/obsolete/
+share/cataclysm-dda/mods/DinoMod/obsolete/fieldoffice.json
+share/cataclysm-dda/mods/DinoMod/obsolete/monsters.json
+share/cataclysm-dda/mods/DinoMod/overmap/
+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/
-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/
-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/
share/cataclysm-dda/mods/Fuji_Mil_Prof/modinfo.json
share/cataclysm-dda/mods/Fuji_Mil_Prof/npc/
@@ -1959,10 +2505,6 @@ share/cataclysm-dda/mods/Fuji_Mil_Prof/p
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/
-share/cataclysm-dda/mods/Fuji_Structures/items/
-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/
share/cataclysm-dda/mods/Fuji_Structures/monsters/monstergroups.json
@@ -1976,18 +2518,6 @@ share/cataclysm-dda/mods/Fuji_Structures
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/
-share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/
-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/
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
@@ -1997,38 +2527,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/
-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/
-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/
share/cataclysm-dda/mods/Generic_Guns/ammo/
share/cataclysm-dda/mods/Generic_Guns/ammo/black_powder.json
@@ -2045,6 +2545,7 @@ share/cataclysm-dda/mods/Generic_Guns/am
share/cataclysm-dda/mods/Generic_Guns/ammo/shot.json
share/cataclysm-dda/mods/Generic_Guns/bandoliers/
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/
share/cataclysm-dda/mods/Generic_Guns/firearms/black_powder.json
share/cataclysm-dda/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -2072,6 +2573,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/
share/cataclysm-dda/mods/Generic_Guns/recipes/recipe_obsolete.json
share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_deconstruction.json
@@ -2086,10 +2588,16 @@ share/cataclysm-dda/mods/Generic_Guns/ro
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/uncraft/
+share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/
+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/
-share/cataclysm-dda/mods/Generic_Guns/vehicles/ammo_redefine_hacks/
-share/cataclysm-dda/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json
-share/cataclysm-dda/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json
share/cataclysm-dda/mods/Generic_Guns/vehicles/turrets.json
share/cataclysm-dda/mods/Graphical_Overmap/
share/cataclysm-dda/mods/Graphical_Overmap/base_colors.json
@@ -2128,34 +2636,15 @@ share/cataclysm-dda/mods/Graphical_Overm
share/cataclysm-dda/mods/Graphical_Overmap_FujiStruct/
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/
+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/
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/
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/
-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/
-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/
-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/
-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/
share/cataclysm-dda/mods/MMA/item_groups.json
share/cataclysm-dda/mods/MMA/martial.json
@@ -2167,7 +2656,31 @@ share/cataclysm-dda/mods/MMA/techniques.
share/cataclysm-dda/mods/Magiclysm/
share/cataclysm-dda/mods/Magiclysm/Spells/
share/cataclysm-dda/mods/Magiclysm/Spells/animist.json
+share/cataclysm-dda/mods/Magiclysm/Spells/attunements/
+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
@@ -2177,27 +2690,27 @@ 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/
+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/
share/cataclysm-dda/mods/Magiclysm/effects/effects.json
-share/cataclysm-dda/mods/Magiclysm/enchanted/
-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/
+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
@@ -2212,16 +2725,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
@@ -2242,12 +2771,25 @@ share/cataclysm-dda/mods/Magiclysm/monst
share/cataclysm-dda/mods/Magiclysm/monstergroups_egg.json
share/cataclysm-dda/mods/Magiclysm/monsters/
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/
+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/
+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
@@ -2256,10 +2798,15 @@ 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/
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
@@ -2267,11 +2814,12 @@ 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/
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
@@ -2280,60 +2828,41 @@ share/cataclysm-dda/mods/Magiclysm/ter_f
share/cataclysm-dda/mods/Magiclysm/terrain.json
share/cataclysm-dda/mods/Magiclysm/tool_qualities.json
share/cataclysm-dda/mods/Magiclysm/traits/
+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/
share/cataclysm-dda/mods/Magiclysm/vehicleparts/frames.json
share/cataclysm-dda/mods/Magiclysm/vehicleparts/vehicle_parts.json
share/cataclysm-dda/mods/Magiclysm/vehicles/
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/
+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/
-share/cataclysm-dda/mods/ManualBionicInstall/game_balance.json
-share/cataclysm-dda/mods/ManualBionicInstall/modinfo.json
-share/cataclysm-dda/mods/Medieval_Stuff/
-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/
-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/
share/cataclysm-dda/mods/More_Locations/bandit_tower/
share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_01.json
@@ -3132,24 +3661,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/
-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/
-share/cataclysm-dda/mods/Mundane_Zombies/modinfo.json
-share/cataclysm-dda/mods/Mundane_Zombies/z2keep.txt
share/cataclysm-dda/mods/Mutant_NPCs/
share/cataclysm-dda/mods/Mutant_NPCs/modinfo.json
share/cataclysm-dda/mods/Mutant_NPCs/npc_classes_mutant.json
@@ -3159,9 +3670,15 @@ 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/
+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
@@ -3176,14 +3693,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/
-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/
share/cataclysm-dda/mods/National_Guard_Camp/furniture.json
share/cataclysm-dda/mods/National_Guard_Camp/item_groups.json
@@ -3198,156 +3707,59 @@ share/cataclysm-dda/mods/National_Guard_
share/cataclysm-dda/mods/National_Guard_Camp/palettes/
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/
-share/cataclysm-dda/mods/No_Acid_Zombies/modinfo.json
-share/cataclysm-dda/mods/No_Anthills/
-share/cataclysm-dda/mods/No_Anthills/modinfo.json
-share/cataclysm-dda/mods/No_Beehives/
-share/cataclysm-dda/mods/No_Beehives/modinfo.json
-share/cataclysm-dda/mods/No_Big_Zombies/
-share/cataclysm-dda/mods/No_Big_Zombies/modinfo.json
-share/cataclysm-dda/mods/No_Explosive_Zombies/
-share/cataclysm-dda/mods/No_Explosive_Zombies/modinfo.json
-share/cataclysm-dda/mods/No_Filthy_Clothes/
-share/cataclysm-dda/mods/No_Filthy_Clothes/modinfo.json
-share/cataclysm-dda/mods/No_Flaming_Weapons/
-share/cataclysm-dda/mods/No_Flaming_Weapons/modinfo.json
share/cataclysm-dda/mods/No_Fungi/
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/
-share/cataclysm-dda/mods/No_Medieval_Items/modinfo.json
-share/cataclysm-dda/mods/No_Mutagen/
-share/cataclysm-dda/mods/No_Mutagen/modinfo.json
share/cataclysm-dda/mods/No_NPC_Food/
share/cataclysm-dda/mods/No_NPC_Food/modinfo.json
-share/cataclysm-dda/mods/No_Old_guns/
-share/cataclysm-dda/mods/No_Old_guns/modinfo.json
share/cataclysm-dda/mods/No_Rail_Stations/
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/
-share/cataclysm-dda/mods/No_Religious_Books/modinfo.json
-share/cataclysm-dda/mods/No_Reviving/
-share/cataclysm-dda/mods/No_Reviving/modinfo.json
-share/cataclysm-dda/mods/No_Rivtech_Guns/
-share/cataclysm-dda/mods/No_Rivtech_Guns/modinfo.json
-share/cataclysm-dda/mods/No_Survivor_Armor/
-share/cataclysm-dda/mods/No_Survivor_Armor/modinfo.json
-share/cataclysm-dda/mods/No_Survivor_Armor/survivor.json
share/cataclysm-dda/mods/Only_Wildlife/
share/cataclysm-dda/mods/Only_Wildlife/modinfo.json
-share/cataclysm-dda/mods/RL_Classes/
-share/cataclysm-dda/mods/RL_Classes/classes.json
-share/cataclysm-dda/mods/RL_Classes/modinfo.json
-share/cataclysm-dda/mods/Safe_autodoc/
-share/cataclysm-dda/mods/Safe_autodoc/game_balance.json
-share/cataclysm-dda/mods/Safe_autodoc/modinfo.json
-share/cataclysm-dda/mods/Salvaged_Robots/
-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/
-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/
-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/
-share/cataclysm-dda/mods/Sleep_Deprivation/modinfo.json
share/cataclysm-dda/mods/StatsThroughSkills/
share/cataclysm-dda/mods/StatsThroughSkills/modinfo.json
share/cataclysm-dda/mods/TEST_DATA/
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/
-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/
-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/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/
share/cataclysm-dda/mods/Urban_Development/building_jsons/
-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/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/
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
@@ -3356,40 +3768,16 @@ 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/
-share/cataclysm-dda/mods/Zombie_Nightvision/modinfo.json
share/cataclysm-dda/mods/alt_map_key/
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/
-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/
share/cataclysm-dda/mods/cbm_slots/game_balance.json
share/cataclysm-dda/mods/cbm_slots/modinfo.json
share/cataclysm-dda/mods/classic_zombies/
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/
share/cataclysm-dda/mods/dda/modinfo.json
@@ -3397,6 +3785,7 @@ share/cataclysm-dda/mods/default.json
share/cataclysm-dda/mods/desert_region/
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
@@ -3406,124 +3795,10 @@ 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/
-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/
-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/
-share/cataclysm-dda/mods/mapspecials_demo/megastore/
-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/
-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/
-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/
-share/cataclysm-dda/mods/necromancy/modinfo.json
-share/cataclysm-dda/mods/necromancy/necronimicron.json
-share/cataclysm-dda/mods/no_scifi/
-share/cataclysm-dda/mods/no_scifi/modinfo.json
-share/cataclysm-dda/mods/novitamins/
-share/cataclysm-dda/mods/novitamins/modinfo.json
+share/cataclysm-dda/mods/package_bionic_professions/
+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/
share/cataclysm-dda/mods/rural_biome/modinfo.json
@@ -3562,6 +3837,7 @@ share/cataclysm-dda/names/zh_CN.json
share/cataclysm-dda/names/zh_TW.json
share/cataclysm-dda/raw/
share/cataclysm-dda/raw/color_templates/
+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/
@@ -3569,6 +3845,7 @@ share/cataclysm-dda/raw/keybindings.json
share/cataclysm-dda/raw/keybindings/vehicle.json
share/cataclysm-dda/raw/sokoban.txt
share/cataclysm-dda/title/
+share/cataclysm-dda/title/en.alt1
share/cataclysm-dda/title/en.christmas
share/cataclysm-dda/title/en.easter
share/cataclysm-dda/title/en.halloween
@@ -3576,26 +3853,30 @@ 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/
-share/locale/ar/LC_MESSAGES/
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
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/
share/locale/es_AR/LC_MESSAGES/
share/locale/es_AR/LC_MESSAGES/cataclysm-dda.mo
share/locale/es_ES/
share/locale/es_ES/LC_MESSAGES/
share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo
+share/locale/fil_PH/
+share/locale/fil_PH/LC_MESSAGES/
+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
-share/locale/is/
-share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/cataclysm-dda.mo
share/locale/it_IT/
share/locale/it_IT/LC_MESSAGES/
@@ -3614,3 +3895,6 @@ share/locale/uk_UA/LC_MESSAGES/
share/locale/uk_UA/LC_MESSAGES/cataclysm-dda.mo
share/locale/zh_CN/LC_MESSAGES/cataclysm-dda.mo
share/locale/zh_TW/LC_MESSAGES/cataclysm-dda.mo
+share/metainfo/
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor