Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Dec 2024 07:31:44 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 3620b27cc257 - main - games/cataclysm-dda: Update to 0.H
Message-ID:  <202412010731.4B17ViuD091102@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3620b27cc25722b0ef1081e344a028587b6e06df

commit 3620b27cc25722b0ef1081e344a028587b6e06df
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-12-01 07:28:39 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-12-01 07:31:33 +0000

    games/cataclysm-dda: Update to 0.H
    
    - Drop USES=compiler
    - Switch to PORTVERSION to respect upstream uppercase letters versioning
    
    ChangeLog:
    https://github.com/CleverRaven/Cataclysm-DDA/releases/tag/0.H-RELEASE
---
 games/cataclysm-dda/Makefile                   |    7 +-
 games/cataclysm-dda/distinfo                   |    6 +-
 games/cataclysm-dda/files/patch-CMakeLists.txt |   18 +-
 games/cataclysm-dda/pkg-plist                  | 1784 ++++++++++++++++--------
 4 files changed, 1233 insertions(+), 582 deletions(-)

diff --git a/games/cataclysm-dda/Makefile b/games/cataclysm-dda/Makefile
index c5820c33f447..ad6cc35ba8a0 100644
--- a/games/cataclysm-dda/Makefile
+++ b/games/cataclysm-dda/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cataclysm-dda
-DISTVERSION=	0.G
-PORTREVISION=	1
+PORTVERSION=	0.H			# Preserve PORTVERSION so uppercase is respected
+DISTVERSIONSUFFIX=	-g08f04fd	# Using TAG instead of upstream 0.H-RELEASE
 PORTEPOCH=	1
 CATEGORIES=	games
 
@@ -20,10 +20,11 @@ FLAVOR?=	curses
 FLAVORS_SUB=	yes
 
 tiles_PKGNAMESUFFIX=		-tiles
+tiles_LIB_DEPENDS=		libFLAC.so:audio/flac
 curses_CONFLICTS_INSTALL=	cataclysm-dda-tiles
 tiles_CONFLICTS_INSTALL=	cataclysm-dda
 
-USES=		cmake compiler:c++14-lang
+USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	CleverRaven
 GH_PROJECT=	Cataclysm-DDA
diff --git a/games/cataclysm-dda/distinfo b/games/cataclysm-dda/distinfo
index 64f243a7c58f..e07c50d31188 100644
--- a/games/cataclysm-dda/distinfo
+++ b/games/cataclysm-dda/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1729975950
-SHA256 (CleverRaven-Cataclysm-DDA-0.G_GH0.tar.gz) = e559d0d495b314ed39890920b222b4ae5067db183b5d39d4263700bfd66f36fb
-SIZE (CleverRaven-Cataclysm-DDA-0.G_GH0.tar.gz) = 157200161
+TIMESTAMP = 1732988970
+SHA256 (CleverRaven-Cataclysm-DDA-0.H-g08f04fd_GH0.tar.gz) = d9982ea26b3dbf086e335ef70f6db2756910ac5cae454b55cd2914cd34bda133
+SIZE (CleverRaven-Cataclysm-DDA-0.H-g08f04fd_GH0.tar.gz) = 199274470
 SHA256 (1ab7d1793b3a34779e4616b8c0c7fab37a6da3be.patch) = 8cb870013ac014a87209afbafa7147d0fe85b0d6738f764d285251d12e037477
 SIZE (1ab7d1793b3a34779e4616b8c0c7fab37a6da3be.patch) = 1963
diff --git a/games/cataclysm-dda/files/patch-CMakeLists.txt b/games/cataclysm-dda/files/patch-CMakeLists.txt
index e0355132145d..dad521ade66a 100644
--- a/games/cataclysm-dda/files/patch-CMakeLists.txt
+++ b/games/cataclysm-dda/files/patch-CMakeLists.txt
@@ -1,19 +1,17 @@
---- CMakeLists.txt.orig	2023-03-01 00:53:47 UTC
+--- CMakeLists.txt.orig	2024-11-23 03:08:02 UTC
 +++ CMakeLists.txt
-@@ -437,7 +437,7 @@ endif()
+@@ -401,14 +401,11 @@ endif()
      add_subdirectory(tools/clang-tidy-plugin)
  endif()
  
--install(DIRECTORY doc gfx
-+install(DIRECTORY gfx
-     DESTINATION ${DATA_PREFIX}
- )
- 
-@@ -446,7 +446,6 @@ if (RELEASE)
+-install(DIRECTORY doc TYPE DOC)
+-
+ if (RELEASE)
+     install(FILES
          ${CMAKE_SOURCE_DIR}/README.md
          ${CMAKE_SOURCE_DIR}/LICENSE.txt
          ${CMAKE_SOURCE_DIR}/LICENSE-OFL-Terminus-Font.txt
 -        ${CMAKE_SOURCE_DIR}/VERSION.txt
-         DESTINATION ${README_DIR})
+         TYPE DOC)
      if (TILES)
-         install(DIRECTORY ${CMAKE_SOURCE_DIR}/gfx DESTINATION ${DATA_PREFIX})
+         if (USE_PREFIX_DATA_DIR)
diff --git a/games/cataclysm-dda/pkg-plist b/games/cataclysm-dda/pkg-plist
index 79b460e45a37..458e1e29476c 100644
--- a/games/cataclysm-dda/pkg-plist
+++ b/games/cataclysm-dda/pkg-plist
@@ -1,12 +1,8 @@
 %%CURSES%%bin/cataclysm
-%%CURSES%%share/man/man6/cataclysm.6.gz
 %%TILES%%bin/cataclysm-tiles
-%%TILES%%share/man/man6/cataclysm-tiles.6.gz
-%%DATADIR%%/LICENSE-OFL-Terminus-Font.txt
-%%DATADIR%%/LICENSE.txt
-%%DATADIR%%/README.md
 %%DATADIR%%/cataicon.ico
 %%DATADIR%%/changelog.txt
+%%DATADIR%%/core/damage_indicators.json
 %%DATADIR%%/core/game_balance.json
 %%DATADIR%%/core/sentinels.json
 %%DATADIR%%/core/tips.json
@@ -33,6 +29,9 @@
 %%DATADIR%%/credits/uk_UA.credits
 %%DATADIR%%/credits/zh_CN.credits
 %%DATADIR%%/credits/zh_TW.credits
+%%DATADIR%%/doc/LICENSE-OFL-Terminus-Font.txt
+%%DATADIR%%/doc/LICENSE.txt
+%%DATADIR%%/doc/README.md
 %%TILES%%%%DATADIR%%/font/Terminus.ttf
 %%TILES%%%%DATADIR%%/font/VecTerminus12Medium.otf
 %%TILES%%%%DATADIR%%/font/map_font_LARWICK.png
@@ -43,6 +42,10 @@
 %%TILES%%%%DATADIR%%/gfx/ASCIITileset/fallback.png
 %%TILES%%%%DATADIR%%/gfx/ASCIITileset/tile_config.json
 %%TILES%%%%DATADIR%%/gfx/ASCIITileset/tileset.txt
+%%TILES%%%%DATADIR%%/gfx/ASCII_Overmap/ASCIITiles.png
+%%TILES%%%%DATADIR%%/gfx/ASCII_Overmap/fallback.png
+%%TILES%%%%DATADIR%%/gfx/ASCII_Overmap/tile_config.json
+%%TILES%%%%DATADIR%%/gfx/ASCII_Overmap/tileset.txt
 %%TILES%%%%DATADIR%%/gfx/Altica/centered.png
 %%TILES%%%%DATADIR%%/gfx/Altica/character.png
 %%TILES%%%%DATADIR%%/gfx/Altica/fallback.png
@@ -54,27 +57,17 @@
 %%TILES%%%%DATADIR%%/gfx/Altica/huge.png
 %%TILES%%%%DATADIR%%/gfx/Altica/human_body.png
 %%TILES%%%%DATADIR%%/gfx/Altica/human_body_plus.png
-%%TILES%%%%DATADIR%%/gfx/Altica/human_body_wielded.png
 %%TILES%%%%DATADIR%%/gfx/Altica/incomplete.png
 %%TILES%%%%DATADIR%%/gfx/Altica/incomplete_large.png
 %%TILES%%%%DATADIR%%/gfx/Altica/large.png
 %%TILES%%%%DATADIR%%/gfx/Altica/large_ridden.png
 %%TILES%%%%DATADIR%%/gfx/Altica/layering.json
-%%TILES%%%%DATADIR%%/gfx/Altica/monsters_plus.png
 %%TILES%%%%DATADIR%%/gfx/Altica/normal.png
 %%TILES%%%%DATADIR%%/gfx/Altica/small.png
 %%TILES%%%%DATADIR%%/gfx/Altica/tall.png
-%%TILES%%%%DATADIR%%/gfx/Altica/tall_furniture.png
-%%TILES%%%%DATADIR%%/gfx/Altica/tall_magiclysm.png
-%%TILES%%%%DATADIR%%/gfx/Altica/tall_overmap.png
-%%TILES%%%%DATADIR%%/gfx/Altica/tall_terrain.png
-%%TILES%%%%DATADIR%%/gfx/Altica/tall_vehicle.png
-%%TILES%%%%DATADIR%%/gfx/Altica/tall_wielded.png
 %%TILES%%%%DATADIR%%/gfx/Altica/tile_config.json
 %%TILES%%%%DATADIR%%/gfx/Altica/tileset.txt
-%%TILES%%%%DATADIR%%/gfx/Altica/traps_plus.png
 %%TILES%%%%DATADIR%%/gfx/Altica/ultica-tall.png
-%%TILES%%%%DATADIR%%/gfx/Altica/vehicle_plus.png
 %%TILES%%%%DATADIR%%/gfx/BrownLikeBears/big.png
 %%TILES%%%%DATADIR%%/gfx/BrownLikeBears/fallback.png
 %%TILES%%%%DATADIR%%/gfx/BrownLikeBears/mods.png
@@ -90,11 +83,11 @@
 %%TILES%%%%DATADIR%%/gfx/ChibiUltica/ChibiNormal.png
 %%TILES%%%%DATADIR%%/gfx/ChibiUltica/ChibiSmall.png
 %%TILES%%%%DATADIR%%/gfx/ChibiUltica/ChibiTall.png
-%%TILES%%%%DATADIR%%/gfx/ChibiUltica/ChibiTaller.png
 %%TILES%%%%DATADIR%%/gfx/ChibiUltica/ChibiWide.png
 %%TILES%%%%DATADIR%%/gfx/ChibiUltica/centered.png
 %%TILES%%%%DATADIR%%/gfx/ChibiUltica/dcss.png
 %%TILES%%%%DATADIR%%/gfx/ChibiUltica/fallback.png
+%%TILES%%%%DATADIR%%/gfx/ChibiUltica/filler.png
 %%TILES%%%%DATADIR%%/gfx/ChibiUltica/fillergiant.png
 %%TILES%%%%DATADIR%%/gfx/ChibiUltica/fillerhoder.png
 %%TILES%%%%DATADIR%%/gfx/ChibiUltica/giant.png
@@ -128,6 +121,15 @@
 %%TILES%%%%DATADIR%%/gfx/Cuteclysm/tileset.txt
 %%TILES%%%%DATADIR%%/gfx/Cuteclysm/ui.png
 %%TILES%%%%DATADIR%%/gfx/Cuteclysm/ultratallbackdrop.png
+%%TILES%%%%DATADIR%%/gfx/GiantDays/cursor.png
+%%TILES%%%%DATADIR%%/gfx/GiantDays/fallback.png
+%%TILES%%%%DATADIR%%/gfx/GiantDays/items.png
+%%TILES%%%%DATADIR%%/gfx/GiantDays/large.png
+%%TILES%%%%DATADIR%%/gfx/GiantDays/layering.json
+%%TILES%%%%DATADIR%%/gfx/GiantDays/mobs.png
+%%TILES%%%%DATADIR%%/gfx/GiantDays/tile_config.json
+%%TILES%%%%DATADIR%%/gfx/GiantDays/tiles.png
+%%TILES%%%%DATADIR%%/gfx/GiantDays/tileset.txt
 %%TILES%%%%DATADIR%%/gfx/HollowMoon/fallback.png
 %%TILES%%%%DATADIR%%/gfx/HollowMoon/giant.png
 %%TILES%%%%DATADIR%%/gfx/HollowMoon/huge.png
@@ -141,7 +143,6 @@
 %%TILES%%%%DATADIR%%/gfx/Larwick_Overmap/overmap_tall.png
 %%TILES%%%%DATADIR%%/gfx/Larwick_Overmap/tile_config.json
 %%TILES%%%%DATADIR%%/gfx/Larwick_Overmap/tileset.txt
-%%TILES%%%%DATADIR%%/gfx/MshockXotto+/Credit.txt
 %%TILES%%%%DATADIR%%/gfx/MshockXotto+/big.png
 %%TILES%%%%DATADIR%%/gfx/MshockXotto+/dcss.png
 %%TILES%%%%DATADIR%%/gfx/MshockXotto+/dcssTall.png
@@ -164,11 +165,22 @@
 %%TILES%%%%DATADIR%%/gfx/MshockXotto+/widecenter.png
 %%TILES%%%%DATADIR%%/gfx/NeoDaysTileset/fallback.png
 %%TILES%%%%DATADIR%%/gfx/NeoDaysTileset/large.png
+%%TILES%%%%DATADIR%%/gfx/NeoDaysTileset/layering.json
 %%TILES%%%%DATADIR%%/gfx/NeoDaysTileset/tile_config.json
 %%TILES%%%%DATADIR%%/gfx/NeoDaysTileset/tiles.png
 %%TILES%%%%DATADIR%%/gfx/NeoDaysTileset/tileset.txt
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/backgrounds.png
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/cursor.png
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/fallback.png
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/icons-h.png
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/icons-v.png
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/icons.png
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/overmap.png
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/tile_config.json
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/tileset.txt
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/weather.png
+%%TILES%%%%DATADIR%%/gfx/PenAndPaper/weather_unknown.png
 %%TILES%%%%DATADIR%%/gfx/RetroDaysTileset/fallback.png
-%%TILES%%%%DATADIR%%/gfx/RetroDaysTileset/overlay_ordering.json
 %%TILES%%%%DATADIR%%/gfx/RetroDaysTileset/tile_config.json
 %%TILES%%%%DATADIR%%/gfx/RetroDaysTileset/tiles.png
 %%TILES%%%%DATADIR%%/gfx/RetroDaysTileset/tiles_20x20.png
@@ -185,8 +197,7 @@
 %%TILES%%%%DATADIR%%/gfx/SurveyorsMap/tileset.txt
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/cursors.png
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/fallback.png
-%%TILES%%%%DATADIR%%/gfx/Ultica_iso/fillergiant.png
-%%TILES%%%%DATADIR%%/gfx/Ultica_iso/giant.png
+%%TILES%%%%DATADIR%%/gfx/Ultica_iso/guns.png
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/human_body_2x.png
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/human_body_plus_2x.png
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/incomplete.png
@@ -203,8 +214,8 @@
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/iso_high_wide.png
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/iso_large.png
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/iso_tall.png
+%%TILES%%%%DATADIR%%/gfx/Ultica_iso/iso_tall_plus.png
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/iso_tall_r.png
-%%TILES%%%%DATADIR%%/gfx/Ultica_iso/large.png
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/layering.json
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/normal.png
 %%TILES%%%%DATADIR%%/gfx/Ultica_iso/normal_2x.png
@@ -245,7 +256,6 @@
 %%DATADIR%%/json/LOADING_ORDER.md
 %%DATADIR%%/json/achievements.json
 %%DATADIR%%/json/addictions.json
-%%DATADIR%%/json/addictions_eocs.json
 %%DATADIR%%/json/ammo_effects.json
 %%DATADIR%%/json/anatomy.json
 %%DATADIR%%/json/artifact/altered_object_active.json
@@ -254,8 +264,65 @@
 %%DATADIR%%/json/artifact/legacy_artifact_passive.json
 %%DATADIR%%/json/artifact/premade_artifacts.json
 %%DATADIR%%/json/artifact/relic_procgen_data.json
+%%DATADIR%%/json/ascii_art/ammo/10mm.json
+%%DATADIR%%/json/ascii_art/ammo/12mm.json
+%%DATADIR%%/json/ascii_art/ammo/20x66mm.json
+%%DATADIR%%/json/ascii_art/ammo/22.json
+%%DATADIR%%/json/ascii_art/ammo/223.json
+%%DATADIR%%/json/ascii_art/ammo/270win.json
+%%DATADIR%%/json/ascii_art/ammo/300.json
+%%DATADIR%%/json/ascii_art/ammo/3006.json
+%%DATADIR%%/json/ascii_art/ammo/300blk.json
+%%DATADIR%%/json/ascii_art/ammo/308.json
+%%DATADIR%%/json/ascii_art/ammo/30carbine.json
+%%DATADIR%%/json/ascii_art/ammo/32.json
+%%DATADIR%%/json/ascii_art/ammo/357mag.json
+%%DATADIR%%/json/ascii_art/ammo/357sig.json
+%%DATADIR%%/json/ascii_art/ammo/36paper.json
+%%DATADIR%%/json/ascii_art/ammo/38.json
+%%DATADIR%%/json/ascii_art/ammo/380.json
+%%DATADIR%%/json/ascii_art/ammo/38super.json
+%%DATADIR%%/json/ascii_art/ammo/40.json
+%%DATADIR%%/json/ascii_art/ammo/40x46mm.json
+%%DATADIR%%/json/ascii_art/ammo/40x53mm.json
+%%DATADIR%%/json/ascii_art/ammo/410shot.json
+%%DATADIR%%/json/ascii_art/ammo/44.json
+%%DATADIR%%/json/ascii_art/ammo/44paper.json
+%%DATADIR%%/json/ascii_art/ammo/45.json
+%%DATADIR%%/json/ascii_art/ammo/454.json
+%%DATADIR%%/json/ascii_art/ammo/4570.json
+%%DATADIR%%/json/ascii_art/ammo/458wm.json
+%%DATADIR%%/json/ascii_art/ammo/45colt.json
+%%DATADIR%%/json/ascii_art/ammo/46.json
+%%DATADIR%%/json/ascii_art/ammo/460.json
+%%DATADIR%%/json/ascii_art/ammo/50.json
+%%DATADIR%%/json/ascii_art/ammo/500.json
+%%DATADIR%%/json/ascii_art/ammo/545x39.json
+%%DATADIR%%/json/ascii_art/ammo/57.json
+%%DATADIR%%/json/ascii_art/ammo/66mm.json
+%%DATADIR%%/json/ascii_art/ammo/762.json
+%%DATADIR%%/json/ascii_art/ammo/762R.json
+%%DATADIR%%/json/ascii_art/ammo/762x25.json
+%%DATADIR%%/json/ascii_art/ammo/84x246.json
+%%DATADIR%%/json/ascii_art/ammo/8x40mm.json
+%%DATADIR%%/json/ascii_art/ammo/9mm.json
+%%DATADIR%%/json/ascii_art/ammo/9x18.json
+%%DATADIR%%/json/ascii_art/ammo/atgm.json
+%%DATADIR%%/json/ascii_art/ammo/blank.json
+%%DATADIR%%/json/ascii_art/ammo/cannon.json
+%%DATADIR%%/json/ascii_art/ammo/flintlock.json
+%%DATADIR%%/json/ascii_art/ammo/nail.json
+%%DATADIR%%/json/ascii_art/ammo/paintball.json
+%%DATADIR%%/json/ascii_art/ammo/shot.json
+%%DATADIR%%/json/ascii_art/ammo/shotpaper.json
+%%DATADIR%%/json/ascii_art/ammo/signal_flare.json
+%%DATADIR%%/json/ascii_art/ammo/sling-ready_grenade.json
+%%DATADIR%%/json/ascii_art/ammo/weldgas.json
+%%DATADIR%%/json/ascii_art/battery.json
 %%DATADIR%%/json/ascii_art/generic_ascii.json
 %%DATADIR%%/json/ascii_art/gun_ascii.json
+%%DATADIR%%/json/ascii_art/vehicle/battery.json
+%%DATADIR%%/json/bionic_spells.json
 %%DATADIR%%/json/bionics.json
 %%DATADIR%%/json/body_parts.json
 %%DATADIR%%/json/bodypart_graphs/arms.json
@@ -269,23 +336,55 @@
 %%DATADIR%%/json/bodypart_graphs/torso.json
 %%DATADIR%%/json/butchery_requirements.json
 %%DATADIR%%/json/character_modifiers.json
+%%DATADIR%%/json/climbing.json
 %%DATADIR%%/json/clothing_mods.json
 %%DATADIR%%/json/conducts.json
 %%DATADIR%%/json/connect_groups.json
 %%DATADIR%%/json/construction.json
 %%DATADIR%%/json/construction_category.json
 %%DATADIR%%/json/construction_group.json
+%%DATADIR%%/json/damage_types.json
 %%DATADIR%%/json/deconstruction.json
 %%DATADIR%%/json/default_blacklist.json
 %%DATADIR%%/json/disease.json
 %%DATADIR%%/json/dreams.json
-%%DATADIR%%/json/effect_on_condition.json
 %%DATADIR%%/json/effects.json
+%%DATADIR%%/json/effects_on_condition/addictions_eocs.json
+%%DATADIR%%/json/effects_on_condition/bionic_eocs.json
+%%DATADIR%%/json/effects_on_condition/computer_eocs.json
+%%DATADIR%%/json/effects_on_condition/dream_eocs.json
+%%DATADIR%%/json/effects_on_condition/effects_eocs.json
+%%DATADIR%%/json/effects_on_condition/example_eocs.json
+%%DATADIR%%/json/effects_on_condition/generalized_eocs.json
+%%DATADIR%%/json/effects_on_condition/item_eocs.json
+%%DATADIR%%/json/effects_on_condition/mapgen_eocs/furniture_eocs.json
+%%DATADIR%%/json/effects_on_condition/mapgen_eocs/godco_mapgen_eocs.json
+%%DATADIR%%/json/effects_on_condition/mapgen_eocs/lab_mapgen_eocs.json
+%%DATADIR%%/json/effects_on_condition/mapgen_eocs/vanilla_map_weight_eocs.json
+%%DATADIR%%/json/effects_on_condition/melee_eocs.json
+%%DATADIR%%/json/effects_on_condition/misc_effect_on_condition.json
+%%DATADIR%%/json/effects_on_condition/mutation_eocs/changing_eocs.json
+%%DATADIR%%/json/effects_on_condition/mutation_eocs/mutation_activation_eocs.json
+%%DATADIR%%/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json
+%%DATADIR%%/json/effects_on_condition/nether_eocs/nether_glass_effect_on_condition.json
+%%DATADIR%%/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json
+%%DATADIR%%/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json
+%%DATADIR%%/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json
+%%DATADIR%%/json/effects_on_condition/npc_eocs/generic_npc_eocs.json
+%%DATADIR%%/json/effects_on_condition/npc_eocs/godco_npc_eocs.json
+%%DATADIR%%/json/effects_on_condition/npc_eocs/hallucination_eocs.json
+%%DATADIR%%/json/effects_on_condition/scenario_specific_eocs.json
+%%DATADIR%%/json/effects_on_condition/weather_eocs.json
 %%DATADIR%%/json/emit.json
 %%DATADIR%%/json/enchantments.json
-%%DATADIR%%/json/encounters/randec_valhallist_cult.json
 %%DATADIR%%/json/encounters/randenc_caravans.json
 %%DATADIR%%/json/encounters/randenc_refugee_center.json
+%%DATADIR%%/json/faults/faults_bionics.json
+%%DATADIR%%/json/faults/faults_guns.json
+%%DATADIR%%/json/faults/faults_vehicles.json
+%%DATADIR%%/json/faults/fixes_bionic.json
+%%DATADIR%%/json/faults/fixes_gun.json
+%%DATADIR%%/json/faults/fixes_vehicles.json
 %%DATADIR%%/json/field_type.json
 %%DATADIR%%/json/flags.json
 %%DATADIR%%/json/flags/trap.json
@@ -319,6 +418,9 @@
 %%DATADIR%%/json/furniture_and_terrain/furniture-terrains.json
 %%DATADIR%%/json/furniture_and_terrain/furniture-tools.json
 %%DATADIR%%/json/furniture_and_terrain/furniture-triffid.json
+%%DATADIR%%/json/furniture_and_terrain/furniture_nether_monster.json
+%%DATADIR%%/json/furniture_and_terrain/furniture_vitrified.json
+%%DATADIR%%/json/furniture_and_terrain/special_use/bullet_trailer.json
 %%DATADIR%%/json/furniture_and_terrain/terrain-bridges-docks.json
 %%DATADIR%%/json/furniture_and_terrain/terrain-doors.json
 %%DATADIR%%/json/furniture_and_terrain/terrain-embrasures.json
@@ -343,6 +445,8 @@
 %%DATADIR%%/json/furniture_and_terrain/terrain-walls.json
 %%DATADIR%%/json/furniture_and_terrain/terrain-windows.json
 %%DATADIR%%/json/furniture_and_terrain/terrain-zlevel-transitions.json
+%%DATADIR%%/json/furniture_and_terrain/terrain_nether_monster.json
+%%DATADIR%%/json/furniture_and_terrain/terrain_vitrified.json
 %%DATADIR%%/json/gates.json
 %%DATADIR%%/json/harvest.json
 %%DATADIR%%/json/harvest_dissect.json
@@ -369,6 +473,8 @@
 %%DATADIR%%/json/itemgroups/Labs/labs_common.json
 %%DATADIR%%/json/itemgroups/Labs/labs_mutagen.json
 %%DATADIR%%/json/itemgroups/Locations_MapExtras/Arsonist_stock.json
+%%DATADIR%%/json/itemgroups/Locations_MapExtras/airdrop.json
+%%DATADIR%%/json/itemgroups/Locations_MapExtras/airdrop_mil.json
 %%DATADIR%%/json/itemgroups/Locations_MapExtras/locations.json
 %%DATADIR%%/json/itemgroups/Locations_MapExtras/locations_commercial.json
 %%DATADIR%%/json/itemgroups/Locations_MapExtras/locations_mapextras.json
@@ -401,6 +507,7 @@
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_mg.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_sniper.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/338lapua_sniper.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/40x46.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/40x53.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/50_mg.json
@@ -409,12 +516,27 @@
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/84x246.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/9mm.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/9mm_submachine_gun.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_223.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_300aac.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_300wm.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_308.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_338.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_40x46.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_40x53.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_50.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_84x246.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_9mm.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_shot.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/armor.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/atgm.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/explosive.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/mics.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/shot.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json
+%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/field_drops.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
 %%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -443,7 +565,6 @@
 %%DATADIR%%/json/itemgroups/military.json
 %%DATADIR%%/json/itemgroups/misc.json
 %%DATADIR%%/json/itemgroups/oa_shared_item_groups.json
-%%DATADIR%%/json/itemgroups/obsolete.json
 %%DATADIR%%/json/itemgroups/portal_storm_loot.json
 %%DATADIR%%/json/itemgroups/portalmancy.json
 %%DATADIR%%/json/itemgroups/roof.json
@@ -465,9 +586,11 @@
 %%DATADIR%%/json/items/ammo/300.json
 %%DATADIR%%/json/items/ammo/3006.json
 %%DATADIR%%/json/items/ammo/300blk.json
+%%DATADIR%%/json/items/ammo/303.json
 %%DATADIR%%/json/items/ammo/308.json
 %%DATADIR%%/json/items/ammo/30carbine.json
 %%DATADIR%%/json/items/ammo/32.json
+%%DATADIR%%/json/items/ammo/338lapua.json
 %%DATADIR%%/json/items/ammo/357mag.json
 %%DATADIR%%/json/items/ammo/357sig.json
 %%DATADIR%%/json/items/ammo/36paper.json
@@ -481,21 +604,24 @@
 %%DATADIR%%/json/items/ammo/44.json
 %%DATADIR%%/json/items/ammo/44paper.json
 %%DATADIR%%/json/items/ammo/45.json
+%%DATADIR%%/json/items/ammo/450bushmaster.json
 %%DATADIR%%/json/items/ammo/454.json
 %%DATADIR%%/json/items/ammo/4570.json
+%%DATADIR%%/json/items/ammo/458wm.json
 %%DATADIR%%/json/items/ammo/45colt.json
 %%DATADIR%%/json/items/ammo/46.json
 %%DATADIR%%/json/items/ammo/460.json
 %%DATADIR%%/json/items/ammo/50.json
 %%DATADIR%%/json/items/ammo/500.json
+%%DATADIR%%/json/items/ammo/50_beowulf.json
+%%DATADIR%%/json/items/ammo/50ae.json
 %%DATADIR%%/json/items/ammo/545x39.json
 %%DATADIR%%/json/items/ammo/57.json
-%%DATADIR%%/json/items/ammo/5x50.json
 %%DATADIR%%/json/items/ammo/66mm.json
-%%DATADIR%%/json/items/ammo/700nx.json
 %%DATADIR%%/json/items/ammo/762.json
 %%DATADIR%%/json/items/ammo/762R.json
 %%DATADIR%%/json/items/ammo/762x25.json
+%%DATADIR%%/json/items/ammo/77mm_jap.json
 %%DATADIR%%/json/items/ammo/84x246mm.json
 %%DATADIR%%/json/items/ammo/8x40mm.json
 %%DATADIR%%/json/items/ammo/9mm.json
@@ -509,7 +635,6 @@
 %%DATADIR%%/json/items/ammo/flintlock.json
 %%DATADIR%%/json/items/ammo/nail.json
 %%DATADIR%%/json/items/ammo/paintball.json
-%%DATADIR%%/json/items/ammo/rpg.json
 %%DATADIR%%/json/items/ammo/shot.json
 %%DATADIR%%/json/items/ammo/shotpaper.json
 %%DATADIR%%/json/items/ammo/signal_flare.json
@@ -534,10 +659,12 @@
 %%DATADIR%%/json/items/armor/bespoke_armor/cuttingroom.json
 %%DATADIR%%/json/items/armor/bespoke_armor/utility.json
 %%DATADIR%%/json/items/armor/boots.json
+%%DATADIR%%/json/items/armor/brigandine.json
 %%DATADIR%%/json/items/armor/cloaks.json
 %%DATADIR%%/json/items/armor/coats.json
 %%DATADIR%%/json/items/armor/exotic.json
 %%DATADIR%%/json/items/armor/eyewear.json
+%%DATADIR%%/json/items/armor/gambesons.json
 %%DATADIR%%/json/items/armor/gloves.json
 %%DATADIR%%/json/items/armor/hats.json
 %%DATADIR%%/json/items/armor/head_attachments.json
@@ -627,8 +754,8 @@
 %%DATADIR%%/json/items/comestibles/egg.json
 %%DATADIR%%/json/items/comestibles/frozen.json
 %%DATADIR%%/json/items/comestibles/fruit_dishes.json
-%%DATADIR%%/json/items/comestibles/irradiated_fruit.json
-%%DATADIR%%/json/items/comestibles/irradiated_veggy.json
+%%DATADIR%%/json/items/comestibles/irradiated_fruit_migration.json
+%%DATADIR%%/json/items/comestibles/irradiated_veggy_migration.json
 %%DATADIR%%/json/items/comestibles/junkfood.json
 %%DATADIR%%/json/items/comestibles/meat_dishes.json
 %%DATADIR%%/json/items/comestibles/med.json
@@ -640,6 +767,7 @@
 %%DATADIR%%/json/items/comestibles/other.json
 %%DATADIR%%/json/items/comestibles/protein.json
 %%DATADIR%%/json/items/comestibles/raw_fruit.json
+%%DATADIR%%/json/items/comestibles/raw_grain.json
 %%DATADIR%%/json/items/comestibles/raw_veggy.json
 %%DATADIR%%/json/items/comestibles/sandwich.json
 %%DATADIR%%/json/items/comestibles/seed.json
@@ -647,7 +775,9 @@
 %%DATADIR%%/json/items/comestibles/spice.json
 %%DATADIR%%/json/items/comestibles/veggy_dishes.json
 %%DATADIR%%/json/items/comestibles/wheat.json
-%%DATADIR%%/json/items/containers.json
+%%DATADIR%%/json/items/containers/containers.json
+%%DATADIR%%/json/items/containers/conversions.json
+%%DATADIR%%/json/items/containers/generic.json
 %%DATADIR%%/json/items/containers/military.json
 %%DATADIR%%/json/items/corpses/corpses.json
 %%DATADIR%%/json/items/corpses/dead_exodii.json
@@ -655,10 +785,11 @@
 %%DATADIR%%/json/items/corpses/inactive_bots.json
 %%DATADIR%%/json/items/electronics.json
 %%DATADIR%%/json/items/fake.json
-%%DATADIR%%/json/items/faults_bionic.json
 %%DATADIR%%/json/items/fluff.json
 %%DATADIR%%/json/items/fuel.json
-%%DATADIR%%/json/items/furniture.json
+%%DATADIR%%/json/items/furniture/decorative.json
+%%DATADIR%%/json/items/furniture/seating.json
+%%DATADIR%%/json/items/furniture/storage.json
 %%DATADIR%%/json/items/generic.json
 %%DATADIR%%/json/items/generic/ammolink.json
 %%DATADIR%%/json/items/generic/bathroom_house.json
@@ -682,9 +813,11 @@
 %%DATADIR%%/json/items/gun/300.json
 %%DATADIR%%/json/items/gun/3006.json
 %%DATADIR%%/json/items/gun/300BLK.json
+%%DATADIR%%/json/items/gun/303.json
 %%DATADIR%%/json/items/gun/308.json
 %%DATADIR%%/json/items/gun/30carbine.json
 %%DATADIR%%/json/items/gun/32.json
+%%DATADIR%%/json/items/gun/338lapua.json
 %%DATADIR%%/json/items/gun/357sig.json
 %%DATADIR%%/json/items/gun/36paper.json
 %%DATADIR%%/json/items/gun/38.json
@@ -697,8 +830,10 @@
 %%DATADIR%%/json/items/gun/44.json
 %%DATADIR%%/json/items/gun/44paper.json
 %%DATADIR%%/json/items/gun/45.json
+%%DATADIR%%/json/items/gun/450bushmaster.json
 %%DATADIR%%/json/items/gun/454.json
 %%DATADIR%%/json/items/gun/4570.json
+%%DATADIR%%/json/items/gun/458wm.json
 %%DATADIR%%/json/items/gun/45colt.json
 %%DATADIR%%/json/items/gun/46.json
 %%DATADIR%%/json/items/gun/460.json
@@ -706,12 +841,11 @@
 %%DATADIR%%/json/items/gun/500.json
 %%DATADIR%%/json/items/gun/545x39.json
 %%DATADIR%%/json/items/gun/57.json
-%%DATADIR%%/json/items/gun/5x50.json
 %%DATADIR%%/json/items/gun/66mm.json
-%%DATADIR%%/json/items/gun/700nx.json
 %%DATADIR%%/json/items/gun/762.json
 %%DATADIR%%/json/items/gun/762R.json
 %%DATADIR%%/json/items/gun/762x25.json
+%%DATADIR%%/json/items/gun/77mm_jap.json
 %%DATADIR%%/json/items/gun/84x246mm.json
 %%DATADIR%%/json/items/gun/8x40mm.json
 %%DATADIR%%/json/items/gun/9mm.json
@@ -723,8 +857,8 @@
 %%DATADIR%%/json/items/gun/cannon.json
 %%DATADIR%%/json/items/gun/chemical_spray.json
 %%DATADIR%%/json/items/gun/combination.json
+%%DATADIR%%/json/items/gun/converted.json
 %%DATADIR%%/json/items/gun/exodii.json
-%%DATADIR%%/json/items/gun/faults_gun.json
 %%DATADIR%%/json/items/gun/flammable.json
 %%DATADIR%%/json/items/gun/flintlock.json
 %%DATADIR%%/json/items/gun/nail.json
@@ -735,7 +869,6 @@
 %%DATADIR%%/json/items/gun/ups.json
 %%DATADIR%%/json/items/gunmod/accessories.json
 %%DATADIR%%/json/items/gunmod/barrel.json
-%%DATADIR%%/json/items/gunmod/bionicmods.json
 %%DATADIR%%/json/items/gunmod/brass_catcher.json
 %%DATADIR%%/json/items/gunmod/conversions.json
 %%DATADIR%%/json/items/gunmod/grip.json
@@ -759,9 +892,12 @@
 %%DATADIR%%/json/items/magazine/223.json
 %%DATADIR%%/json/items/magazine/300.json
 %%DATADIR%%/json/items/magazine/3006.json
+%%DATADIR%%/json/items/magazine/303.json
 %%DATADIR%%/json/items/magazine/308.json
 %%DATADIR%%/json/items/magazine/30carbine.json
 %%DATADIR%%/json/items/magazine/32.json
+%%DATADIR%%/json/items/magazine/338lapua.json
+%%DATADIR%%/json/items/magazine/357mag.json
 %%DATADIR%%/json/items/magazine/357sig.json
 %%DATADIR%%/json/items/magazine/38.json
 %%DATADIR%%/json/items/magazine/380.json
@@ -771,23 +907,27 @@
 %%DATADIR%%/json/items/magazine/410shot.json
 %%DATADIR%%/json/items/magazine/44.json
 %%DATADIR%%/json/items/magazine/45.json
+%%DATADIR%%/json/items/magazine/450bushmaster.json
 %%DATADIR%%/json/items/magazine/454.json
 %%DATADIR%%/json/items/magazine/46.json
 %%DATADIR%%/json/items/magazine/460.json
 %%DATADIR%%/json/items/magazine/50.json
 %%DATADIR%%/json/items/magazine/500.json
+%%DATADIR%%/json/items/magazine/50ae.json
+%%DATADIR%%/json/items/magazine/50beowulf.json
 %%DATADIR%%/json/items/magazine/545x39.json
 %%DATADIR%%/json/items/magazine/57.json
-%%DATADIR%%/json/items/magazine/5x50.json
 %%DATADIR%%/json/items/magazine/66mm.json
 %%DATADIR%%/json/items/magazine/762.json
 %%DATADIR%%/json/items/magazine/762R.json
 %%DATADIR%%/json/items/magazine/762x25.json
+%%DATADIR%%/json/items/magazine/77mm_jap.json
 %%DATADIR%%/json/items/magazine/8x40mm.json
 %%DATADIR%%/json/items/magazine/9mm.json
 %%DATADIR%%/json/items/magazine/9x18.json
 %%DATADIR%%/json/items/magazine/chemical_spray.json
 %%DATADIR%%/json/items/magazine/exodii.json
+%%DATADIR%%/json/items/magazine/filter.json
 %%DATADIR%%/json/items/magazine/liquid.json
 %%DATADIR%%/json/items/magazine/methanol_fuelcell.json
 %%DATADIR%%/json/items/magazine/nail.json
@@ -800,11 +940,9 @@
 %%DATADIR%%/json/items/melee/spears_and_polearms.json
 %%DATADIR%%/json/items/melee/swords_and_blades.json
 %%DATADIR%%/json/items/melee/unarmed_weapons.json
-%%DATADIR%%/json/items/migration.json
 %%DATADIR%%/json/items/mutagen_ingredients.json
 %%DATADIR%%/json/items/nether.json
 %%DATADIR%%/json/items/newspaper.json
-%%DATADIR%%/json/items/obsolete.json
 %%DATADIR%%/json/items/ranged/archery.json
 %%DATADIR%%/json/items/ranged/crossbows.json
 %%DATADIR%%/json/items/ranged/energy.json
@@ -829,6 +967,7 @@
 %%DATADIR%%/json/items/resources/wood.json
 %%DATADIR%%/json/items/robot_parts.json
 %%DATADIR%%/json/items/software.json
+%%DATADIR%%/json/items/tool/cables.json
 %%DATADIR%%/json/items/tool/container.json
 %%DATADIR%%/json/items/tool/cooking.json
 %%DATADIR%%/json/items/tool/debug_tools.json
@@ -856,7 +995,7 @@
 %%DATADIR%%/json/items/tool/science.json
 %%DATADIR%%/json/items/tool/shelters.json
 %%DATADIR%%/json/items/tool/smoking.json
-%%DATADIR%%/json/items/tool/stationary.json
+%%DATADIR%%/json/items/tool/stationery.json
 %%DATADIR%%/json/items/tool/stoneworking.json
 %%DATADIR%%/json/items/tool/tailoring.json
 %%DATADIR%%/json/items/tool/toiletries.json
@@ -866,12 +1005,12 @@
 %%DATADIR%%/json/items/tool/workshop.json
 %%DATADIR%%/json/items/tool_armor.json
 %%DATADIR%%/json/items/toolmod.json
+%%DATADIR%%/json/items/toy.json
 %%DATADIR%%/json/items/vehicle/alternator.json
 %%DATADIR%%/json/items/vehicle/animals.json
 %%DATADIR%%/json/items/vehicle/armor.json
 %%DATADIR%%/json/items/vehicle/battery.json
 %%DATADIR%%/json/items/vehicle/boat.json
-%%DATADIR%%/json/items/vehicle/cables.json
 %%DATADIR%%/json/items/vehicle/cargo.json
 %%DATADIR%%/json/items/vehicle/controls.json
 %%DATADIR%%/json/items/vehicle/engine.json
@@ -919,26 +1058,22 @@
 %%DATADIR%%/json/mapgen/animalpound.json
 %%DATADIR%%/json/mapgen/animalshelter.json
 %%DATADIR%%/json/mapgen/antique_store.json
+%%DATADIR%%/json/mapgen/apartment_complex/apartment_complex_apt.json
+%%DATADIR%%/json/mapgen/apartment_complex/apartment_complex_nested.json
+%%DATADIR%%/json/mapgen/apartment_complex/apartment_complex_other.json
+%%DATADIR%%/json/mapgen/apartment_complex/apartment_complex_roof.json
 %%DATADIR%%/json/mapgen/apartment_con_new.json
 %%DATADIR%%/json/mapgen/apartment_mod_new.json
 %%DATADIR%%/json/mapgen/arcade.json
 %%DATADIR%%/json/mapgen/art_gallery.json
 %%DATADIR%%/json/mapgen/bakery.json
-%%DATADIR%%/json/mapgen/bandit_cabin.json
-%%DATADIR%%/json/mapgen/bandit_camp.json
-%%DATADIR%%/json/mapgen/bandit_garage.json
 %%DATADIR%%/json/mapgen/bank.json
 %%DATADIR%%/json/mapgen/bar.json
+%%DATADIR%%/json/mapgen/barber_shop.json
 %%DATADIR%%/json/mapgen/basecamps/base/bare_bones_basecamp/bare_bones_basecamp.json
 %%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_beds.json
 %%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_common.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_log.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_metal.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_migo_resin.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rock.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wad.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wood.json
+%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_construction.json
 %%DATADIR%%/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_common.json
 %%DATADIR%%/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_garage.json
 %%DATADIR%%/json/mapgen/basecamps/base/fbmc_lighthouse/fbmc_lighthouse.json
@@ -960,104 +1095,44 @@
 %%DATADIR%%/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_common.json
 %%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_beds.json
 %%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_common.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_log.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_metal.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rock.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wad.json
-%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wood.json
+%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_construction.json
 %%DATADIR%%/json/mapgen/basecamps/base/fbmc_sealab_small/fbmc_sealab_small_common.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation1.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation_walls_all.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_common.json
+%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_construction.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_defenses.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_log.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_metal.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_migo_resin.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rock.json
+%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_palettes.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_tent.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wad.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wood.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/primitive_field.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_common.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_concrete.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_log.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_metal.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_migo_resin.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_rock.json.json
+%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_construction.json
+%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_palettes.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_tent.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_wad.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_wood.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_common.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_log.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_rock.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_standard.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wad.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wood.json
+%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_construction.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_common.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_log.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_rock.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_standard.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wad.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wood.json
+%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_construction.json
 %%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_common.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_log.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_rock.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_standard.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wad.json
-%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wood.json
+%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_construction.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_log.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_metal.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_migo_resin.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rock.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wad.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wood.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_construction.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_palettes.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_common.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_concrete.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_log.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_metal.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_migo_resin.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_construction.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_palettes.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_rock.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_wad.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_wood.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_farm/version_1/primitive_farm.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_farm/version_2/modular_farm_common.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_1/primitive_garage.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_common.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_concrete.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_log.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_metal.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_migo_resin.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_construction.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_palettes.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_rock.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_wad.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_wood.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_common.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_log.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_metal.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_migo_resin.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rock.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wad.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wood.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_construction.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_palettes.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_common.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_concrete.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_log.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_metal.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_migo_resin.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_construction.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_palettes.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_rock.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_wad.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_wood.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_common.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_log.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_metal.json
@@ -1067,49 +1142,20 @@
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_wad.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_wood.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_common.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_log.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_metal.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_migo_resin.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rock.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wad.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wood.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_bookcase.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_construction.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_palettes.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_common.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_concrete.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_dresser.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_locker.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_log.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_metal.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_migo_resin.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_construction.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_palettes.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rack.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rock.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wad.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_warehouse_shelf.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wood.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wooden_rack.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_storage.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_common.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_log.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_metal.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_migo_resin.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rock.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wad.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wood.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_construction.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_palettes.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_common.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_concrete.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_log.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_metal.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_migo_resin.json
+%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_construction.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_palettes.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_rammed_earth.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_rock.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_wad.json
-%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_wood.json
 %%DATADIR%%/json/mapgen/basecamps/expansion/salt_water_pipe.json
-%%DATADIR%%/json/mapgen/basecamps/modular_shacks.json
+%%DATADIR%%/json/mapgen/basecamps/fbmc_modular_shack.json
 %%DATADIR%%/json/mapgen/basement/basement_bionic.json
 %%DATADIR%%/json/mapgen/basement/basement_chem.json
 %%DATADIR%%/json/mapgen/basement/basement_game.json
@@ -1120,11 +1166,14 @@
 %%DATADIR%%/json/mapgen/basement/basement_survival.json
 %%DATADIR%%/json/mapgen/basement/basement_weed.json
 %%DATADIR%%/json/mapgen/basement/basements.json
+%%DATADIR%%/json/mapgen/basic/field.json
+%%DATADIR%%/json/mapgen/basic/lake.json
 %%DATADIR%%/json/mapgen/bike_shop.json
 %%DATADIR%%/json/mapgen/bowling_alley.json
 %%DATADIR%%/json/mapgen/boxing.json
 %%DATADIR%%/json/mapgen/bridges.json
 %%DATADIR%%/json/mapgen/bugs/ants.json
+%%DATADIR%%/json/mapgen/bugs/beehive.json
 %%DATADIR%%/json/mapgen/bugs/nest_dermatik.json
 %%DATADIR%%/json/mapgen/bugs/spider_pit.json
 %%DATADIR%%/json/mapgen/bugs/wasp_tower.json
@@ -1171,6 +1220,8 @@
 %%DATADIR%%/json/mapgen/city_blocks/urban_25_dense_diner_apt.json
 %%DATADIR%%/json/mapgen/collapsed_tower.json
 %%DATADIR%%/json/mapgen/construction_site.json
+%%DATADIR%%/json/mapgen/convention_center/convention_center.json
+%%DATADIR%%/json/mapgen/convention_center/convention_center_nested.json
 %%DATADIR%%/json/mapgen/crater.json
 %%DATADIR%%/json/mapgen/cs_car_dealership.json
 %%DATADIR%%/json/mapgen/cs_car_showroom.json
@@ -1187,6 +1238,9 @@
 %%DATADIR%%/json/mapgen/daycare.json
 %%DATADIR%%/json/mapgen/debug_ramps.json
 %%DATADIR%%/json/mapgen/derelict_property.json
+%%DATADIR%%/json/mapgen/deserter_city/deserter_city_gate.json
+%%DATADIR%%/json/mapgen/deserter_city/deserter_city_office.json
+%%DATADIR%%/json/mapgen/deserter_city/deserter_city_park.json
 %%DATADIR%%/json/mapgen/diner.json
 %%DATADIR%%/json/mapgen/dispensary.json
 %%DATADIR%%/json/mapgen/dive_shop.json
@@ -1194,11 +1248,13 @@
 %%DATADIR%%/json/mapgen/dojo.json
 %%DATADIR%%/json/mapgen/dollar_store.json
 %%DATADIR%%/json/mapgen/drive-in_theater.json
+%%DATADIR%%/json/mapgen/drug_lab.json
 %%DATADIR%%/json/mapgen/dummy/dummy.json
 %%DATADIR%%/json/mapgen/dump.json
 %%DATADIR%%/json/mapgen/dumpsite.json
 %%DATADIR%%/json/mapgen/earth.json
 %%DATADIR%%/json/mapgen/exodii/exo_safehouse.json
+%%DATADIR%%/json/mapgen/exodii/exo_warehouse.json
 %%DATADIR%%/json/mapgen/exodii/exodii_base.json
 %%DATADIR%%/json/mapgen/exodii/exodii_nested.json
 %%DATADIR%%/json/mapgen/exodii/exodii_nested_singletile.json
@@ -1221,7 +1277,6 @@
 %%DATADIR%%/json/mapgen/fema/FEMA_brc_01.json
 %%DATADIR%%/json/mapgen/fema/FEMA_brc_02.json
 %%DATADIR%%/json/mapgen/fema/FEMA_brc_03.json
-%%DATADIR%%/json/mapgen/fema/FEMA_entrance_00.json
 %%DATADIR%%/json/mapgen/fema/FEMA_entrance_01.json
 %%DATADIR%%/json/mapgen/fema/FEMA_entrance_02.json
 %%DATADIR%%/json/mapgen/fema/FEMA_entrance_03.json
@@ -1267,15 +1322,20 @@
 %%DATADIR%%/json/mapgen/gas_stations/gas_station_bunker.json
 %%DATADIR%%/json/mapgen/gas_stations/s_gas.json
 %%DATADIR%%/json/mapgen/godco/church_retreat.json
-%%DATADIR%%/json/mapgen/godco/godco_eocs.json
 %%DATADIR%%/json/mapgen/godco/mapgen_updates.json
 %%DATADIR%%/json/mapgen/godco/nested.json
 %%DATADIR%%/json/mapgen/golfcourse.json
 %%DATADIR%%/json/mapgen/gunsmith.json
 %%DATADIR%%/json/mapgen/gym.json
+%%DATADIR%%/json/mapgen/haunting.json
 %%DATADIR%%/json/mapgen/hazardous_waste_sarcophagus.json
 %%DATADIR%%/json/mapgen/headshop.json
 %%DATADIR%%/json/mapgen/helipad.json
+%%DATADIR%%/json/mapgen/hells_raiders/bandit_cabin.json
+%%DATADIR%%/json/mapgen/hells_raiders/bandit_camp.json
+%%DATADIR%%/json/mapgen/hells_raiders/bandit_drug_lab.json
+%%DATADIR%%/json/mapgen/hells_raiders/bandit_garage.json
+%%DATADIR%%/json/mapgen/hells_raiders/bandit_work_camp.json
 %%DATADIR%%/json/mapgen/homeimprovement.json
 %%DATADIR%%/json/mapgen/homeimprovement_superstore_new.json
 %%DATADIR%%/json/mapgen/homeless_camp.json
@@ -1294,6 +1354,23 @@
 %%DATADIR%%/json/mapgen/house/bungalow06.json
 %%DATADIR%%/json/mapgen/house/bungalow07.json
 %%DATADIR%%/json/mapgen/house/bungalow08.json
+%%DATADIR%%/json/mapgen/house/bungalow09.json
+%%DATADIR%%/json/mapgen/house/bungalow10.json
*** 2928 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412010731.4B17ViuD091102>