[UPDATE] games/cataclysm-dda 2018.06.28 -> 2018.09.02

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[UPDATE] games/cataclysm-dda 2018.06.28 -> 2018.09.02

trondd-2
Another update with piles of changes.  Too much to list but if you haven't
played a newer version somewhere else, your water can freeze now and you can't
drink it.

Tim.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 3 Jul 2018 14:32:48 -0000 1.5
+++ Makefile 2 Sep 2018 23:25:05 -0000
@@ -1,12 +1,12 @@
 # $OpenBSD: Makefile,v 1.5 2018/07/03 14:32:48 bcallah Exp $
 
 COMMENT= rogue-like zombie survival game
-DISTNAME= cataclysm-dda-2018.06.28
+DISTNAME= cataclysm-dda-2018.09.02
 CATEGORIES= games
 
 GH_ACCOUNT= CleverRaven
 GH_PROJECT= Cataclysm-DDA
-GH_COMMIT= 1db1b62b57a38c18e5f118fb57dcb1290d42d9b9
+GH_COMMIT= 47298ed1dea10582ae57a3decfe548640ac576de
 
 HOMEPAGE= http://en.cataclysmdda.com
 MAINTAINER= Tim Meunier <[hidden email]>
@@ -33,8 +33,8 @@ LIB_DEPENDS= devel/gettext
 
 MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 
-MAKE_FLAGS= RELEASE=1 USE_XDG_DIR=1 LOCALIZE=1 LANGUAGES=all \
- LUA=1 LUA_BINARY=${MODLUA_BIN:T}
+MAKE_FLAGS= ASTYLE=0 RELEASE=1 USE_XDG_DIR=1 LOCALIZE=1 \
+ LANGUAGES=all LUA=1 LUA_BINARY=${MODLUA_BIN:T}
 
 .if ${FLAVOR:Mno_x11}
 WANTLIB+= curses
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 3 Jul 2018 14:32:48 -0000 1.4
+++ distinfo 2 Sep 2018 23:25:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (cataclysm-dda-2018.06.28-1db1b62b.tar.gz) = Ja37CLFcbbl1/6fCfe7lq38SxXSqg0d2ulmCuwhAhlg=
-SIZE (cataclysm-dda-2018.06.28-1db1b62b.tar.gz) = 64208890
+SHA256 (cataclysm-dda-2018.09.02-47298ed1.tar.gz) = JPSV9YJD5kx5dzvVodr8xB6deRp3JnFQN3ysWdaV61w=
+SIZE (cataclysm-dda-2018.09.02-47298ed1.tar.gz) = 64529975
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile 3 Jul 2018 14:32:48 -0000 1.5
+++ patches/patch-Makefile 2 Sep 2018 23:25:05 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.5 2018/07/0
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -78,7 +78,6 @@
+@@ -84,7 +84,6 @@
  # RELEASE is flags for release builds, this disables some debugging flags and
  # enforces build failure when warnings are encountered.
  # We want to error on everything to make sure we don't check in code with new warnings.
@@ -11,7 +11,7 @@ Index: Makefile
  WARNINGS = -Wall -Wextra
  # Uncomment below to disable warnings
  #WARNINGS = -w
-@@ -229,7 +228,6 @@ ifdef RELEASE
+@@ -254,7 +253,6 @@ ifdef RELEASE
        OPTLEVEL = -O3
      endif
    endif
@@ -19,16 +19,7 @@ Index: Makefile
 
    ifdef LTO
      LDFLAGS += -fuse-ld=gold
-@@ -250,7 +248,7 @@ ifdef RELEASE
-   endif
-   DEFINES += -DRELEASE
-   # Check for astyle or JSON regressions on release builds.
--  CHECKS = astyle-check style-json
-+  CHECKS = style-json
- endif
-
- ifndef RELEASE
-@@ -265,7 +263,7 @@ endif
+@@ -295,7 +293,7 @@ endif
  ifeq ($(shell sh -c 'uname -o 2>/dev/null || echo not'),Cygwin)
      OTHERS += -std=gnu++11
    else
@@ -37,7 +28,7 @@ Index: Makefile
  endif
 
  CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP
-@@ -406,11 +404,6 @@ ifdef MAPSIZE
+@@ -440,11 +438,6 @@ ifdef MAPSIZE
      CXXFLAGS += -DMAPSIZE=$(MAPSIZE)
  endif
 
@@ -49,7 +40,7 @@ Index: Makefile
  PKG_CONFIG = $(CROSS)pkg-config
  SDL2_CONFIG = $(CROSS)sdl2-config
 
-@@ -708,7 +701,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
+@@ -773,7 +766,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(OBJS)
  .PHONY: version json-verify
  version:
  @( VERSION_STRING=$(VERSION) ; \
@@ -57,7 +48,7 @@ Index: Makefile
              [ -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 \
           )
-@@ -762,35 +754,35 @@ distclean:
+@@ -827,35 +819,35 @@ distclean:
  bindist: $(BINDIST)
 
  ifeq ($(TARGETSYSTEM), LINUX)
@@ -112,7 +103,7 @@ Index: Makefile
  mkdir -p $(LOCALE_DIR)
  ifdef LANGUAGES
  LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
-@@ -959,11 +951,6 @@ astyle: $(ASTYLED_WHITELIST)
+@@ -1027,11 +1019,6 @@ astyle: $(ASTYLED_WHITELIST)
  astyle-all: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR) $(TOOLSRC)
  $(ASTYLE_BINARY) --options=.astylerc -n $(SOURCES) $(HEADERS)
  $(ASTYLE_BINARY) --options=.astylerc -n $(TESTSRC) $(TESTHDR)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 3 Jul 2018 14:32:48 -0000 1.4
+++ pkg/PLIST 2 Sep 2018 23:25:06 -0000
@@ -31,19 +31,18 @@ share/cataclysm-dda/json/anatomy.json
 share/cataclysm-dda/json/bionics.json
 share/cataclysm-dda/json/body_parts.json
 share/cataclysm-dda/json/construction.json
+share/cataclysm-dda/json/corpses.json
 share/cataclysm-dda/json/default_blacklist.json
 share/cataclysm-dda/json/doll_speech.json
 share/cataclysm-dda/json/dreams.json
 share/cataclysm-dda/json/effects.json
 share/cataclysm-dda/json/emit.json
-share/cataclysm-dda/json/faults.json
 share/cataclysm-dda/json/flags.json
 share/cataclysm-dda/json/furniture.json
 share/cataclysm-dda/json/game_balance.json
 share/cataclysm-dda/json/gates.json
 share/cataclysm-dda/json/harvest.json
 share/cataclysm-dda/json/health_msgs.json
-share/cataclysm-dda/json/hints.json
 share/cataclysm-dda/json/item_actions.json
 share/cataclysm-dda/json/item_category.json
 share/cataclysm-dda/json/item_groups.json
@@ -51,7 +50,9 @@ share/cataclysm-dda/json/itemgroups/
 share/cataclysm-dda/json/itemgroups/ammo.json
 share/cataclysm-dda/json/itemgroups/books.json
 share/cataclysm-dda/json/itemgroups/clothing.json
+share/cataclysm-dda/json/itemgroups/defense_mode.json
 share/cataclysm-dda/json/itemgroups/drugs.json
+share/cataclysm-dda/json/itemgroups/faction_camps.json
 share/cataclysm-dda/json/itemgroups/forage.json
 share/cataclysm-dda/json/itemgroups/gear.json
 share/cataclysm-dda/json/itemgroups/gunmod.json
@@ -60,6 +61,7 @@ share/cataclysm-dda/json/itemgroups/loca
 share/cataclysm-dda/json/itemgroups/magazines.json
 share/cataclysm-dda/json/itemgroups/main.json
 share/cataclysm-dda/json/itemgroups/mansion.json
+share/cataclysm-dda/json/itemgroups/map_extras.json
 share/cataclysm-dda/json/itemgroups/misc.json
 share/cataclysm-dda/json/itemgroups/monster_drops.json
 share/cataclysm-dda/json/itemgroups/supplies.json
@@ -102,6 +104,7 @@ share/cataclysm-dda/json/items/ammo/9x18
 share/cataclysm-dda/json/items/ammo/flintlock.json
 share/cataclysm-dda/json/items/ammo/metal_rail.json
 share/cataclysm-dda/json/items/ammo/nail.json
+share/cataclysm-dda/json/items/ammo/paintball.json
 share/cataclysm-dda/json/items/ammo/shot.json
 share/cataclysm-dda/json/items/ammo/signal_flare.json
 share/cataclysm-dda/json/items/ammo/weldgas.json
@@ -157,6 +160,7 @@ share/cataclysm-dda/json/items/comestibl
 share/cataclysm-dda/json/items/comestibles/carnivore.json
 share/cataclysm-dda/json/items/comestibles/drink.json
 share/cataclysm-dda/json/items/comestibles/egg.json
+share/cataclysm-dda/json/items/comestibles/frozen.json
 share/cataclysm-dda/json/items/comestibles/med.json
 share/cataclysm-dda/json/items/comestibles/mutagen.json
 share/cataclysm-dda/json/items/comestibles/protein.json
@@ -211,6 +215,7 @@ share/cataclysm-dda/json/items/gun/flamm
 share/cataclysm-dda/json/items/gun/flintlock.json
 share/cataclysm-dda/json/items/gun/metal_rail.json
 share/cataclysm-dda/json/items/gun/nail.json
+share/cataclysm-dda/json/items/gun/paintball.json
 share/cataclysm-dda/json/items/gun/shot.json
 share/cataclysm-dda/json/items/gun/signal_flare.json
 share/cataclysm-dda/json/items/gun/ups.json
@@ -277,25 +282,32 @@ share/cataclysm-dda/json/items/toolmod.j
 share/cataclysm-dda/json/items/tools.json
 share/cataclysm-dda/json/items/vehicle/
 share/cataclysm-dda/json/items/vehicle/alternator.json
+share/cataclysm-dda/json/items/vehicle/armor.json
 share/cataclysm-dda/json/items/vehicle/battery.json
 share/cataclysm-dda/json/items/vehicle/engine.json
 share/cataclysm-dda/json/items/vehicle/engineering.json
+share/cataclysm-dda/json/items/vehicle/rams.json
 share/cataclysm-dda/json/items/vehicle/rigs.json
 share/cataclysm-dda/json/items/vehicle/wheel.json
 share/cataclysm-dda/json/items/vehicle_parts.json
 share/cataclysm-dda/json/lab_notes.json
-share/cataclysm-dda/json/map_extra_items.json
 share/cataclysm-dda/json/mapgen/
-share/cataclysm-dda/json/mapgen/Prepper_house01.json
 share/cataclysm-dda/json/mapgen/abandoned01.json
+share/cataclysm-dda/json/mapgen/abandoned_barn.json
+share/cataclysm-dda/json/mapgen/abandoned_shopping_plaza.json
+share/cataclysm-dda/json/mapgen/abandoned_warehouse.json
 share/cataclysm-dda/json/mapgen/abstorefront.json
-share/cataclysm-dda/json/mapgen/ags_station.json
+share/cataclysm-dda/json/mapgen/animalpound.json
+share/cataclysm-dda/json/mapgen/animalshelter.json
 share/cataclysm-dda/json/mapgen/antique_store.json
 share/cataclysm-dda/json/mapgen/apartment_con.json
 share/cataclysm-dda/json/mapgen/apartment_mod.json
 share/cataclysm-dda/json/mapgen/arcade.json
+share/cataclysm-dda/json/mapgen/art_gallery.json
+share/cataclysm-dda/json/mapgen/bakery.json
 share/cataclysm-dda/json/mapgen/bandit_cabin.json
 share/cataclysm-dda/json/mapgen/bandit_camp.json
+share/cataclysm-dda/json/mapgen/bandit_garage.json
 share/cataclysm-dda/json/mapgen/bank.json
 share/cataclysm-dda/json/mapgen/bar.json
 share/cataclysm-dda/json/mapgen/basement/
@@ -303,63 +315,60 @@ share/cataclysm-dda/json/mapgen/basement
 share/cataclysm-dda/json/mapgen/basement/basement_chem.json
 share/cataclysm-dda/json/mapgen/basement/basement_game.json
 share/cataclysm-dda/json/mapgen/basement/basement_guns.json
+share/cataclysm-dda/json/mapgen/basement/basement_lab_stairs.json
 share/cataclysm-dda/json/mapgen/basement/basement_survival.json
 share/cataclysm-dda/json/mapgen/basement/basement_weed.json
 share/cataclysm-dda/json/mapgen/bike_shop.json
-share/cataclysm-dda/json/mapgen/bookstore1.json
-share/cataclysm-dda/json/mapgen/bookstore2.json
-share/cataclysm-dda/json/mapgen/bookstore3.json
 share/cataclysm-dda/json/mapgen/bowling_alley.json
 share/cataclysm-dda/json/mapgen/boxing.json
 share/cataclysm-dda/json/mapgen/bunker.json
 share/cataclysm-dda/json/mapgen/butcher.json
-share/cataclysm-dda/json/mapgen/cabin00.json
-share/cataclysm-dda/json/mapgen/cabin03.json
-share/cataclysm-dda/json/mapgen/cabin_strange.json
+share/cataclysm-dda/json/mapgen/cabin.json
+share/cataclysm-dda/json/mapgen/campground.json
 share/cataclysm-dda/json/mapgen/campsite.json
 share/cataclysm-dda/json/mapgen/cathedral.json
 share/cataclysm-dda/json/mapgen/cemetery_4square.json
-share/cataclysm-dda/json/mapgen/church_gothic.json
-share/cataclysm-dda/json/mapgen/church_new_england.json
-share/cataclysm-dda/json/mapgen/clothing0.json
-share/cataclysm-dda/json/mapgen/clothing1.json
-share/cataclysm-dda/json/mapgen/clothing2.json
-share/cataclysm-dda/json/mapgen/clothing3.json
-share/cataclysm-dda/json/mapgen/clothing4.json
-share/cataclysm-dda/json/mapgen/clothing5.json
-share/cataclysm-dda/json/mapgen/clothing6.json
-share/cataclysm-dda/json/mapgen/coffee_shop.json
-share/cataclysm-dda/json/mapgen/coffee_shop2.json
-share/cataclysm-dda/json/mapgen/dairy_farm.json
+share/cataclysm-dda/json/mapgen/cemetery_medium.json
+share/cataclysm-dda/json/mapgen/cemetery_small.json
+share/cataclysm-dda/json/mapgen/church.json
+share/cataclysm-dda/json/mapgen/construction_site.json
+share/cataclysm-dda/json/mapgen/daycare.json
 share/cataclysm-dda/json/mapgen/debug_ramps.json
+share/cataclysm-dda/json/mapgen/derelict_property.json
 share/cataclysm-dda/json/mapgen/diner.json
+share/cataclysm-dda/json/mapgen/dirtroad.json
+share/cataclysm-dda/json/mapgen/dispensary.json
 share/cataclysm-dda/json/mapgen/dojo.json
-share/cataclysm-dda/json/mapgen/electronics0.json
-share/cataclysm-dda/json/mapgen/electronics1.json
+share/cataclysm-dda/json/mapgen/dollar_store.json
+share/cataclysm-dda/json/mapgen/dump.json
+share/cataclysm-dda/json/mapgen/dumpsite.json
 share/cataclysm-dda/json/mapgen/evac_center.json
+share/cataclysm-dda/json/mapgen/faction_buildings.json
 share/cataclysm-dda/json/mapgen/farm.json
+share/cataclysm-dda/json/mapgen/farm_dairy.json
+share/cataclysm-dda/json/mapgen/farm_tree.json
+share/cataclysm-dda/json/mapgen/field_baseball.json
 share/cataclysm-dda/json/mapgen/field_football.json
 share/cataclysm-dda/json/mapgen/fire_station.json
-share/cataclysm-dda/json/mapgen/fortified_house01.json
-share/cataclysm-dda/json/mapgen/furniture.json
+share/cataclysm-dda/json/mapgen/gambling_hall.json
 share/cataclysm-dda/json/mapgen/garage.json
 share/cataclysm-dda/json/mapgen/garage_gas.json
+share/cataclysm-dda/json/mapgen/garden_botanical.json
+share/cataclysm-dda/json/mapgen/garden_community.json
+share/cataclysm-dda/json/mapgen/garden_public.json
 share/cataclysm-dda/json/mapgen/gardening_store.json
-share/cataclysm-dda/json/mapgen/grocery0.json
-share/cataclysm-dda/json/mapgen/grocery1.json
+share/cataclysm-dda/json/mapgen/golfcourse.json
 share/cataclysm-dda/json/mapgen/gunsmith.json
-share/cataclysm-dda/json/mapgen/gunstore_home_defense.json
 share/cataclysm-dda/json/mapgen/gym.json
-share/cataclysm-dda/json/mapgen/hardware1.json
-share/cataclysm-dda/json/mapgen/hardware2.json
-share/cataclysm-dda/json/mapgen/hardware3.json
-share/cataclysm-dda/json/mapgen/hardware4.json
+share/cataclysm-dda/json/mapgen/headshop.json
 share/cataclysm-dda/json/mapgen/homeimprovement.json
 share/cataclysm-dda/json/mapgen/homeimprovement_superstore.json
-share/cataclysm-dda/json/mapgen/hospital/
-share/cataclysm-dda/json/mapgen/hospital/hospital.json
+share/cataclysm-dda/json/mapgen/homeless_camp.json
+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/crack_house.json
+share/cataclysm-dda/json/mapgen/house/detached_house.json
 share/cataclysm-dda/json/mapgen/house/house04.json
 share/cataclysm-dda/json/mapgen/house/house05.json
 share/cataclysm-dda/json/mapgen/house/house05_ab.json
@@ -377,8 +386,10 @@ share/cataclysm-dda/json/mapgen/house/ho
 share/cataclysm-dda/json/mapgen/house/house17.json
 share/cataclysm-dda/json/mapgen/house/house18.json
 share/cataclysm-dda/json/mapgen/house/house19.json
+share/cataclysm-dda/json/mapgen/house/house_2story.json
 share/cataclysm-dda/json/mapgen/house/house_dogs.json
 share/cataclysm-dda/json/mapgen/house/house_duplex.json
+share/cataclysm-dda/json/mapgen/house/house_fortified.json
 share/cataclysm-dda/json/mapgen/house/house_garage.json
 share/cataclysm-dda/json/mapgen/house/house_garage2.json
 share/cataclysm-dda/json/mapgen/house/house_garage3.json
@@ -393,29 +404,48 @@ share/cataclysm-dda/json/mapgen/house/ho
 share/cataclysm-dda/json/mapgen/house/house_modern_lx.json
 share/cataclysm-dda/json/mapgen/house/house_patio.json
 share/cataclysm-dda/json/mapgen/house/house_porch.json
+share/cataclysm-dda/json/mapgen/house/house_prepper.json
 share/cataclysm-dda/json/mapgen/house/house_quiverfull.json
+share/cataclysm-dda/json/mapgen/house/house_rural.json
 share/cataclysm-dda/json/mapgen/house/house_rv.json
 share/cataclysm-dda/json/mapgen/house/house_suicide.json
 share/cataclysm-dda/json/mapgen/house/house_tool_shed.json
+share/cataclysm-dda/json/mapgen/house/house_vacant.json
+share/cataclysm-dda/json/mapgen/hunting_blind.json
 share/cataclysm-dda/json/mapgen/jewel_store.json
+share/cataclysm-dda/json/mapgen/junkyard.json
+share/cataclysm-dda/json/mapgen/lab/
+share/cataclysm-dda/json/mapgen/lab/lab_central.json
+share/cataclysm-dda/json/mapgen/lab/lab_common.json
+share/cataclysm-dda/json/mapgen/lab/lab_floorplan_cross.json
+share/cataclysm-dda/json/mapgen/lab/lab_floorplans.json
+share/cataclysm-dda/json/mapgen/lab/lab_floorplans_1side.json
+share/cataclysm-dda/json/mapgen/lab/lab_floorplans_finale1level.json
+share/cataclysm-dda/json/mapgen/lab/lab_rooms.json
+share/cataclysm-dda/json/mapgen/lab/lab_trains.json
+share/cataclysm-dda/json/mapgen/lan_center.json
+share/cataclysm-dda/json/mapgen/landfill.json
+share/cataclysm-dda/json/mapgen/landscaping_supply.json
 share/cataclysm-dda/json/mapgen/laundromat.json
-share/cataclysm-dda/json/mapgen/library1.json
-share/cataclysm-dda/json/mapgen/library2.json
+share/cataclysm-dda/json/mapgen/library.json
 share/cataclysm-dda/json/mapgen/lmoe.json
-share/cataclysm-dda/json/mapgen/lmoe_under01.json
-share/cataclysm-dda/json/mapgen/lmoe_under02.json
+share/cataclysm-dda/json/mapgen/lot_empty_commercial.json
+share/cataclysm-dda/json/mapgen/lot_empty_residential.json
+share/cataclysm-dda/json/mapgen/lumberyard.json
 share/cataclysm-dda/json/mapgen/mall.json
-share/cataclysm-dda/json/mapgen/mansion/
-share/cataclysm-dda/json/mapgen/mansion/mansion.json
+share/cataclysm-dda/json/mapgen/mansion.json
 share/cataclysm-dda/json/mapgen/mapgen-test.json
+share/cataclysm-dda/json/mapgen/mass_grave.json
 share/cataclysm-dda/json/mapgen/meth_lab.json
+share/cataclysm-dda/json/mapgen/mil_surplus.json
+share/cataclysm-dda/json/mapgen/moonshine_camp.json
 share/cataclysm-dda/json/mapgen/mortuary.json
 share/cataclysm-dda/json/mapgen/motel.json
-share/cataclysm-dda/json/mapgen/multistory_houses/
-share/cataclysm-dda/json/mapgen/multistory_houses/house_2story_base_north.json
-share/cataclysm-dda/json/mapgen/multistory_houses/house_2story_second.json
+share/cataclysm-dda/json/mapgen/movie_theater.json
 share/cataclysm-dda/json/mapgen/museum.json
+share/cataclysm-dda/json/mapgen/music_venue.json
 share/cataclysm-dda/json/mapgen/musicstore.json
+share/cataclysm-dda/json/mapgen/natural_spring.json
 share/cataclysm-dda/json/mapgen/necropolis/
 share/cataclysm-dda/json/mapgen/necropolis/necropolis.json
 share/cataclysm-dda/json/mapgen/necropolis/necropolisB1.json
@@ -423,34 +453,24 @@ share/cataclysm-dda/json/mapgen/necropol
 share/cataclysm-dda/json/mapgen/necropolis/necropolisB3.json
 share/cataclysm-dda/json/mapgen/office_cubical.json
 share/cataclysm-dda/json/mapgen/office_doctor.json
+share/cataclysm-dda/json/mapgen/office_small.json
 share/cataclysm-dda/json/mapgen/office_tower_2.json
 share/cataclysm-dda/json/mapgen/orchard_apple.json
+share/cataclysm-dda/json/mapgen/orchard_fruit.json
+share/cataclysm-dda/json/mapgen/paintball_field.json
 share/cataclysm-dda/json/mapgen/park.json
-share/cataclysm-dda/json/mapgen/parks_recreation/
-share/cataclysm-dda/json/mapgen/parks_recreation/art_gallery.json
-share/cataclysm-dda/json/mapgen/parks_recreation/cemetery_small.json
-share/cataclysm-dda/json/mapgen/parks_recreation/derelict_property.json
-share/cataclysm-dda/json/mapgen/parks_recreation/dispensary.json
-share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond0_0.json
-share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond0_1.json
-share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond1_0.json
-share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond1_1.json
-share/cataclysm-dda/json/mapgen/parks_recreation/hunting_blind.json
-share/cataclysm-dda/json/mapgen/parks_recreation/orchard.json
-share/cataclysm-dda/json/mapgen/parks_recreation/pavilion.json
-share/cataclysm-dda/json/mapgen/parks_recreation/skate_park.json
-share/cataclysm-dda/json/mapgen/parks_recreation/small_office.json
-share/cataclysm-dda/json/mapgen/parks_recreation/small_storage_units.json
-share/cataclysm-dda/json/mapgen/parks_recreation/small_wooded_trail.json
-share/cataclysm-dda/json/mapgen/parks_recreation/state_park0_0.json
-share/cataclysm-dda/json/mapgen/parks_recreation/state_park0_1.json
-share/cataclysm-dda/json/mapgen/parks_recreation/state_park1_0.json
-share/cataclysm-dda/json/mapgen/parks_recreation/state_park1_1.json
-share/cataclysm-dda/json/mapgen/pharmacy_1.json
-share/cataclysm-dda/json/mapgen/pharmacy_1_open.json
+share/cataclysm-dda/json/mapgen/park_skate.json
+share/cataclysm-dda/json/mapgen/park_state.json
+share/cataclysm-dda/json/mapgen/pavilion.json
+share/cataclysm-dda/json/mapgen/pawn_shop.json
+share/cataclysm-dda/json/mapgen/petstore.json
+share/cataclysm-dda/json/mapgen/pharmacy.json
 share/cataclysm-dda/json/mapgen/pizza_parlor.json
+share/cataclysm-dda/json/mapgen/pond_fishing.json
+share/cataclysm-dda/json/mapgen/pond_public.json
 share/cataclysm-dda/json/mapgen/ponds.json
 share/cataclysm-dda/json/mapgen/pool.json
+share/cataclysm-dda/json/mapgen/post_office.json
 share/cataclysm-dda/json/mapgen/power_station_large.json
 share/cataclysm-dda/json/mapgen/power_station_small.json
 share/cataclysm-dda/json/mapgen/prison_1.json
@@ -458,41 +478,54 @@ share/cataclysm-dda/json/mapgen/public_w
 share/cataclysm-dda/json/mapgen/pump_station.json
 share/cataclysm-dda/json/mapgen/radio_tower.json
 share/cataclysm-dda/json/mapgen/ranch_camp.json
+share/cataclysm-dda/json/mapgen/recycle_center.json
 share/cataclysm-dda/json/mapgen/restaurant.json
-share/cataclysm-dda/json/mapgen/restaurant2.json
 share/cataclysm-dda/json/mapgen/restaurant_fast.json
+share/cataclysm-dda/json/mapgen/reststop.json
 share/cataclysm-dda/json/mapgen/river_shipwreck.json
 share/cataclysm-dda/json/mapgen/road_4way.json
 share/cataclysm-dda/json/mapgen/roadstop.json
-share/cataclysm-dda/json/mapgen/roadstop_a.json
-share/cataclysm-dda/json/mapgen/roadstop_b.json
-share/cataclysm-dda/json/mapgen/s_gas_rural.json
-share/cataclysm-dda/json/mapgen/s_gun0.json
-share/cataclysm-dda/json/mapgen/s_library.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
+share/cataclysm-dda/json/mapgen/s_coffee.json
+share/cataclysm-dda/json/mapgen/s_electronics.json
+share/cataclysm-dda/json/mapgen/s_furniture.json
+share/cataclysm-dda/json/mapgen/s_gas.json
+share/cataclysm-dda/json/mapgen/s_grocery.json
+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_liquor.json
 share/cataclysm-dda/json/mapgen/sai.json
 share/cataclysm-dda/json/mapgen/school_1.json
 share/cataclysm-dda/json/mapgen/shelter.json
-share/cataclysm-dda/json/mapgen/small_town_buildings/
-share/cataclysm-dda/json/mapgen/small_town_buildings/bakery.json
-share/cataclysm-dda/json/mapgen/small_town_buildings/candy_shop.json
-share/cataclysm-dda/json/mapgen/small_town_buildings/construction_site.json
-share/cataclysm-dda/json/mapgen/small_town_buildings/icecream_shop.json
-share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_0_0.json
-share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_0_1.json
-share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_1_0.json
-share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_1_1.json
-share/cataclysm-dda/json/mapgen/small_town_buildings/post_office.json
+share/cataclysm-dda/json/mapgen/shooting_range.json
+share/cataclysm-dda/json/mapgen/smallscrapyard.json
+share/cataclysm-dda/json/mapgen/smoke_lounge.json
+share/cataclysm-dda/json/mapgen/sports_store.json
+share/cataclysm-dda/json/mapgen/stadium_football.json
 share/cataclysm-dda/json/mapgen/standing_stones.json
+share/cataclysm-dda/json/mapgen/station_radio.json
+share/cataclysm-dda/json/mapgen/storage_units_large.json
+share/cataclysm-dda/json/mapgen/storage_units_medium.json
+share/cataclysm-dda/json/mapgen/storage_units_small.json
+share/cataclysm-dda/json/mapgen/stripclub.json
 share/cataclysm-dda/json/mapgen/sub_station.json
-share/cataclysm-dda/json/mapgen/subway_tunnels.json
 share/cataclysm-dda/json/mapgen/sugar_house.json
 share/cataclysm-dda/json/mapgen/swamp_shack.json
 share/cataclysm-dda/json/mapgen/teashop.json
+share/cataclysm-dda/json/mapgen/thrift.json
+share/cataclysm-dda/json/mapgen/trail_nature.json
+share/cataclysm-dda/json/mapgen/trail_small.json
+share/cataclysm-dda/json/mapgen/trailer_park.json
 share/cataclysm-dda/json/mapgen/triffid_grove.json
 share/cataclysm-dda/json/mapgen/veterinarian.json
+share/cataclysm-dda/json/mapgen/vfw.json
 share/cataclysm-dda/json/mapgen/warehouse.json
+share/cataclysm-dda/json/mapgen/zoo.json
 share/cataclysm-dda/json/mapgen_palettes/
+share/cataclysm-dda/json/mapgen_palettes/acidia_camp_palette.json
 share/cataclysm-dda/json/mapgen_palettes/basement.json
 share/cataclysm-dda/json/mapgen_palettes/church.json
 share/cataclysm-dda/json/mapgen_palettes/evac_center.json
@@ -500,7 +533,9 @@ share/cataclysm-dda/json/mapgen_palettes
 share/cataclysm-dda/json/mapgen_palettes/houses_multistory.json
 share/cataclysm-dda/json/mapgen_palettes/lumberyard.json
 share/cataclysm-dda/json/mapgen_palettes/mansion.json
+share/cataclysm-dda/json/mapgen_palettes/mil_surplus.json
 share/cataclysm-dda/json/mapgen_palettes/office_doctor.json
+share/cataclysm-dda/json/mapgen_palettes/road.json
 share/cataclysm-dda/json/mapgen_palettes/shelter.json
 share/cataclysm-dda/json/mapgen_palettes/subway.json
 share/cataclysm-dda/json/martialarts.json
@@ -510,6 +545,7 @@ share/cataclysm-dda/json/monster_drops.j
 share/cataclysm-dda/json/monster_factions.json
 share/cataclysm-dda/json/monsterdrops/
 share/cataclysm-dda/json/monsterdrops/zombie_cop.json
+share/cataclysm-dda/json/monsterdrops/zombie_military_pilot.json
 share/cataclysm-dda/json/monsterdrops/zombie_soldier.json
 share/cataclysm-dda/json/monsterdrops/zombie_survivor.json
 share/cataclysm-dda/json/monsterdrops/zombie_technician.json
@@ -530,12 +566,9 @@ share/cataclysm-dda/json/monsters/triffi
 share/cataclysm-dda/json/monsters/zed_children.json
 share/cataclysm-dda/json/monsters/zed_explosive.json
 share/cataclysm-dda/json/morale_types.json
-share/cataclysm-dda/json/multitile_buildings_terrain.json
-share/cataclysm-dda/json/multitile_city_buildings.json
 share/cataclysm-dda/json/mutation_category.json
 share/cataclysm-dda/json/mutation_ordering.json
 share/cataclysm-dda/json/mutations.json
-share/cataclysm-dda/json/npc_destination_locations.json
 share/cataclysm-dda/json/npcs/
 share/cataclysm-dda/json/npcs/NC_ARSONIST.json
 share/cataclysm-dda/json/npcs/NC_BARTENDER.json
@@ -563,19 +596,23 @@ share/cataclysm-dda/json/npcs/TALK_EVAC_
 share/cataclysm-dda/json/npcs/TALK_OLD_GUARD_REP.json
 share/cataclysm-dda/json/npcs/TALK_SCAVENGER_MERC.json
 share/cataclysm-dda/json/npcs/classes.json
+share/cataclysm-dda/json/npcs/destination_locations.json
 share/cataclysm-dda/json/npcs/epilogues.json
 share/cataclysm-dda/json/npcs/factions.json
+share/cataclysm-dda/json/npcs/hints.json
 share/cataclysm-dda/json/npcs/items_generic.json
 share/cataclysm-dda/json/npcs/missiondef.json
 share/cataclysm-dda/json/npcs/npc.json
 share/cataclysm-dda/json/npcs/talk_tags.json
+share/cataclysm-dda/json/overmap/
+share/cataclysm-dda/json/overmap/multitile_buildings_terrain.json
+share/cataclysm-dda/json/overmap/multitile_city_buildings.json
+share/cataclysm-dda/json/overmap/special_locations.json
+share/cataclysm-dda/json/overmap/specials.json
 share/cataclysm-dda/json/overmap_connections.json
-share/cataclysm-dda/json/overmap_special_locations.json
-share/cataclysm-dda/json/overmap_specials.json
 share/cataclysm-dda/json/overmap_terrain.json
 share/cataclysm-dda/json/player_activities.json
 share/cataclysm-dda/json/professions.json
-share/cataclysm-dda/json/ranged_balance.json
 share/cataclysm-dda/json/recipes/
 share/cataclysm-dda/json/recipes/ammo/
 share/cataclysm-dda/json/recipes/ammo/components.json
@@ -599,10 +636,12 @@ share/cataclysm-dda/json/recipes/chem/ot
 share/cataclysm-dda/json/recipes/electronics/
 share/cataclysm-dda/json/recipes/electronics/parts.json
 share/cataclysm-dda/json/recipes/electronics/toolmod.json
+share/cataclysm-dda/json/recipes/engines.json
 share/cataclysm-dda/json/recipes/food/
 share/cataclysm-dda/json/recipes/food/brewing.json
 share/cataclysm-dda/json/recipes/food/distill.json
 share/cataclysm-dda/json/recipes/food/dry.json
+share/cataclysm-dda/json/recipes/food/frozen.json
 share/cataclysm-dda/json/recipes/food/pasta.json
 share/cataclysm-dda/json/recipes/food/seed.json
 share/cataclysm-dda/json/recipes/other/
@@ -614,11 +653,15 @@ share/cataclysm-dda/json/recipes/other/p
 share/cataclysm-dda/json/recipes/other/tool.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_construction_om.json
 share/cataclysm-dda/json/recipes/recipe_deconstruction.json
 share/cataclysm-dda/json/recipes/recipe_electronics.json
 share/cataclysm-dda/json/recipes/recipe_food.json
+share/cataclysm-dda/json/recipes/recipe_groups.json
 share/cataclysm-dda/json/recipes/recipe_medsandchemicals.json
 share/cataclysm-dda/json/recipes/recipe_others.json
+share/cataclysm-dda/json/recipes/recipe_vehicle.json
 share/cataclysm-dda/json/recipes/recipe_weapon.json
 share/cataclysm-dda/json/recipes/recipes.json
 share/cataclysm-dda/json/recipes/weapon/
@@ -673,16 +716,21 @@ share/cataclysm-dda/json/vehicle_groups.
 share/cataclysm-dda/json/vehicle_parts.json
 share/cataclysm-dda/json/vehicleparts/
 share/cataclysm-dda/json/vehicleparts/alternator.json
+share/cataclysm-dda/json/vehicleparts/armor.json
 share/cataclysm-dda/json/vehicleparts/battery.json
 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/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/motor.json
+share/cataclysm-dda/json/vehicleparts/rams.json
 share/cataclysm-dda/json/vehicleparts/tanks.json
 share/cataclysm-dda/json/vehicleparts/turret.json
+share/cataclysm-dda/json/vehicleparts/vp_flags.json
 share/cataclysm-dda/json/vehicleparts/wheel.json
 share/cataclysm-dda/json/vehicles/
 share/cataclysm-dda/json/vehicles/bikes.json
@@ -691,6 +739,7 @@ share/cataclysm-dda/json/vehicles/carts.
 share/cataclysm-dda/json/vehicles/custom_vehicles.json
 share/cataclysm-dda/json/vehicles/emergency.json
 share/cataclysm-dda/json/vehicles/farm.json
+share/cataclysm-dda/json/vehicles/helicopters.json
 share/cataclysm-dda/json/vehicles/military.json
 share/cataclysm-dda/json/vehicles/trucks.json
 share/cataclysm-dda/json/vehicles/utility.json
@@ -719,9 +768,15 @@ share/cataclysm-dda/mods/Boats/b_var_woo
 share/cataclysm-dda/mods/Boats/b_vehicles.json
 share/cataclysm-dda/mods/Boats/b_wooden_boat_parts.json
 share/cataclysm-dda/mods/Boats/modinfo.json
+share/cataclysm-dda/mods/Boats/overmap_terrain.json
+share/cataclysm-dda/mods/Boats/specials.json
+share/cataclysm-dda/mods/Boats/whaleys_boat_rental.json
+share/cataclysm-dda/mods/Boats/whaleys_boats.json
+share/cataclysm-dda/mods/Boats/whaleys_house_river.json
 share/cataclysm-dda/mods/BrightNights/
 share/cataclysm-dda/mods/BrightNights/bionics.json
 share/cataclysm-dda/mods/BrightNights/effects.json
+share/cataclysm-dda/mods/BrightNights/game_balance.json
 share/cataclysm-dda/mods/BrightNights/gun.json
 share/cataclysm-dda/mods/BrightNights/item groups/
 share/cataclysm-dda/mods/BrightNights/item groups/locations.json
@@ -730,6 +785,7 @@ share/cataclysm-dda/mods/BrightNights/it
 share/cataclysm-dda/mods/BrightNights/items/bionics.json
 share/cataclysm-dda/mods/BrightNights/items/books.json
 share/cataclysm-dda/mods/BrightNights/items/generic.json
+share/cataclysm-dda/mods/BrightNights/items/med.json
 share/cataclysm-dda/mods/BrightNights/mapgen/
 share/cataclysm-dda/mods/BrightNights/mapgen/map_palletes.json
 share/cataclysm-dda/mods/BrightNights/mapgen/municipal_microreactor.json
@@ -751,10 +807,13 @@ 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/CrazyCataclysm/
-share/cataclysm-dda/mods/CrazyCataclysm/aperturepotato.json
-share/cataclysm-dda/mods/CrazyCataclysm/items.json
+share/cataclysm-dda/mods/CrazyCataclysm/crazy_aperturepotato.json
+share/cataclysm-dda/mods/CrazyCataclysm/crazy_comestibles.json
+share/cataclysm-dda/mods/CrazyCataclysm/crazy_item_groups.json
+share/cataclysm-dda/mods/CrazyCataclysm/crazy_items.json
+share/cataclysm-dda/mods/CrazyCataclysm/crazy_monsters.json
+share/cataclysm-dda/mods/CrazyCataclysm/crazy_speech.json
 share/cataclysm-dda/mods/CrazyCataclysm/modinfo.json
-share/cataclysm-dda/mods/CrazyCataclysm/speech.json
 share/cataclysm-dda/mods/DeoxyMod/
 share/cataclysm-dda/mods/DeoxyMod/Deoxy_vehicle_parts.json
 share/cataclysm-dda/mods/DeoxyMod/modinfo.json
@@ -805,6 +864,9 @@ share/cataclysm-dda/mods/Generic_Guns/gg
 share/cataclysm-dda/mods/Generic_Guns/gg_other_blacklist.json
 share/cataclysm-dda/mods/Generic_Guns/gg_vehicle_override.json
 share/cataclysm-dda/mods/Generic_Guns/modinfo.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.json
 share/cataclysm-dda/mods/Medieval_Stuff/ammo_types.json
@@ -1753,6 +1815,9 @@ share/cataclysm-dda/mods/Only_Wildlife/m
 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/Slow_Zombies/
 share/cataclysm-dda/mods/Slow_Zombies/main.lua
 share/cataclysm-dda/mods/Slow_Zombies/modinfo.json
@@ -1763,17 +1828,19 @@ 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/mapgen.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/overmap_specials.json
-share/cataclysm-dda/mods/Tanks/overmap_terrain.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/Tough_Zombies/
 share/cataclysm-dda/mods/Tough_Zombies/main.lua
 share/cataclysm-dda/mods/Tough_Zombies/modinfo.json
@@ -1858,6 +1925,9 @@ share/cataclysm-dda/mods/blazemod/blaze_
 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
@@ -1939,14 +2009,10 @@ share/locale/es_ES/
 share/locale/es_ES/LC_MESSAGES/
 share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo
 share/locale/fr/LC_MESSAGES/cataclysm-dda.mo
-share/locale/it_IT/
-share/locale/it_IT/LC_MESSAGES/
-share/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo
+share/locale/hu/LC_MESSAGES/cataclysm-dda.mo
 share/locale/ja/LC_MESSAGES/cataclysm-dda.mo
 share/locale/ko/LC_MESSAGES/cataclysm-dda.mo
 share/locale/pl/LC_MESSAGES/cataclysm-dda.mo
-share/locale/pt_BR/LC_MESSAGES/cataclysm-dda.mo
 share/locale/ru/LC_MESSAGES/cataclysm-dda.mo
-share/locale/sr/LC_MESSAGES/cataclysm-dda.mo
 share/locale/zh_CN/LC_MESSAGES/cataclysm-dda.mo
 share/locale/zh_TW/LC_MESSAGES/cataclysm-dda.mo

Reply | Threaded
Open this post in threaded view
|

Re: [UPDATE] games/cataclysm-dda 2018.06.28 -> 2018.09.02

Charlene Wendling
Hi Tim, ports,

The game builds fine on a fresh amd64 vm.

I played it on my own machine for several games without any crashes or
other issues. Fun but unforgiving game :)  

Charlène.


On Sun, 02 Sep 2018 19:42:13 -0400
trondd wrote:

> Another update with piles of changes.  Too much to list but if you
> haven't played a newer version somewhere else, your water can freeze
> now and you can't drink it.
>
> Tim.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 3 Jul 2018 14:32:48 -0000 1.5
> +++ Makefile 2 Sep 2018 23:25:05 -0000
> @@ -1,12 +1,12 @@
>  # $OpenBSD: Makefile,v 1.5 2018/07/03 14:32:48 bcallah Exp $
>  
>  COMMENT= rogue-like zombie survival game
> -DISTNAME= cataclysm-dda-2018.06.28
> +DISTNAME= cataclysm-dda-2018.09.02
>  CATEGORIES= games
>  
>  GH_ACCOUNT= CleverRaven
>  GH_PROJECT= Cataclysm-DDA
> -GH_COMMIT= 1db1b62b57a38c18e5f118fb57dcb1290d42d9b9
> +GH_COMMIT= 47298ed1dea10582ae57a3decfe548640ac576de
>  
>  HOMEPAGE= http://en.cataclysmdda.com
>  MAINTAINER= Tim Meunier <[hidden email]>
> @@ -33,8 +33,8 @@ LIB_DEPENDS= devel/gettext
>  
>  MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
>  
> -MAKE_FLAGS= RELEASE=1 USE_XDG_DIR=1 LOCALIZE=1
> LANGUAGES=all \
> - LUA=1 LUA_BINARY=${MODLUA_BIN:T}
> +MAKE_FLAGS= ASTYLE=0 RELEASE=1 USE_XDG_DIR=1
> LOCALIZE=1 \
> + LANGUAGES=all LUA=1 LUA_BINARY=$
> {MODLUA_BIN:T}
>  .if ${FLAVOR:Mno_x11}
>  WANTLIB+= curses
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 3 Jul 2018 14:32:48 -0000 1.4
> +++ distinfo 2 Sep 2018 23:25:05 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (cataclysm-dda-2018.06.28-1db1b62b.tar.gz) =
> Ja37CLFcbbl1/6fCfe7lq38SxXSqg0d2ulmCuwhAhlg= -SIZE
> (cataclysm-dda-2018.06.28-1db1b62b.tar.gz) = 64208890 +SHA256
> (cataclysm-dda-2018.09.02-47298ed1.tar.gz) =
> JPSV9YJD5kx5dzvVodr8xB6deRp3JnFQN3ysWdaV61w= +SIZE
> (cataclysm-dda-2018.09.02-47298ed1.tar.gz) = 64529975 Index:
> patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v
> retrieving revision 1.5 diff -u -p -r1.5 patch-Makefile
> --- patches/patch-Makefile 3 Jul 2018 14:32:48 -0000 1.5
> +++ patches/patch-Makefile 2 Sep 2018 23:25:05 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.5 2018/07/0
>  Index: Makefile
>  --- Makefile.orig
>  +++ Makefile
> -@@ -78,7 +78,6 @@
> +@@ -84,7 +84,6 @@
>   # RELEASE is flags for release builds, this disables some debugging
>   # flags and enforces build failure when warnings are encountered.
>   # We want to error on everything to make sure we don't check in
>   # code with new warnings.
> @@ -11,7 +11,7 @@ Index: Makefile
>   WARNINGS = -Wall -Wextra
>   # Uncomment below to disable warnings
>   #WARNINGS = -w
> -@@ -229,7 +228,6 @@ ifdef RELEASE
> +@@ -254,7 +253,6 @@ ifdef RELEASE
>         OPTLEVEL = -O3
>       endif
>     endif
> @@ -19,16 +19,7 @@ Index: Makefile
>  
>     ifdef LTO
>       LDFLAGS += -fuse-ld=gold
> -@@ -250,7 +248,7 @@ ifdef RELEASE
> -   endif
> -   DEFINES += -DRELEASE
> -   # Check for astyle or JSON regressions on release builds.
> --  CHECKS = astyle-check style-json
> -+  CHECKS = style-json
> - endif
> -
> - ifndef RELEASE
> -@@ -265,7 +263,7 @@ endif
> +@@ -295,7 +293,7 @@ endif
>   ifeq ($(shell sh -c 'uname -o 2>/dev/null || echo not'),Cygwin)
>       OTHERS += -std=gnu++11
>     else
> @@ -37,7 +28,7 @@ Index: Makefile
>   endif
>  
>   CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS)
> -MMD -MP -@@ -406,11 +404,6 @@ ifdef MAPSIZE
> +@@ -440,11 +438,6 @@ ifdef MAPSIZE
>       CXXFLAGS += -DMAPSIZE=$(MAPSIZE)
>   endif
>  
> @@ -49,7 +40,7 @@ Index: Makefile
>   PKG_CONFIG = $(CROSS)pkg-config
>   SDL2_CONFIG = $(CROSS)sdl2-config
>  
> -@@ -708,7 +701,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
> +@@ -773,7 +766,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(OBJS)
>   .PHONY: version json-verify
>   version:
>   @( VERSION_STRING=$(VERSION) ; \
> @@ -57,7 +48,7 @@ Index: Makefile
>               [ -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 \ ) -@@ -762,35
> +754,35 @@ distclean: +@@ -827,35 +819,35 @@ distclean:
>   bindist: $(BINDIST)
>  
>   ifeq ($(TARGETSYSTEM), LINUX)
> @@ -112,7 +103,7 @@ Index: Makefile
>   mkdir -p $(LOCALE_DIR)
>   ifdef LANGUAGES
>   LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
> -@@ -959,11 +951,6 @@ astyle: $(ASTYLED_WHITELIST)
> +@@ -1027,11 +1019,6 @@ astyle: $(ASTYLED_WHITELIST)
>   astyle-all: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR) $(TOOLSRC)
>   $(ASTYLE_BINARY) --options=.astylerc -n $(SOURCES) $
> (HEADERS) $(ASTYLE_BINARY) --options=.astylerc -n $(TESTSRC) $
> (TESTHDR) Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 3 Jul 2018 14:32:48 -0000 1.4
> +++ pkg/PLIST 2 Sep 2018 23:25:06 -0000
> @@ -31,19 +31,18 @@ share/cataclysm-dda/json/anatomy.json
>  share/cataclysm-dda/json/bionics.json
>  share/cataclysm-dda/json/body_parts.json
>  share/cataclysm-dda/json/construction.json
> +share/cataclysm-dda/json/corpses.json
>  share/cataclysm-dda/json/default_blacklist.json
>  share/cataclysm-dda/json/doll_speech.json
>  share/cataclysm-dda/json/dreams.json
>  share/cataclysm-dda/json/effects.json
>  share/cataclysm-dda/json/emit.json
> -share/cataclysm-dda/json/faults.json
>  share/cataclysm-dda/json/flags.json
>  share/cataclysm-dda/json/furniture.json
>  share/cataclysm-dda/json/game_balance.json
>  share/cataclysm-dda/json/gates.json
>  share/cataclysm-dda/json/harvest.json
>  share/cataclysm-dda/json/health_msgs.json
> -share/cataclysm-dda/json/hints.json
>  share/cataclysm-dda/json/item_actions.json
>  share/cataclysm-dda/json/item_category.json
>  share/cataclysm-dda/json/item_groups.json
> @@ -51,7 +50,9 @@ share/cataclysm-dda/json/itemgroups/
>  share/cataclysm-dda/json/itemgroups/ammo.json
>  share/cataclysm-dda/json/itemgroups/books.json
>  share/cataclysm-dda/json/itemgroups/clothing.json
> +share/cataclysm-dda/json/itemgroups/defense_mode.json
>  share/cataclysm-dda/json/itemgroups/drugs.json
> +share/cataclysm-dda/json/itemgroups/faction_camps.json
>  share/cataclysm-dda/json/itemgroups/forage.json
>  share/cataclysm-dda/json/itemgroups/gear.json
>  share/cataclysm-dda/json/itemgroups/gunmod.json
> @@ -60,6 +61,7 @@ share/cataclysm-dda/json/itemgroups/loca
>  share/cataclysm-dda/json/itemgroups/magazines.json
>  share/cataclysm-dda/json/itemgroups/main.json
>  share/cataclysm-dda/json/itemgroups/mansion.json
> +share/cataclysm-dda/json/itemgroups/map_extras.json
>  share/cataclysm-dda/json/itemgroups/misc.json
>  share/cataclysm-dda/json/itemgroups/monster_drops.json
>  share/cataclysm-dda/json/itemgroups/supplies.json
> @@ -102,6 +104,7 @@ share/cataclysm-dda/json/items/ammo/9x18
>  share/cataclysm-dda/json/items/ammo/flintlock.json
>  share/cataclysm-dda/json/items/ammo/metal_rail.json
>  share/cataclysm-dda/json/items/ammo/nail.json
> +share/cataclysm-dda/json/items/ammo/paintball.json
>  share/cataclysm-dda/json/items/ammo/shot.json
>  share/cataclysm-dda/json/items/ammo/signal_flare.json
>  share/cataclysm-dda/json/items/ammo/weldgas.json
> @@ -157,6 +160,7 @@ share/cataclysm-dda/json/items/comestibl
>  share/cataclysm-dda/json/items/comestibles/carnivore.json
>  share/cataclysm-dda/json/items/comestibles/drink.json
>  share/cataclysm-dda/json/items/comestibles/egg.json
> +share/cataclysm-dda/json/items/comestibles/frozen.json
>  share/cataclysm-dda/json/items/comestibles/med.json
>  share/cataclysm-dda/json/items/comestibles/mutagen.json
>  share/cataclysm-dda/json/items/comestibles/protein.json
> @@ -211,6 +215,7 @@ share/cataclysm-dda/json/items/gun/flamm
>  share/cataclysm-dda/json/items/gun/flintlock.json
>  share/cataclysm-dda/json/items/gun/metal_rail.json
>  share/cataclysm-dda/json/items/gun/nail.json
> +share/cataclysm-dda/json/items/gun/paintball.json
>  share/cataclysm-dda/json/items/gun/shot.json
>  share/cataclysm-dda/json/items/gun/signal_flare.json
>  share/cataclysm-dda/json/items/gun/ups.json
> @@ -277,25 +282,32 @@ share/cataclysm-dda/json/items/toolmod.j
>  share/cataclysm-dda/json/items/tools.json
>  share/cataclysm-dda/json/items/vehicle/
>  share/cataclysm-dda/json/items/vehicle/alternator.json
> +share/cataclysm-dda/json/items/vehicle/armor.json
>  share/cataclysm-dda/json/items/vehicle/battery.json
>  share/cataclysm-dda/json/items/vehicle/engine.json
>  share/cataclysm-dda/json/items/vehicle/engineering.json
> +share/cataclysm-dda/json/items/vehicle/rams.json
>  share/cataclysm-dda/json/items/vehicle/rigs.json
>  share/cataclysm-dda/json/items/vehicle/wheel.json
>  share/cataclysm-dda/json/items/vehicle_parts.json
>  share/cataclysm-dda/json/lab_notes.json
> -share/cataclysm-dda/json/map_extra_items.json
>  share/cataclysm-dda/json/mapgen/
> -share/cataclysm-dda/json/mapgen/Prepper_house01.json
>  share/cataclysm-dda/json/mapgen/abandoned01.json
> +share/cataclysm-dda/json/mapgen/abandoned_barn.json
> +share/cataclysm-dda/json/mapgen/abandoned_shopping_plaza.json
> +share/cataclysm-dda/json/mapgen/abandoned_warehouse.json
>  share/cataclysm-dda/json/mapgen/abstorefront.json
> -share/cataclysm-dda/json/mapgen/ags_station.json
> +share/cataclysm-dda/json/mapgen/animalpound.json
> +share/cataclysm-dda/json/mapgen/animalshelter.json
>  share/cataclysm-dda/json/mapgen/antique_store.json
>  share/cataclysm-dda/json/mapgen/apartment_con.json
>  share/cataclysm-dda/json/mapgen/apartment_mod.json
>  share/cataclysm-dda/json/mapgen/arcade.json
> +share/cataclysm-dda/json/mapgen/art_gallery.json
> +share/cataclysm-dda/json/mapgen/bakery.json
>  share/cataclysm-dda/json/mapgen/bandit_cabin.json
>  share/cataclysm-dda/json/mapgen/bandit_camp.json
> +share/cataclysm-dda/json/mapgen/bandit_garage.json
>  share/cataclysm-dda/json/mapgen/bank.json
>  share/cataclysm-dda/json/mapgen/bar.json
>  share/cataclysm-dda/json/mapgen/basement/
> @@ -303,63 +315,60 @@ share/cataclysm-dda/json/mapgen/basement
>  share/cataclysm-dda/json/mapgen/basement/basement_chem.json
>  share/cataclysm-dda/json/mapgen/basement/basement_game.json
>  share/cataclysm-dda/json/mapgen/basement/basement_guns.json
> +share/cataclysm-dda/json/mapgen/basement/basement_lab_stairs.json
>  share/cataclysm-dda/json/mapgen/basement/basement_survival.json
>  share/cataclysm-dda/json/mapgen/basement/basement_weed.json
>  share/cataclysm-dda/json/mapgen/bike_shop.json
> -share/cataclysm-dda/json/mapgen/bookstore1.json
> -share/cataclysm-dda/json/mapgen/bookstore2.json
> -share/cataclysm-dda/json/mapgen/bookstore3.json
>  share/cataclysm-dda/json/mapgen/bowling_alley.json
>  share/cataclysm-dda/json/mapgen/boxing.json
>  share/cataclysm-dda/json/mapgen/bunker.json
>  share/cataclysm-dda/json/mapgen/butcher.json
> -share/cataclysm-dda/json/mapgen/cabin00.json
> -share/cataclysm-dda/json/mapgen/cabin03.json
> -share/cataclysm-dda/json/mapgen/cabin_strange.json
> +share/cataclysm-dda/json/mapgen/cabin.json
> +share/cataclysm-dda/json/mapgen/campground.json
>  share/cataclysm-dda/json/mapgen/campsite.json
>  share/cataclysm-dda/json/mapgen/cathedral.json
>  share/cataclysm-dda/json/mapgen/cemetery_4square.json
> -share/cataclysm-dda/json/mapgen/church_gothic.json
> -share/cataclysm-dda/json/mapgen/church_new_england.json
> -share/cataclysm-dda/json/mapgen/clothing0.json
> -share/cataclysm-dda/json/mapgen/clothing1.json
> -share/cataclysm-dda/json/mapgen/clothing2.json
> -share/cataclysm-dda/json/mapgen/clothing3.json
> -share/cataclysm-dda/json/mapgen/clothing4.json
> -share/cataclysm-dda/json/mapgen/clothing5.json
> -share/cataclysm-dda/json/mapgen/clothing6.json
> -share/cataclysm-dda/json/mapgen/coffee_shop.json
> -share/cataclysm-dda/json/mapgen/coffee_shop2.json
> -share/cataclysm-dda/json/mapgen/dairy_farm.json
> +share/cataclysm-dda/json/mapgen/cemetery_medium.json
> +share/cataclysm-dda/json/mapgen/cemetery_small.json
> +share/cataclysm-dda/json/mapgen/church.json
> +share/cataclysm-dda/json/mapgen/construction_site.json
> +share/cataclysm-dda/json/mapgen/daycare.json
>  share/cataclysm-dda/json/mapgen/debug_ramps.json
> +share/cataclysm-dda/json/mapgen/derelict_property.json
>  share/cataclysm-dda/json/mapgen/diner.json
> +share/cataclysm-dda/json/mapgen/dirtroad.json
> +share/cataclysm-dda/json/mapgen/dispensary.json
>  share/cataclysm-dda/json/mapgen/dojo.json
> -share/cataclysm-dda/json/mapgen/electronics0.json
> -share/cataclysm-dda/json/mapgen/electronics1.json
> +share/cataclysm-dda/json/mapgen/dollar_store.json
> +share/cataclysm-dda/json/mapgen/dump.json
> +share/cataclysm-dda/json/mapgen/dumpsite.json
>  share/cataclysm-dda/json/mapgen/evac_center.json
> +share/cataclysm-dda/json/mapgen/faction_buildings.json
>  share/cataclysm-dda/json/mapgen/farm.json
> +share/cataclysm-dda/json/mapgen/farm_dairy.json
> +share/cataclysm-dda/json/mapgen/farm_tree.json
> +share/cataclysm-dda/json/mapgen/field_baseball.json
>  share/cataclysm-dda/json/mapgen/field_football.json
>  share/cataclysm-dda/json/mapgen/fire_station.json
> -share/cataclysm-dda/json/mapgen/fortified_house01.json
> -share/cataclysm-dda/json/mapgen/furniture.json
> +share/cataclysm-dda/json/mapgen/gambling_hall.json
>  share/cataclysm-dda/json/mapgen/garage.json
>  share/cataclysm-dda/json/mapgen/garage_gas.json
> +share/cataclysm-dda/json/mapgen/garden_botanical.json
> +share/cataclysm-dda/json/mapgen/garden_community.json
> +share/cataclysm-dda/json/mapgen/garden_public.json
>  share/cataclysm-dda/json/mapgen/gardening_store.json
> -share/cataclysm-dda/json/mapgen/grocery0.json
> -share/cataclysm-dda/json/mapgen/grocery1.json
> +share/cataclysm-dda/json/mapgen/golfcourse.json
>  share/cataclysm-dda/json/mapgen/gunsmith.json
> -share/cataclysm-dda/json/mapgen/gunstore_home_defense.json
>  share/cataclysm-dda/json/mapgen/gym.json
> -share/cataclysm-dda/json/mapgen/hardware1.json
> -share/cataclysm-dda/json/mapgen/hardware2.json
> -share/cataclysm-dda/json/mapgen/hardware3.json
> -share/cataclysm-dda/json/mapgen/hardware4.json
> +share/cataclysm-dda/json/mapgen/headshop.json
>  share/cataclysm-dda/json/mapgen/homeimprovement.json
>  share/cataclysm-dda/json/mapgen/homeimprovement_superstore.json
> -share/cataclysm-dda/json/mapgen/hospital/
> -share/cataclysm-dda/json/mapgen/hospital/hospital.json
> +share/cataclysm-dda/json/mapgen/homeless_camp.json
> +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/crack_house.json
> +share/cataclysm-dda/json/mapgen/house/detached_house.json
>  share/cataclysm-dda/json/mapgen/house/house04.json
>  share/cataclysm-dda/json/mapgen/house/house05.json
>  share/cataclysm-dda/json/mapgen/house/house05_ab.json
> @@ -377,8 +386,10 @@ share/cataclysm-dda/json/mapgen/house/ho
>  share/cataclysm-dda/json/mapgen/house/house17.json
>  share/cataclysm-dda/json/mapgen/house/house18.json
>  share/cataclysm-dda/json/mapgen/house/house19.json
> +share/cataclysm-dda/json/mapgen/house/house_2story.json
>  share/cataclysm-dda/json/mapgen/house/house_dogs.json
>  share/cataclysm-dda/json/mapgen/house/house_duplex.json
> +share/cataclysm-dda/json/mapgen/house/house_fortified.json
>  share/cataclysm-dda/json/mapgen/house/house_garage.json
>  share/cataclysm-dda/json/mapgen/house/house_garage2.json
>  share/cataclysm-dda/json/mapgen/house/house_garage3.json
> @@ -393,29 +404,48 @@ share/cataclysm-dda/json/mapgen/house/ho
>  share/cataclysm-dda/json/mapgen/house/house_modern_lx.json
>  share/cataclysm-dda/json/mapgen/house/house_patio.json
>  share/cataclysm-dda/json/mapgen/house/house_porch.json
> +share/cataclysm-dda/json/mapgen/house/house_prepper.json
>  share/cataclysm-dda/json/mapgen/house/house_quiverfull.json
> +share/cataclysm-dda/json/mapgen/house/house_rural.json
>  share/cataclysm-dda/json/mapgen/house/house_rv.json
>  share/cataclysm-dda/json/mapgen/house/house_suicide.json
>  share/cataclysm-dda/json/mapgen/house/house_tool_shed.json
> +share/cataclysm-dda/json/mapgen/house/house_vacant.json
> +share/cataclysm-dda/json/mapgen/hunting_blind.json
>  share/cataclysm-dda/json/mapgen/jewel_store.json
> +share/cataclysm-dda/json/mapgen/junkyard.json
> +share/cataclysm-dda/json/mapgen/lab/
> +share/cataclysm-dda/json/mapgen/lab/lab_central.json
> +share/cataclysm-dda/json/mapgen/lab/lab_common.json
> +share/cataclysm-dda/json/mapgen/lab/lab_floorplan_cross.json
> +share/cataclysm-dda/json/mapgen/lab/lab_floorplans.json
> +share/cataclysm-dda/json/mapgen/lab/lab_floorplans_1side.json
> +share/cataclysm-dda/json/mapgen/lab/lab_floorplans_finale1level.json
> +share/cataclysm-dda/json/mapgen/lab/lab_rooms.json
> +share/cataclysm-dda/json/mapgen/lab/lab_trains.json
> +share/cataclysm-dda/json/mapgen/lan_center.json
> +share/cataclysm-dda/json/mapgen/landfill.json
> +share/cataclysm-dda/json/mapgen/landscaping_supply.json
>  share/cataclysm-dda/json/mapgen/laundromat.json
> -share/cataclysm-dda/json/mapgen/library1.json
> -share/cataclysm-dda/json/mapgen/library2.json
> +share/cataclysm-dda/json/mapgen/library.json
>  share/cataclysm-dda/json/mapgen/lmoe.json
> -share/cataclysm-dda/json/mapgen/lmoe_under01.json
> -share/cataclysm-dda/json/mapgen/lmoe_under02.json
> +share/cataclysm-dda/json/mapgen/lot_empty_commercial.json
> +share/cataclysm-dda/json/mapgen/lot_empty_residential.json
> +share/cataclysm-dda/json/mapgen/lumberyard.json
>  share/cataclysm-dda/json/mapgen/mall.json
> -share/cataclysm-dda/json/mapgen/mansion/
> -share/cataclysm-dda/json/mapgen/mansion/mansion.json
> +share/cataclysm-dda/json/mapgen/mansion.json
>  share/cataclysm-dda/json/mapgen/mapgen-test.json
> +share/cataclysm-dda/json/mapgen/mass_grave.json
>  share/cataclysm-dda/json/mapgen/meth_lab.json
> +share/cataclysm-dda/json/mapgen/mil_surplus.json
> +share/cataclysm-dda/json/mapgen/moonshine_camp.json
>  share/cataclysm-dda/json/mapgen/mortuary.json
>  share/cataclysm-dda/json/mapgen/motel.json
> -share/cataclysm-dda/json/mapgen/multistory_houses/
> -share/cataclysm-dda/json/mapgen/multistory_houses/house_2story_base_north.json
> -share/cataclysm-dda/json/mapgen/multistory_houses/house_2story_second.json
> +share/cataclysm-dda/json/mapgen/movie_theater.json
>  share/cataclysm-dda/json/mapgen/museum.json
> +share/cataclysm-dda/json/mapgen/music_venue.json
>  share/cataclysm-dda/json/mapgen/musicstore.json
> +share/cataclysm-dda/json/mapgen/natural_spring.json
>  share/cataclysm-dda/json/mapgen/necropolis/
>  share/cataclysm-dda/json/mapgen/necropolis/necropolis.json
>  share/cataclysm-dda/json/mapgen/necropolis/necropolisB1.json
> @@ -423,34 +453,24 @@ share/cataclysm-dda/json/mapgen/necropol
>  share/cataclysm-dda/json/mapgen/necropolis/necropolisB3.json
>  share/cataclysm-dda/json/mapgen/office_cubical.json
>  share/cataclysm-dda/json/mapgen/office_doctor.json
> +share/cataclysm-dda/json/mapgen/office_small.json
>  share/cataclysm-dda/json/mapgen/office_tower_2.json
>  share/cataclysm-dda/json/mapgen/orchard_apple.json
> +share/cataclysm-dda/json/mapgen/orchard_fruit.json
> +share/cataclysm-dda/json/mapgen/paintball_field.json
>  share/cataclysm-dda/json/mapgen/park.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/
> -share/cataclysm-dda/json/mapgen/parks_recreation/art_gallery.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/cemetery_small.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/derelict_property.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/dispensary.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond0_0.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond0_1.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond1_0.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond1_1.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/hunting_blind.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/orchard.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/pavilion.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/skate_park.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/small_office.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/small_storage_units.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/small_wooded_trail.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/state_park0_0.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/state_park0_1.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/state_park1_0.json
> -share/cataclysm-dda/json/mapgen/parks_recreation/state_park1_1.json
> -share/cataclysm-dda/json/mapgen/pharmacy_1.json
> -share/cataclysm-dda/json/mapgen/pharmacy_1_open.json
> +share/cataclysm-dda/json/mapgen/park_skate.json
> +share/cataclysm-dda/json/mapgen/park_state.json
> +share/cataclysm-dda/json/mapgen/pavilion.json
> +share/cataclysm-dda/json/mapgen/pawn_shop.json
> +share/cataclysm-dda/json/mapgen/petstore.json
> +share/cataclysm-dda/json/mapgen/pharmacy.json
>  share/cataclysm-dda/json/mapgen/pizza_parlor.json
> +share/cataclysm-dda/json/mapgen/pond_fishing.json
> +share/cataclysm-dda/json/mapgen/pond_public.json
>  share/cataclysm-dda/json/mapgen/ponds.json
>  share/cataclysm-dda/json/mapgen/pool.json
> +share/cataclysm-dda/json/mapgen/post_office.json
>  share/cataclysm-dda/json/mapgen/power_station_large.json
>  share/cataclysm-dda/json/mapgen/power_station_small.json
>  share/cataclysm-dda/json/mapgen/prison_1.json
> @@ -458,41 +478,54 @@ share/cataclysm-dda/json/mapgen/public_w
>  share/cataclysm-dda/json/mapgen/pump_station.json
>  share/cataclysm-dda/json/mapgen/radio_tower.json
>  share/cataclysm-dda/json/mapgen/ranch_camp.json
> +share/cataclysm-dda/json/mapgen/recycle_center.json
>  share/cataclysm-dda/json/mapgen/restaurant.json
> -share/cataclysm-dda/json/mapgen/restaurant2.json
>  share/cataclysm-dda/json/mapgen/restaurant_fast.json
> +share/cataclysm-dda/json/mapgen/reststop.json
>  share/cataclysm-dda/json/mapgen/river_shipwreck.json
>  share/cataclysm-dda/json/mapgen/road_4way.json
>  share/cataclysm-dda/json/mapgen/roadstop.json
> -share/cataclysm-dda/json/mapgen/roadstop_a.json
> -share/cataclysm-dda/json/mapgen/roadstop_b.json
> -share/cataclysm-dda/json/mapgen/s_gas_rural.json
> -share/cataclysm-dda/json/mapgen/s_gun0.json
> -share/cataclysm-dda/json/mapgen/s_library.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
> +share/cataclysm-dda/json/mapgen/s_coffee.json
> +share/cataclysm-dda/json/mapgen/s_electronics.json
> +share/cataclysm-dda/json/mapgen/s_furniture.json
> +share/cataclysm-dda/json/mapgen/s_gas.json
> +share/cataclysm-dda/json/mapgen/s_grocery.json
> +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_liquor.json
>  share/cataclysm-dda/json/mapgen/sai.json
>  share/cataclysm-dda/json/mapgen/school_1.json
>  share/cataclysm-dda/json/mapgen/shelter.json
> -share/cataclysm-dda/json/mapgen/small_town_buildings/
> -share/cataclysm-dda/json/mapgen/small_town_buildings/bakery.json
> -share/cataclysm-dda/json/mapgen/small_town_buildings/candy_shop.json
> -share/cataclysm-dda/json/mapgen/small_town_buildings/construction_site.json
> -share/cataclysm-dda/json/mapgen/small_town_buildings/icecream_shop.json
> -share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_0_0.json
> -share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_0_1.json
> -share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_1_0.json
> -share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_1_1.json
> -share/cataclysm-dda/json/mapgen/small_town_buildings/post_office.json
> +share/cataclysm-dda/json/mapgen/shooting_range.json
> +share/cataclysm-dda/json/mapgen/smallscrapyard.json
> +share/cataclysm-dda/json/mapgen/smoke_lounge.json
> +share/cataclysm-dda/json/mapgen/sports_store.json
> +share/cataclysm-dda/json/mapgen/stadium_football.json
>  share/cataclysm-dda/json/mapgen/standing_stones.json
> +share/cataclysm-dda/json/mapgen/station_radio.json
> +share/cataclysm-dda/json/mapgen/storage_units_large.json
> +share/cataclysm-dda/json/mapgen/storage_units_medium.json
> +share/cataclysm-dda/json/mapgen/storage_units_small.json
> +share/cataclysm-dda/json/mapgen/stripclub.json
>  share/cataclysm-dda/json/mapgen/sub_station.json
> -share/cataclysm-dda/json/mapgen/subway_tunnels.json
>  share/cataclysm-dda/json/mapgen/sugar_house.json
>  share/cataclysm-dda/json/mapgen/swamp_shack.json
>  share/cataclysm-dda/json/mapgen/teashop.json
> +share/cataclysm-dda/json/mapgen/thrift.json
> +share/cataclysm-dda/json/mapgen/trail_nature.json
> +share/cataclysm-dda/json/mapgen/trail_small.json
> +share/cataclysm-dda/json/mapgen/trailer_park.json
>  share/cataclysm-dda/json/mapgen/triffid_grove.json
>  share/cataclysm-dda/json/mapgen/veterinarian.json
> +share/cataclysm-dda/json/mapgen/vfw.json
>  share/cataclysm-dda/json/mapgen/warehouse.json
> +share/cataclysm-dda/json/mapgen/zoo.json
>  share/cataclysm-dda/json/mapgen_palettes/
> +share/cataclysm-dda/json/mapgen_palettes/acidia_camp_palette.json
>  share/cataclysm-dda/json/mapgen_palettes/basement.json
>  share/cataclysm-dda/json/mapgen_palettes/church.json
>  share/cataclysm-dda/json/mapgen_palettes/evac_center.json
> @@ -500,7 +533,9 @@ share/cataclysm-dda/json/mapgen_palettes
>  share/cataclysm-dda/json/mapgen_palettes/houses_multistory.json
>  share/cataclysm-dda/json/mapgen_palettes/lumberyard.json
>  share/cataclysm-dda/json/mapgen_palettes/mansion.json
> +share/cataclysm-dda/json/mapgen_palettes/mil_surplus.json
>  share/cataclysm-dda/json/mapgen_palettes/office_doctor.json
> +share/cataclysm-dda/json/mapgen_palettes/road.json
>  share/cataclysm-dda/json/mapgen_palettes/shelter.json
>  share/cataclysm-dda/json/mapgen_palettes/subway.json
>  share/cataclysm-dda/json/martialarts.json
> @@ -510,6 +545,7 @@ share/cataclysm-dda/json/monster_drops.j
>  share/cataclysm-dda/json/monster_factions.json
>  share/cataclysm-dda/json/monsterdrops/
>  share/cataclysm-dda/json/monsterdrops/zombie_cop.json
> +share/cataclysm-dda/json/monsterdrops/zombie_military_pilot.json
>  share/cataclysm-dda/json/monsterdrops/zombie_soldier.json
>  share/cataclysm-dda/json/monsterdrops/zombie_survivor.json
>  share/cataclysm-dda/json/monsterdrops/zombie_technician.json
> @@ -530,12 +566,9 @@ share/cataclysm-dda/json/monsters/triffi
>  share/cataclysm-dda/json/monsters/zed_children.json
>  share/cataclysm-dda/json/monsters/zed_explosive.json
>  share/cataclysm-dda/json/morale_types.json
> -share/cataclysm-dda/json/multitile_buildings_terrain.json
> -share/cataclysm-dda/json/multitile_city_buildings.json
>  share/cataclysm-dda/json/mutation_category.json
>  share/cataclysm-dda/json/mutation_ordering.json
>  share/cataclysm-dda/json/mutations.json
> -share/cataclysm-dda/json/npc_destination_locations.json
>  share/cataclysm-dda/json/npcs/
>  share/cataclysm-dda/json/npcs/NC_ARSONIST.json
>  share/cataclysm-dda/json/npcs/NC_BARTENDER.json
> @@ -563,19 +596,23 @@ share/cataclysm-dda/json/npcs/TALK_EVAC_
>  share/cataclysm-dda/json/npcs/TALK_OLD_GUARD_REP.json
>  share/cataclysm-dda/json/npcs/TALK_SCAVENGER_MERC.json
>  share/cataclysm-dda/json/npcs/classes.json
> +share/cataclysm-dda/json/npcs/destination_locations.json
>  share/cataclysm-dda/json/npcs/epilogues.json
>  share/cataclysm-dda/json/npcs/factions.json
> +share/cataclysm-dda/json/npcs/hints.json
>  share/cataclysm-dda/json/npcs/items_generic.json
>  share/cataclysm-dda/json/npcs/missiondef.json
>  share/cataclysm-dda/json/npcs/npc.json
>  share/cataclysm-dda/json/npcs/talk_tags.json
> +share/cataclysm-dda/json/overmap/
> +share/cataclysm-dda/json/overmap/multitile_buildings_terrain.json
> +share/cataclysm-dda/json/overmap/multitile_city_buildings.json
> +share/cataclysm-dda/json/overmap/special_locations.json
> +share/cataclysm-dda/json/overmap/specials.json
>  share/cataclysm-dda/json/overmap_connections.json
> -share/cataclysm-dda/json/overmap_special_locations.json
> -share/cataclysm-dda/json/overmap_specials.json
>  share/cataclysm-dda/json/overmap_terrain.json
>  share/cataclysm-dda/json/player_activities.json
>  share/cataclysm-dda/json/professions.json
> -share/cataclysm-dda/json/ranged_balance.json
>  share/cataclysm-dda/json/recipes/
>  share/cataclysm-dda/json/recipes/ammo/
>  share/cataclysm-dda/json/recipes/ammo/components.json
> @@ -599,10 +636,12 @@ share/cataclysm-dda/json/recipes/chem/ot
>  share/cataclysm-dda/json/recipes/electronics/
>  share/cataclysm-dda/json/recipes/electronics/parts.json
>  share/cataclysm-dda/json/recipes/electronics/toolmod.json
> +share/cataclysm-dda/json/recipes/engines.json
>  share/cataclysm-dda/json/recipes/food/
>  share/cataclysm-dda/json/recipes/food/brewing.json
>  share/cataclysm-dda/json/recipes/food/distill.json
>  share/cataclysm-dda/json/recipes/food/dry.json
> +share/cataclysm-dda/json/recipes/food/frozen.json
>  share/cataclysm-dda/json/recipes/food/pasta.json
>  share/cataclysm-dda/json/recipes/food/seed.json
>  share/cataclysm-dda/json/recipes/other/
> @@ -614,11 +653,15 @@ share/cataclysm-dda/json/recipes/other/p
>  share/cataclysm-dda/json/recipes/other/tool.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_construction_om.json
>  share/cataclysm-dda/json/recipes/recipe_deconstruction.json
>  share/cataclysm-dda/json/recipes/recipe_electronics.json
>  share/cataclysm-dda/json/recipes/recipe_food.json
> +share/cataclysm-dda/json/recipes/recipe_groups.json
>  share/cataclysm-dda/json/recipes/recipe_medsandchemicals.json
>  share/cataclysm-dda/json/recipes/recipe_others.json
> +share/cataclysm-dda/json/recipes/recipe_vehicle.json
>  share/cataclysm-dda/json/recipes/recipe_weapon.json
>  share/cataclysm-dda/json/recipes/recipes.json
>  share/cataclysm-dda/json/recipes/weapon/
> @@ -673,16 +716,21 @@ share/cataclysm-dda/json/vehicle_groups.
>  share/cataclysm-dda/json/vehicle_parts.json
>  share/cataclysm-dda/json/vehicleparts/
>  share/cataclysm-dda/json/vehicleparts/alternator.json
> +share/cataclysm-dda/json/vehicleparts/armor.json
>  share/cataclysm-dda/json/vehicleparts/battery.json
>  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/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/motor.json
> +share/cataclysm-dda/json/vehicleparts/rams.json
>  share/cataclysm-dda/json/vehicleparts/tanks.json
>  share/cataclysm-dda/json/vehicleparts/turret.json
> +share/cataclysm-dda/json/vehicleparts/vp_flags.json
>  share/cataclysm-dda/json/vehicleparts/wheel.json
>  share/cataclysm-dda/json/vehicles/
>  share/cataclysm-dda/json/vehicles/bikes.json
> @@ -691,6 +739,7 @@ share/cataclysm-dda/json/vehicles/carts.
>  share/cataclysm-dda/json/vehicles/custom_vehicles.json
>  share/cataclysm-dda/json/vehicles/emergency.json
>  share/cataclysm-dda/json/vehicles/farm.json
> +share/cataclysm-dda/json/vehicles/helicopters.json
>  share/cataclysm-dda/json/vehicles/military.json
>  share/cataclysm-dda/json/vehicles/trucks.json
>  share/cataclysm-dda/json/vehicles/utility.json
> @@ -719,9 +768,15 @@ share/cataclysm-dda/mods/Boats/b_var_woo
>  share/cataclysm-dda/mods/Boats/b_vehicles.json
>  share/cataclysm-dda/mods/Boats/b_wooden_boat_parts.json
>  share/cataclysm-dda/mods/Boats/modinfo.json
> +share/cataclysm-dda/mods/Boats/overmap_terrain.json
> +share/cataclysm-dda/mods/Boats/specials.json
> +share/cataclysm-dda/mods/Boats/whaleys_boat_rental.json
> +share/cataclysm-dda/mods/Boats/whaleys_boats.json
> +share/cataclysm-dda/mods/Boats/whaleys_house_river.json
>  share/cataclysm-dda/mods/BrightNights/
>  share/cataclysm-dda/mods/BrightNights/bionics.json
>  share/cataclysm-dda/mods/BrightNights/effects.json
> +share/cataclysm-dda/mods/BrightNights/game_balance.json
>  share/cataclysm-dda/mods/BrightNights/gun.json
>  share/cataclysm-dda/mods/BrightNights/item groups/
>  share/cataclysm-dda/mods/BrightNights/item groups/locations.json
> @@ -730,6 +785,7 @@ share/cataclysm-dda/mods/BrightNights/it
>  share/cataclysm-dda/mods/BrightNights/items/bionics.json
>  share/cataclysm-dda/mods/BrightNights/items/books.json
>  share/cataclysm-dda/mods/BrightNights/items/generic.json
> +share/cataclysm-dda/mods/BrightNights/items/med.json
>  share/cataclysm-dda/mods/BrightNights/mapgen/
>  share/cataclysm-dda/mods/BrightNights/mapgen/map_palletes.json
>  share/cataclysm-dda/mods/BrightNights/mapgen/municipal_microreactor.json
> @@ -751,10 +807,13 @@ 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/CrazyCataclysm/
> -share/cataclysm-dda/mods/CrazyCataclysm/aperturepotato.json
> -share/cataclysm-dda/mods/CrazyCataclysm/items.json
> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_aperturepotato.json
> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_comestibles.json
> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_item_groups.json
> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_items.json
> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_monsters.json
> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_speech.json
>  share/cataclysm-dda/mods/CrazyCataclysm/modinfo.json
> -share/cataclysm-dda/mods/CrazyCataclysm/speech.json
>  share/cataclysm-dda/mods/DeoxyMod/
>  share/cataclysm-dda/mods/DeoxyMod/Deoxy_vehicle_parts.json
>  share/cataclysm-dda/mods/DeoxyMod/modinfo.json
> @@ -805,6 +864,9 @@ share/cataclysm-dda/mods/Generic_Guns/gg
>  share/cataclysm-dda/mods/Generic_Guns/gg_other_blacklist.json
>  share/cataclysm-dda/mods/Generic_Guns/gg_vehicle_override.json
>  share/cataclysm-dda/mods/Generic_Guns/modinfo.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.json
>  share/cataclysm-dda/mods/Medieval_Stuff/ammo_types.json
> @@ -1753,6 +1815,9 @@ share/cataclysm-dda/mods/Only_Wildlife/m
>  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/Slow_Zombies/
>  share/cataclysm-dda/mods/Slow_Zombies/main.lua
>  share/cataclysm-dda/mods/Slow_Zombies/modinfo.json
> @@ -1763,17 +1828,19 @@ 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/mapgen.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/overmap_specials.json
> -share/cataclysm-dda/mods/Tanks/overmap_terrain.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/Tough_Zombies/
>  share/cataclysm-dda/mods/Tough_Zombies/main.lua
>  share/cataclysm-dda/mods/Tough_Zombies/modinfo.json
> @@ -1858,6 +1925,9 @@ share/cataclysm-dda/mods/blazemod/blaze_
>  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
> @@ -1939,14 +2009,10 @@ share/locale/es_ES/
>  share/locale/es_ES/LC_MESSAGES/
>  share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo
>  share/locale/fr/LC_MESSAGES/cataclysm-dda.mo
> -share/locale/it_IT/
> -share/locale/it_IT/LC_MESSAGES/
> -share/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo
> +share/locale/hu/LC_MESSAGES/cataclysm-dda.mo
>  share/locale/ja/LC_MESSAGES/cataclysm-dda.mo
>  share/locale/ko/LC_MESSAGES/cataclysm-dda.mo
>  share/locale/pl/LC_MESSAGES/cataclysm-dda.mo
> -share/locale/pt_BR/LC_MESSAGES/cataclysm-dda.mo
>  share/locale/ru/LC_MESSAGES/cataclysm-dda.mo
> -share/locale/sr/LC_MESSAGES/cataclysm-dda.mo
>  share/locale/zh_CN/LC_MESSAGES/cataclysm-dda.mo
>  share/locale/zh_TW/LC_MESSAGES/cataclysm-dda.mo
>

Reply | Threaded
Open this post in threaded view
|

Re: [UPDATE] games/cataclysm-dda 2018.06.28 -> 2018.09.02

Brian Callahan-3

On 09/03/18 11:28, Charlene Wendling wrote:
> Hi Tim, ports,
>
> The game builds fine on a fresh amd64 vm.
>
> I played it on my own machine for several games without any crashes or
> other issues. Fun but unforgiving game :)

Committed, thanks!

~Brian

> Charlène.
>
>
> On Sun, 02 Sep 2018 19:42:13 -0400
> trondd wrote:
>
>> Another update with piles of changes.  Too much to list but if you
>> haven't played a newer version somewhere else, your water can freeze
>> now and you can't drink it.
>>
>> Tim.
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
>> retrieving revision 1.5
>> diff -u -p -r1.5 Makefile
>> --- Makefile 3 Jul 2018 14:32:48 -0000 1.5
>> +++ Makefile 2 Sep 2018 23:25:05 -0000
>> @@ -1,12 +1,12 @@
>>   # $OpenBSD: Makefile,v 1.5 2018/07/03 14:32:48 bcallah Exp $
>>  
>>   COMMENT= rogue-like zombie survival game
>> -DISTNAME= cataclysm-dda-2018.06.28
>> +DISTNAME= cataclysm-dda-2018.09.02
>>   CATEGORIES= games
>>  
>>   GH_ACCOUNT= CleverRaven
>>   GH_PROJECT= Cataclysm-DDA
>> -GH_COMMIT= 1db1b62b57a38c18e5f118fb57dcb1290d42d9b9
>> +GH_COMMIT= 47298ed1dea10582ae57a3decfe548640ac576de
>>  
>>   HOMEPAGE= http://en.cataclysmdda.com
>>   MAINTAINER= Tim Meunier <[hidden email]>
>> @@ -33,8 +33,8 @@ LIB_DEPENDS= devel/gettext
>>  
>>   MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
>>  
>> -MAKE_FLAGS= RELEASE=1 USE_XDG_DIR=1 LOCALIZE=1
>> LANGUAGES=all \
>> - LUA=1 LUA_BINARY=${MODLUA_BIN:T}
>> +MAKE_FLAGS= ASTYLE=0 RELEASE=1 USE_XDG_DIR=1
>> LOCALIZE=1 \
>> + LANGUAGES=all LUA=1 LUA_BINARY=$
>> {MODLUA_BIN:T}
>>   .if ${FLAVOR:Mno_x11}
>>   WANTLIB+= curses
>> Index: distinfo
>> ===================================================================
>> RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v
>> retrieving revision 1.4
>> diff -u -p -r1.4 distinfo
>> --- distinfo 3 Jul 2018 14:32:48 -0000 1.4
>> +++ distinfo 2 Sep 2018 23:25:05 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (cataclysm-dda-2018.06.28-1db1b62b.tar.gz) =
>> Ja37CLFcbbl1/6fCfe7lq38SxXSqg0d2ulmCuwhAhlg= -SIZE
>> (cataclysm-dda-2018.06.28-1db1b62b.tar.gz) = 64208890 +SHA256
>> (cataclysm-dda-2018.09.02-47298ed1.tar.gz) =
>> JPSV9YJD5kx5dzvVodr8xB6deRp3JnFQN3ysWdaV61w= +SIZE
>> (cataclysm-dda-2018.09.02-47298ed1.tar.gz) = 64529975 Index:
>> patches/patch-Makefile
>> ===================================================================
>> RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v
>> retrieving revision 1.5 diff -u -p -r1.5 patch-Makefile
>> --- patches/patch-Makefile 3 Jul 2018 14:32:48 -0000 1.5
>> +++ patches/patch-Makefile 2 Sep 2018 23:25:05 -0000
>> @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.5 2018/07/0
>>   Index: Makefile
>>   --- Makefile.orig
>>   +++ Makefile
>> -@@ -78,7 +78,6 @@
>> +@@ -84,7 +84,6 @@
>>    # RELEASE is flags for release builds, this disables some debugging
>>    # flags and enforces build failure when warnings are encountered.
>>    # We want to error on everything to make sure we don't check in
>>    # code with new warnings.
>> @@ -11,7 +11,7 @@ Index: Makefile
>>    WARNINGS = -Wall -Wextra
>>    # Uncomment below to disable warnings
>>    #WARNINGS = -w
>> -@@ -229,7 +228,6 @@ ifdef RELEASE
>> +@@ -254,7 +253,6 @@ ifdef RELEASE
>>          OPTLEVEL = -O3
>>        endif
>>      endif
>> @@ -19,16 +19,7 @@ Index: Makefile
>>    
>>      ifdef LTO
>>        LDFLAGS += -fuse-ld=gold
>> -@@ -250,7 +248,7 @@ ifdef RELEASE
>> -   endif
>> -   DEFINES += -DRELEASE
>> -   # Check for astyle or JSON regressions on release builds.
>> --  CHECKS = astyle-check style-json
>> -+  CHECKS = style-json
>> - endif
>> -
>> - ifndef RELEASE
>> -@@ -265,7 +263,7 @@ endif
>> +@@ -295,7 +293,7 @@ endif
>>    ifeq ($(shell sh -c 'uname -o 2>/dev/null || echo not'),Cygwin)
>>        OTHERS += -std=gnu++11
>>      else
>> @@ -37,7 +28,7 @@ Index: Makefile
>>    endif
>>    
>>    CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS)
>> -MMD -MP -@@ -406,11 +404,6 @@ ifdef MAPSIZE
>> +@@ -440,11 +438,6 @@ ifdef MAPSIZE
>>        CXXFLAGS += -DMAPSIZE=$(MAPSIZE)
>>    endif
>>    
>> @@ -49,7 +40,7 @@ Index: Makefile
>>    PKG_CONFIG = $(CROSS)pkg-config
>>    SDL2_CONFIG = $(CROSS)sdl2-config
>>    
>> -@@ -708,7 +701,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
>> +@@ -773,7 +766,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(OBJS)
>>    .PHONY: version json-verify
>>    version:
>>     @( VERSION_STRING=$(VERSION) ; \
>> @@ -57,7 +48,7 @@ Index: Makefile
>>                [ -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 \ ) -@@ -762,35
>> +754,35 @@ distclean: +@@ -827,35 +819,35 @@ distclean:
>>    bindist: $(BINDIST)
>>    
>>    ifeq ($(TARGETSYSTEM), LINUX)
>> @@ -112,7 +103,7 @@ Index: Makefile
>>     mkdir -p $(LOCALE_DIR)
>>    ifdef LANGUAGES
>>     LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
>> -@@ -959,11 +951,6 @@ astyle: $(ASTYLED_WHITELIST)
>> +@@ -1027,11 +1019,6 @@ astyle: $(ASTYLED_WHITELIST)
>>    astyle-all: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR) $(TOOLSRC)
>>     $(ASTYLE_BINARY) --options=.astylerc -n $(SOURCES) $
>> (HEADERS) $(ASTYLE_BINARY) --options=.astylerc -n $(TESTSRC) $
>> (TESTHDR) Index: pkg/PLIST
>> ===================================================================
>> RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v
>> retrieving revision 1.4
>> diff -u -p -r1.4 PLIST
>> --- pkg/PLIST 3 Jul 2018 14:32:48 -0000 1.4
>> +++ pkg/PLIST 2 Sep 2018 23:25:06 -0000
>> @@ -31,19 +31,18 @@ share/cataclysm-dda/json/anatomy.json
>>   share/cataclysm-dda/json/bionics.json
>>   share/cataclysm-dda/json/body_parts.json
>>   share/cataclysm-dda/json/construction.json
>> +share/cataclysm-dda/json/corpses.json
>>   share/cataclysm-dda/json/default_blacklist.json
>>   share/cataclysm-dda/json/doll_speech.json
>>   share/cataclysm-dda/json/dreams.json
>>   share/cataclysm-dda/json/effects.json
>>   share/cataclysm-dda/json/emit.json
>> -share/cataclysm-dda/json/faults.json
>>   share/cataclysm-dda/json/flags.json
>>   share/cataclysm-dda/json/furniture.json
>>   share/cataclysm-dda/json/game_balance.json
>>   share/cataclysm-dda/json/gates.json
>>   share/cataclysm-dda/json/harvest.json
>>   share/cataclysm-dda/json/health_msgs.json
>> -share/cataclysm-dda/json/hints.json
>>   share/cataclysm-dda/json/item_actions.json
>>   share/cataclysm-dda/json/item_category.json
>>   share/cataclysm-dda/json/item_groups.json
>> @@ -51,7 +50,9 @@ share/cataclysm-dda/json/itemgroups/
>>   share/cataclysm-dda/json/itemgroups/ammo.json
>>   share/cataclysm-dda/json/itemgroups/books.json
>>   share/cataclysm-dda/json/itemgroups/clothing.json
>> +share/cataclysm-dda/json/itemgroups/defense_mode.json
>>   share/cataclysm-dda/json/itemgroups/drugs.json
>> +share/cataclysm-dda/json/itemgroups/faction_camps.json
>>   share/cataclysm-dda/json/itemgroups/forage.json
>>   share/cataclysm-dda/json/itemgroups/gear.json
>>   share/cataclysm-dda/json/itemgroups/gunmod.json
>> @@ -60,6 +61,7 @@ share/cataclysm-dda/json/itemgroups/loca
>>   share/cataclysm-dda/json/itemgroups/magazines.json
>>   share/cataclysm-dda/json/itemgroups/main.json
>>   share/cataclysm-dda/json/itemgroups/mansion.json
>> +share/cataclysm-dda/json/itemgroups/map_extras.json
>>   share/cataclysm-dda/json/itemgroups/misc.json
>>   share/cataclysm-dda/json/itemgroups/monster_drops.json
>>   share/cataclysm-dda/json/itemgroups/supplies.json
>> @@ -102,6 +104,7 @@ share/cataclysm-dda/json/items/ammo/9x18
>>   share/cataclysm-dda/json/items/ammo/flintlock.json
>>   share/cataclysm-dda/json/items/ammo/metal_rail.json
>>   share/cataclysm-dda/json/items/ammo/nail.json
>> +share/cataclysm-dda/json/items/ammo/paintball.json
>>   share/cataclysm-dda/json/items/ammo/shot.json
>>   share/cataclysm-dda/json/items/ammo/signal_flare.json
>>   share/cataclysm-dda/json/items/ammo/weldgas.json
>> @@ -157,6 +160,7 @@ share/cataclysm-dda/json/items/comestibl
>>   share/cataclysm-dda/json/items/comestibles/carnivore.json
>>   share/cataclysm-dda/json/items/comestibles/drink.json
>>   share/cataclysm-dda/json/items/comestibles/egg.json
>> +share/cataclysm-dda/json/items/comestibles/frozen.json
>>   share/cataclysm-dda/json/items/comestibles/med.json
>>   share/cataclysm-dda/json/items/comestibles/mutagen.json
>>   share/cataclysm-dda/json/items/comestibles/protein.json
>> @@ -211,6 +215,7 @@ share/cataclysm-dda/json/items/gun/flamm
>>   share/cataclysm-dda/json/items/gun/flintlock.json
>>   share/cataclysm-dda/json/items/gun/metal_rail.json
>>   share/cataclysm-dda/json/items/gun/nail.json
>> +share/cataclysm-dda/json/items/gun/paintball.json
>>   share/cataclysm-dda/json/items/gun/shot.json
>>   share/cataclysm-dda/json/items/gun/signal_flare.json
>>   share/cataclysm-dda/json/items/gun/ups.json
>> @@ -277,25 +282,32 @@ share/cataclysm-dda/json/items/toolmod.j
>>   share/cataclysm-dda/json/items/tools.json
>>   share/cataclysm-dda/json/items/vehicle/
>>   share/cataclysm-dda/json/items/vehicle/alternator.json
>> +share/cataclysm-dda/json/items/vehicle/armor.json
>>   share/cataclysm-dda/json/items/vehicle/battery.json
>>   share/cataclysm-dda/json/items/vehicle/engine.json
>>   share/cataclysm-dda/json/items/vehicle/engineering.json
>> +share/cataclysm-dda/json/items/vehicle/rams.json
>>   share/cataclysm-dda/json/items/vehicle/rigs.json
>>   share/cataclysm-dda/json/items/vehicle/wheel.json
>>   share/cataclysm-dda/json/items/vehicle_parts.json
>>   share/cataclysm-dda/json/lab_notes.json
>> -share/cataclysm-dda/json/map_extra_items.json
>>   share/cataclysm-dda/json/mapgen/
>> -share/cataclysm-dda/json/mapgen/Prepper_house01.json
>>   share/cataclysm-dda/json/mapgen/abandoned01.json
>> +share/cataclysm-dda/json/mapgen/abandoned_barn.json
>> +share/cataclysm-dda/json/mapgen/abandoned_shopping_plaza.json
>> +share/cataclysm-dda/json/mapgen/abandoned_warehouse.json
>>   share/cataclysm-dda/json/mapgen/abstorefront.json
>> -share/cataclysm-dda/json/mapgen/ags_station.json
>> +share/cataclysm-dda/json/mapgen/animalpound.json
>> +share/cataclysm-dda/json/mapgen/animalshelter.json
>>   share/cataclysm-dda/json/mapgen/antique_store.json
>>   share/cataclysm-dda/json/mapgen/apartment_con.json
>>   share/cataclysm-dda/json/mapgen/apartment_mod.json
>>   share/cataclysm-dda/json/mapgen/arcade.json
>> +share/cataclysm-dda/json/mapgen/art_gallery.json
>> +share/cataclysm-dda/json/mapgen/bakery.json
>>   share/cataclysm-dda/json/mapgen/bandit_cabin.json
>>   share/cataclysm-dda/json/mapgen/bandit_camp.json
>> +share/cataclysm-dda/json/mapgen/bandit_garage.json
>>   share/cataclysm-dda/json/mapgen/bank.json
>>   share/cataclysm-dda/json/mapgen/bar.json
>>   share/cataclysm-dda/json/mapgen/basement/
>> @@ -303,63 +315,60 @@ share/cataclysm-dda/json/mapgen/basement
>>   share/cataclysm-dda/json/mapgen/basement/basement_chem.json
>>   share/cataclysm-dda/json/mapgen/basement/basement_game.json
>>   share/cataclysm-dda/json/mapgen/basement/basement_guns.json
>> +share/cataclysm-dda/json/mapgen/basement/basement_lab_stairs.json
>>   share/cataclysm-dda/json/mapgen/basement/basement_survival.json
>>   share/cataclysm-dda/json/mapgen/basement/basement_weed.json
>>   share/cataclysm-dda/json/mapgen/bike_shop.json
>> -share/cataclysm-dda/json/mapgen/bookstore1.json
>> -share/cataclysm-dda/json/mapgen/bookstore2.json
>> -share/cataclysm-dda/json/mapgen/bookstore3.json
>>   share/cataclysm-dda/json/mapgen/bowling_alley.json
>>   share/cataclysm-dda/json/mapgen/boxing.json
>>   share/cataclysm-dda/json/mapgen/bunker.json
>>   share/cataclysm-dda/json/mapgen/butcher.json
>> -share/cataclysm-dda/json/mapgen/cabin00.json
>> -share/cataclysm-dda/json/mapgen/cabin03.json
>> -share/cataclysm-dda/json/mapgen/cabin_strange.json
>> +share/cataclysm-dda/json/mapgen/cabin.json
>> +share/cataclysm-dda/json/mapgen/campground.json
>>   share/cataclysm-dda/json/mapgen/campsite.json
>>   share/cataclysm-dda/json/mapgen/cathedral.json
>>   share/cataclysm-dda/json/mapgen/cemetery_4square.json
>> -share/cataclysm-dda/json/mapgen/church_gothic.json
>> -share/cataclysm-dda/json/mapgen/church_new_england.json
>> -share/cataclysm-dda/json/mapgen/clothing0.json
>> -share/cataclysm-dda/json/mapgen/clothing1.json
>> -share/cataclysm-dda/json/mapgen/clothing2.json
>> -share/cataclysm-dda/json/mapgen/clothing3.json
>> -share/cataclysm-dda/json/mapgen/clothing4.json
>> -share/cataclysm-dda/json/mapgen/clothing5.json
>> -share/cataclysm-dda/json/mapgen/clothing6.json
>> -share/cataclysm-dda/json/mapgen/coffee_shop.json
>> -share/cataclysm-dda/json/mapgen/coffee_shop2.json
>> -share/cataclysm-dda/json/mapgen/dairy_farm.json
>> +share/cataclysm-dda/json/mapgen/cemetery_medium.json
>> +share/cataclysm-dda/json/mapgen/cemetery_small.json
>> +share/cataclysm-dda/json/mapgen/church.json
>> +share/cataclysm-dda/json/mapgen/construction_site.json
>> +share/cataclysm-dda/json/mapgen/daycare.json
>>   share/cataclysm-dda/json/mapgen/debug_ramps.json
>> +share/cataclysm-dda/json/mapgen/derelict_property.json
>>   share/cataclysm-dda/json/mapgen/diner.json
>> +share/cataclysm-dda/json/mapgen/dirtroad.json
>> +share/cataclysm-dda/json/mapgen/dispensary.json
>>   share/cataclysm-dda/json/mapgen/dojo.json
>> -share/cataclysm-dda/json/mapgen/electronics0.json
>> -share/cataclysm-dda/json/mapgen/electronics1.json
>> +share/cataclysm-dda/json/mapgen/dollar_store.json
>> +share/cataclysm-dda/json/mapgen/dump.json
>> +share/cataclysm-dda/json/mapgen/dumpsite.json
>>   share/cataclysm-dda/json/mapgen/evac_center.json
>> +share/cataclysm-dda/json/mapgen/faction_buildings.json
>>   share/cataclysm-dda/json/mapgen/farm.json
>> +share/cataclysm-dda/json/mapgen/farm_dairy.json
>> +share/cataclysm-dda/json/mapgen/farm_tree.json
>> +share/cataclysm-dda/json/mapgen/field_baseball.json
>>   share/cataclysm-dda/json/mapgen/field_football.json
>>   share/cataclysm-dda/json/mapgen/fire_station.json
>> -share/cataclysm-dda/json/mapgen/fortified_house01.json
>> -share/cataclysm-dda/json/mapgen/furniture.json
>> +share/cataclysm-dda/json/mapgen/gambling_hall.json
>>   share/cataclysm-dda/json/mapgen/garage.json
>>   share/cataclysm-dda/json/mapgen/garage_gas.json
>> +share/cataclysm-dda/json/mapgen/garden_botanical.json
>> +share/cataclysm-dda/json/mapgen/garden_community.json
>> +share/cataclysm-dda/json/mapgen/garden_public.json
>>   share/cataclysm-dda/json/mapgen/gardening_store.json
>> -share/cataclysm-dda/json/mapgen/grocery0.json
>> -share/cataclysm-dda/json/mapgen/grocery1.json
>> +share/cataclysm-dda/json/mapgen/golfcourse.json
>>   share/cataclysm-dda/json/mapgen/gunsmith.json
>> -share/cataclysm-dda/json/mapgen/gunstore_home_defense.json
>>   share/cataclysm-dda/json/mapgen/gym.json
>> -share/cataclysm-dda/json/mapgen/hardware1.json
>> -share/cataclysm-dda/json/mapgen/hardware2.json
>> -share/cataclysm-dda/json/mapgen/hardware3.json
>> -share/cataclysm-dda/json/mapgen/hardware4.json
>> +share/cataclysm-dda/json/mapgen/headshop.json
>>   share/cataclysm-dda/json/mapgen/homeimprovement.json
>>   share/cataclysm-dda/json/mapgen/homeimprovement_superstore.json
>> -share/cataclysm-dda/json/mapgen/hospital/
>> -share/cataclysm-dda/json/mapgen/hospital/hospital.json
>> +share/cataclysm-dda/json/mapgen/homeless_camp.json
>> +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/crack_house.json
>> +share/cataclysm-dda/json/mapgen/house/detached_house.json
>>   share/cataclysm-dda/json/mapgen/house/house04.json
>>   share/cataclysm-dda/json/mapgen/house/house05.json
>>   share/cataclysm-dda/json/mapgen/house/house05_ab.json
>> @@ -377,8 +386,10 @@ share/cataclysm-dda/json/mapgen/house/ho
>>   share/cataclysm-dda/json/mapgen/house/house17.json
>>   share/cataclysm-dda/json/mapgen/house/house18.json
>>   share/cataclysm-dda/json/mapgen/house/house19.json
>> +share/cataclysm-dda/json/mapgen/house/house_2story.json
>>   share/cataclysm-dda/json/mapgen/house/house_dogs.json
>>   share/cataclysm-dda/json/mapgen/house/house_duplex.json
>> +share/cataclysm-dda/json/mapgen/house/house_fortified.json
>>   share/cataclysm-dda/json/mapgen/house/house_garage.json
>>   share/cataclysm-dda/json/mapgen/house/house_garage2.json
>>   share/cataclysm-dda/json/mapgen/house/house_garage3.json
>> @@ -393,29 +404,48 @@ share/cataclysm-dda/json/mapgen/house/ho
>>   share/cataclysm-dda/json/mapgen/house/house_modern_lx.json
>>   share/cataclysm-dda/json/mapgen/house/house_patio.json
>>   share/cataclysm-dda/json/mapgen/house/house_porch.json
>> +share/cataclysm-dda/json/mapgen/house/house_prepper.json
>>   share/cataclysm-dda/json/mapgen/house/house_quiverfull.json
>> +share/cataclysm-dda/json/mapgen/house/house_rural.json
>>   share/cataclysm-dda/json/mapgen/house/house_rv.json
>>   share/cataclysm-dda/json/mapgen/house/house_suicide.json
>>   share/cataclysm-dda/json/mapgen/house/house_tool_shed.json
>> +share/cataclysm-dda/json/mapgen/house/house_vacant.json
>> +share/cataclysm-dda/json/mapgen/hunting_blind.json
>>   share/cataclysm-dda/json/mapgen/jewel_store.json
>> +share/cataclysm-dda/json/mapgen/junkyard.json
>> +share/cataclysm-dda/json/mapgen/lab/
>> +share/cataclysm-dda/json/mapgen/lab/lab_central.json
>> +share/cataclysm-dda/json/mapgen/lab/lab_common.json
>> +share/cataclysm-dda/json/mapgen/lab/lab_floorplan_cross.json
>> +share/cataclysm-dda/json/mapgen/lab/lab_floorplans.json
>> +share/cataclysm-dda/json/mapgen/lab/lab_floorplans_1side.json
>> +share/cataclysm-dda/json/mapgen/lab/lab_floorplans_finale1level.json
>> +share/cataclysm-dda/json/mapgen/lab/lab_rooms.json
>> +share/cataclysm-dda/json/mapgen/lab/lab_trains.json
>> +share/cataclysm-dda/json/mapgen/lan_center.json
>> +share/cataclysm-dda/json/mapgen/landfill.json
>> +share/cataclysm-dda/json/mapgen/landscaping_supply.json
>>   share/cataclysm-dda/json/mapgen/laundromat.json
>> -share/cataclysm-dda/json/mapgen/library1.json
>> -share/cataclysm-dda/json/mapgen/library2.json
>> +share/cataclysm-dda/json/mapgen/library.json
>>   share/cataclysm-dda/json/mapgen/lmoe.json
>> -share/cataclysm-dda/json/mapgen/lmoe_under01.json
>> -share/cataclysm-dda/json/mapgen/lmoe_under02.json
>> +share/cataclysm-dda/json/mapgen/lot_empty_commercial.json
>> +share/cataclysm-dda/json/mapgen/lot_empty_residential.json
>> +share/cataclysm-dda/json/mapgen/lumberyard.json
>>   share/cataclysm-dda/json/mapgen/mall.json
>> -share/cataclysm-dda/json/mapgen/mansion/
>> -share/cataclysm-dda/json/mapgen/mansion/mansion.json
>> +share/cataclysm-dda/json/mapgen/mansion.json
>>   share/cataclysm-dda/json/mapgen/mapgen-test.json
>> +share/cataclysm-dda/json/mapgen/mass_grave.json
>>   share/cataclysm-dda/json/mapgen/meth_lab.json
>> +share/cataclysm-dda/json/mapgen/mil_surplus.json
>> +share/cataclysm-dda/json/mapgen/moonshine_camp.json
>>   share/cataclysm-dda/json/mapgen/mortuary.json
>>   share/cataclysm-dda/json/mapgen/motel.json
>> -share/cataclysm-dda/json/mapgen/multistory_houses/
>> -share/cataclysm-dda/json/mapgen/multistory_houses/house_2story_base_north.json
>> -share/cataclysm-dda/json/mapgen/multistory_houses/house_2story_second.json
>> +share/cataclysm-dda/json/mapgen/movie_theater.json
>>   share/cataclysm-dda/json/mapgen/museum.json
>> +share/cataclysm-dda/json/mapgen/music_venue.json
>>   share/cataclysm-dda/json/mapgen/musicstore.json
>> +share/cataclysm-dda/json/mapgen/natural_spring.json
>>   share/cataclysm-dda/json/mapgen/necropolis/
>>   share/cataclysm-dda/json/mapgen/necropolis/necropolis.json
>>   share/cataclysm-dda/json/mapgen/necropolis/necropolisB1.json
>> @@ -423,34 +453,24 @@ share/cataclysm-dda/json/mapgen/necropol
>>   share/cataclysm-dda/json/mapgen/necropolis/necropolisB3.json
>>   share/cataclysm-dda/json/mapgen/office_cubical.json
>>   share/cataclysm-dda/json/mapgen/office_doctor.json
>> +share/cataclysm-dda/json/mapgen/office_small.json
>>   share/cataclysm-dda/json/mapgen/office_tower_2.json
>>   share/cataclysm-dda/json/mapgen/orchard_apple.json
>> +share/cataclysm-dda/json/mapgen/orchard_fruit.json
>> +share/cataclysm-dda/json/mapgen/paintball_field.json
>>   share/cataclysm-dda/json/mapgen/park.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/
>> -share/cataclysm-dda/json/mapgen/parks_recreation/art_gallery.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/cemetery_small.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/derelict_property.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/dispensary.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond0_0.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond0_1.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond1_0.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/fishing_pond1_1.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/hunting_blind.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/orchard.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/pavilion.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/skate_park.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/small_office.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/small_storage_units.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/small_wooded_trail.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/state_park0_0.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/state_park0_1.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/state_park1_0.json
>> -share/cataclysm-dda/json/mapgen/parks_recreation/state_park1_1.json
>> -share/cataclysm-dda/json/mapgen/pharmacy_1.json
>> -share/cataclysm-dda/json/mapgen/pharmacy_1_open.json
>> +share/cataclysm-dda/json/mapgen/park_skate.json
>> +share/cataclysm-dda/json/mapgen/park_state.json
>> +share/cataclysm-dda/json/mapgen/pavilion.json
>> +share/cataclysm-dda/json/mapgen/pawn_shop.json
>> +share/cataclysm-dda/json/mapgen/petstore.json
>> +share/cataclysm-dda/json/mapgen/pharmacy.json
>>   share/cataclysm-dda/json/mapgen/pizza_parlor.json
>> +share/cataclysm-dda/json/mapgen/pond_fishing.json
>> +share/cataclysm-dda/json/mapgen/pond_public.json
>>   share/cataclysm-dda/json/mapgen/ponds.json
>>   share/cataclysm-dda/json/mapgen/pool.json
>> +share/cataclysm-dda/json/mapgen/post_office.json
>>   share/cataclysm-dda/json/mapgen/power_station_large.json
>>   share/cataclysm-dda/json/mapgen/power_station_small.json
>>   share/cataclysm-dda/json/mapgen/prison_1.json
>> @@ -458,41 +478,54 @@ share/cataclysm-dda/json/mapgen/public_w
>>   share/cataclysm-dda/json/mapgen/pump_station.json
>>   share/cataclysm-dda/json/mapgen/radio_tower.json
>>   share/cataclysm-dda/json/mapgen/ranch_camp.json
>> +share/cataclysm-dda/json/mapgen/recycle_center.json
>>   share/cataclysm-dda/json/mapgen/restaurant.json
>> -share/cataclysm-dda/json/mapgen/restaurant2.json
>>   share/cataclysm-dda/json/mapgen/restaurant_fast.json
>> +share/cataclysm-dda/json/mapgen/reststop.json
>>   share/cataclysm-dda/json/mapgen/river_shipwreck.json
>>   share/cataclysm-dda/json/mapgen/road_4way.json
>>   share/cataclysm-dda/json/mapgen/roadstop.json
>> -share/cataclysm-dda/json/mapgen/roadstop_a.json
>> -share/cataclysm-dda/json/mapgen/roadstop_b.json
>> -share/cataclysm-dda/json/mapgen/s_gas_rural.json
>> -share/cataclysm-dda/json/mapgen/s_gun0.json
>> -share/cataclysm-dda/json/mapgen/s_library.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
>> +share/cataclysm-dda/json/mapgen/s_coffee.json
>> +share/cataclysm-dda/json/mapgen/s_electronics.json
>> +share/cataclysm-dda/json/mapgen/s_furniture.json
>> +share/cataclysm-dda/json/mapgen/s_gas.json
>> +share/cataclysm-dda/json/mapgen/s_grocery.json
>> +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_liquor.json
>>   share/cataclysm-dda/json/mapgen/sai.json
>>   share/cataclysm-dda/json/mapgen/school_1.json
>>   share/cataclysm-dda/json/mapgen/shelter.json
>> -share/cataclysm-dda/json/mapgen/small_town_buildings/
>> -share/cataclysm-dda/json/mapgen/small_town_buildings/bakery.json
>> -share/cataclysm-dda/json/mapgen/small_town_buildings/candy_shop.json
>> -share/cataclysm-dda/json/mapgen/small_town_buildings/construction_site.json
>> -share/cataclysm-dda/json/mapgen/small_town_buildings/icecream_shop.json
>> -share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_0_0.json
>> -share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_0_1.json
>> -share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_1_0.json
>> -share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_1_1.json
>> -share/cataclysm-dda/json/mapgen/small_town_buildings/post_office.json
>> +share/cataclysm-dda/json/mapgen/shooting_range.json
>> +share/cataclysm-dda/json/mapgen/smallscrapyard.json
>> +share/cataclysm-dda/json/mapgen/smoke_lounge.json
>> +share/cataclysm-dda/json/mapgen/sports_store.json
>> +share/cataclysm-dda/json/mapgen/stadium_football.json
>>   share/cataclysm-dda/json/mapgen/standing_stones.json
>> +share/cataclysm-dda/json/mapgen/station_radio.json
>> +share/cataclysm-dda/json/mapgen/storage_units_large.json
>> +share/cataclysm-dda/json/mapgen/storage_units_medium.json
>> +share/cataclysm-dda/json/mapgen/storage_units_small.json
>> +share/cataclysm-dda/json/mapgen/stripclub.json
>>   share/cataclysm-dda/json/mapgen/sub_station.json
>> -share/cataclysm-dda/json/mapgen/subway_tunnels.json
>>   share/cataclysm-dda/json/mapgen/sugar_house.json
>>   share/cataclysm-dda/json/mapgen/swamp_shack.json
>>   share/cataclysm-dda/json/mapgen/teashop.json
>> +share/cataclysm-dda/json/mapgen/thrift.json
>> +share/cataclysm-dda/json/mapgen/trail_nature.json
>> +share/cataclysm-dda/json/mapgen/trail_small.json
>> +share/cataclysm-dda/json/mapgen/trailer_park.json
>>   share/cataclysm-dda/json/mapgen/triffid_grove.json
>>   share/cataclysm-dda/json/mapgen/veterinarian.json
>> +share/cataclysm-dda/json/mapgen/vfw.json
>>   share/cataclysm-dda/json/mapgen/warehouse.json
>> +share/cataclysm-dda/json/mapgen/zoo.json
>>   share/cataclysm-dda/json/mapgen_palettes/
>> +share/cataclysm-dda/json/mapgen_palettes/acidia_camp_palette.json
>>   share/cataclysm-dda/json/mapgen_palettes/basement.json
>>   share/cataclysm-dda/json/mapgen_palettes/church.json
>>   share/cataclysm-dda/json/mapgen_palettes/evac_center.json
>> @@ -500,7 +533,9 @@ share/cataclysm-dda/json/mapgen_palettes
>>   share/cataclysm-dda/json/mapgen_palettes/houses_multistory.json
>>   share/cataclysm-dda/json/mapgen_palettes/lumberyard.json
>>   share/cataclysm-dda/json/mapgen_palettes/mansion.json
>> +share/cataclysm-dda/json/mapgen_palettes/mil_surplus.json
>>   share/cataclysm-dda/json/mapgen_palettes/office_doctor.json
>> +share/cataclysm-dda/json/mapgen_palettes/road.json
>>   share/cataclysm-dda/json/mapgen_palettes/shelter.json
>>   share/cataclysm-dda/json/mapgen_palettes/subway.json
>>   share/cataclysm-dda/json/martialarts.json
>> @@ -510,6 +545,7 @@ share/cataclysm-dda/json/monster_drops.j
>>   share/cataclysm-dda/json/monster_factions.json
>>   share/cataclysm-dda/json/monsterdrops/
>>   share/cataclysm-dda/json/monsterdrops/zombie_cop.json
>> +share/cataclysm-dda/json/monsterdrops/zombie_military_pilot.json
>>   share/cataclysm-dda/json/monsterdrops/zombie_soldier.json
>>   share/cataclysm-dda/json/monsterdrops/zombie_survivor.json
>>   share/cataclysm-dda/json/monsterdrops/zombie_technician.json
>> @@ -530,12 +566,9 @@ share/cataclysm-dda/json/monsters/triffi
>>   share/cataclysm-dda/json/monsters/zed_children.json
>>   share/cataclysm-dda/json/monsters/zed_explosive.json
>>   share/cataclysm-dda/json/morale_types.json
>> -share/cataclysm-dda/json/multitile_buildings_terrain.json
>> -share/cataclysm-dda/json/multitile_city_buildings.json
>>   share/cataclysm-dda/json/mutation_category.json
>>   share/cataclysm-dda/json/mutation_ordering.json
>>   share/cataclysm-dda/json/mutations.json
>> -share/cataclysm-dda/json/npc_destination_locations.json
>>   share/cataclysm-dda/json/npcs/
>>   share/cataclysm-dda/json/npcs/NC_ARSONIST.json
>>   share/cataclysm-dda/json/npcs/NC_BARTENDER.json
>> @@ -563,19 +596,23 @@ share/cataclysm-dda/json/npcs/TALK_EVAC_
>>   share/cataclysm-dda/json/npcs/TALK_OLD_GUARD_REP.json
>>   share/cataclysm-dda/json/npcs/TALK_SCAVENGER_MERC.json
>>   share/cataclysm-dda/json/npcs/classes.json
>> +share/cataclysm-dda/json/npcs/destination_locations.json
>>   share/cataclysm-dda/json/npcs/epilogues.json
>>   share/cataclysm-dda/json/npcs/factions.json
>> +share/cataclysm-dda/json/npcs/hints.json
>>   share/cataclysm-dda/json/npcs/items_generic.json
>>   share/cataclysm-dda/json/npcs/missiondef.json
>>   share/cataclysm-dda/json/npcs/npc.json
>>   share/cataclysm-dda/json/npcs/talk_tags.json
>> +share/cataclysm-dda/json/overmap/
>> +share/cataclysm-dda/json/overmap/multitile_buildings_terrain.json
>> +share/cataclysm-dda/json/overmap/multitile_city_buildings.json
>> +share/cataclysm-dda/json/overmap/special_locations.json
>> +share/cataclysm-dda/json/overmap/specials.json
>>   share/cataclysm-dda/json/overmap_connections.json
>> -share/cataclysm-dda/json/overmap_special_locations.json
>> -share/cataclysm-dda/json/overmap_specials.json
>>   share/cataclysm-dda/json/overmap_terrain.json
>>   share/cataclysm-dda/json/player_activities.json
>>   share/cataclysm-dda/json/professions.json
>> -share/cataclysm-dda/json/ranged_balance.json
>>   share/cataclysm-dda/json/recipes/
>>   share/cataclysm-dda/json/recipes/ammo/
>>   share/cataclysm-dda/json/recipes/ammo/components.json
>> @@ -599,10 +636,12 @@ share/cataclysm-dda/json/recipes/chem/ot
>>   share/cataclysm-dda/json/recipes/electronics/
>>   share/cataclysm-dda/json/recipes/electronics/parts.json
>>   share/cataclysm-dda/json/recipes/electronics/toolmod.json
>> +share/cataclysm-dda/json/recipes/engines.json
>>   share/cataclysm-dda/json/recipes/food/
>>   share/cataclysm-dda/json/recipes/food/brewing.json
>>   share/cataclysm-dda/json/recipes/food/distill.json
>>   share/cataclysm-dda/json/recipes/food/dry.json
>> +share/cataclysm-dda/json/recipes/food/frozen.json
>>   share/cataclysm-dda/json/recipes/food/pasta.json
>>   share/cataclysm-dda/json/recipes/food/seed.json
>>   share/cataclysm-dda/json/recipes/other/
>> @@ -614,11 +653,15 @@ share/cataclysm-dda/json/recipes/other/p
>>   share/cataclysm-dda/json/recipes/other/tool.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_construction_om.json
>>   share/cataclysm-dda/json/recipes/recipe_deconstruction.json
>>   share/cataclysm-dda/json/recipes/recipe_electronics.json
>>   share/cataclysm-dda/json/recipes/recipe_food.json
>> +share/cataclysm-dda/json/recipes/recipe_groups.json
>>   share/cataclysm-dda/json/recipes/recipe_medsandchemicals.json
>>   share/cataclysm-dda/json/recipes/recipe_others.json
>> +share/cataclysm-dda/json/recipes/recipe_vehicle.json
>>   share/cataclysm-dda/json/recipes/recipe_weapon.json
>>   share/cataclysm-dda/json/recipes/recipes.json
>>   share/cataclysm-dda/json/recipes/weapon/
>> @@ -673,16 +716,21 @@ share/cataclysm-dda/json/vehicle_groups.
>>   share/cataclysm-dda/json/vehicle_parts.json
>>   share/cataclysm-dda/json/vehicleparts/
>>   share/cataclysm-dda/json/vehicleparts/alternator.json
>> +share/cataclysm-dda/json/vehicleparts/armor.json
>>   share/cataclysm-dda/json/vehicleparts/battery.json
>>   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/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/motor.json
>> +share/cataclysm-dda/json/vehicleparts/rams.json
>>   share/cataclysm-dda/json/vehicleparts/tanks.json
>>   share/cataclysm-dda/json/vehicleparts/turret.json
>> +share/cataclysm-dda/json/vehicleparts/vp_flags.json
>>   share/cataclysm-dda/json/vehicleparts/wheel.json
>>   share/cataclysm-dda/json/vehicles/
>>   share/cataclysm-dda/json/vehicles/bikes.json
>> @@ -691,6 +739,7 @@ share/cataclysm-dda/json/vehicles/carts.
>>   share/cataclysm-dda/json/vehicles/custom_vehicles.json
>>   share/cataclysm-dda/json/vehicles/emergency.json
>>   share/cataclysm-dda/json/vehicles/farm.json
>> +share/cataclysm-dda/json/vehicles/helicopters.json
>>   share/cataclysm-dda/json/vehicles/military.json
>>   share/cataclysm-dda/json/vehicles/trucks.json
>>   share/cataclysm-dda/json/vehicles/utility.json
>> @@ -719,9 +768,15 @@ share/cataclysm-dda/mods/Boats/b_var_woo
>>   share/cataclysm-dda/mods/Boats/b_vehicles.json
>>   share/cataclysm-dda/mods/Boats/b_wooden_boat_parts.json
>>   share/cataclysm-dda/mods/Boats/modinfo.json
>> +share/cataclysm-dda/mods/Boats/overmap_terrain.json
>> +share/cataclysm-dda/mods/Boats/specials.json
>> +share/cataclysm-dda/mods/Boats/whaleys_boat_rental.json
>> +share/cataclysm-dda/mods/Boats/whaleys_boats.json
>> +share/cataclysm-dda/mods/Boats/whaleys_house_river.json
>>   share/cataclysm-dda/mods/BrightNights/
>>   share/cataclysm-dda/mods/BrightNights/bionics.json
>>   share/cataclysm-dda/mods/BrightNights/effects.json
>> +share/cataclysm-dda/mods/BrightNights/game_balance.json
>>   share/cataclysm-dda/mods/BrightNights/gun.json
>>   share/cataclysm-dda/mods/BrightNights/item groups/
>>   share/cataclysm-dda/mods/BrightNights/item groups/locations.json
>> @@ -730,6 +785,7 @@ share/cataclysm-dda/mods/BrightNights/it
>>   share/cataclysm-dda/mods/BrightNights/items/bionics.json
>>   share/cataclysm-dda/mods/BrightNights/items/books.json
>>   share/cataclysm-dda/mods/BrightNights/items/generic.json
>> +share/cataclysm-dda/mods/BrightNights/items/med.json
>>   share/cataclysm-dda/mods/BrightNights/mapgen/
>>   share/cataclysm-dda/mods/BrightNights/mapgen/map_palletes.json
>>   share/cataclysm-dda/mods/BrightNights/mapgen/municipal_microreactor.json
>> @@ -751,10 +807,13 @@ 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/CrazyCataclysm/
>> -share/cataclysm-dda/mods/CrazyCataclysm/aperturepotato.json
>> -share/cataclysm-dda/mods/CrazyCataclysm/items.json
>> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_aperturepotato.json
>> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_comestibles.json
>> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_item_groups.json
>> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_items.json
>> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_monsters.json
>> +share/cataclysm-dda/mods/CrazyCataclysm/crazy_speech.json
>>   share/cataclysm-dda/mods/CrazyCataclysm/modinfo.json
>> -share/cataclysm-dda/mods/CrazyCataclysm/speech.json
>>   share/cataclysm-dda/mods/DeoxyMod/
>>   share/cataclysm-dda/mods/DeoxyMod/Deoxy_vehicle_parts.json
>>   share/cataclysm-dda/mods/DeoxyMod/modinfo.json
>> @@ -805,6 +864,9 @@ share/cataclysm-dda/mods/Generic_Guns/gg
>>   share/cataclysm-dda/mods/Generic_Guns/gg_other_blacklist.json
>>   share/cataclysm-dda/mods/Generic_Guns/gg_vehicle_override.json
>>   share/cataclysm-dda/mods/Generic_Guns/modinfo.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.json
>>   share/cataclysm-dda/mods/Medieval_Stuff/ammo_types.json
>> @@ -1753,6 +1815,9 @@ share/cataclysm-dda/mods/Only_Wildlife/m
>>   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/Slow_Zombies/
>>   share/cataclysm-dda/mods/Slow_Zombies/main.lua
>>   share/cataclysm-dda/mods/Slow_Zombies/modinfo.json
>> @@ -1763,17 +1828,19 @@ 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/mapgen.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/overmap_specials.json
>> -share/cataclysm-dda/mods/Tanks/overmap_terrain.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/Tough_Zombies/
>>   share/cataclysm-dda/mods/Tough_Zombies/main.lua
>>   share/cataclysm-dda/mods/Tough_Zombies/modinfo.json
>> @@ -1858,6 +1925,9 @@ share/cataclysm-dda/mods/blazemod/blaze_
>>   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
>> @@ -1939,14 +2009,10 @@ share/locale/es_ES/
>>   share/locale/es_ES/LC_MESSAGES/
>>   share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo
>>   share/locale/fr/LC_MESSAGES/cataclysm-dda.mo
>> -share/locale/it_IT/
>> -share/locale/it_IT/LC_MESSAGES/
>> -share/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo
>> +share/locale/hu/LC_MESSAGES/cataclysm-dda.mo
>>   share/locale/ja/LC_MESSAGES/cataclysm-dda.mo
>>   share/locale/ko/LC_MESSAGES/cataclysm-dda.mo
>>   share/locale/pl/LC_MESSAGES/cataclysm-dda.mo
>> -share/locale/pt_BR/LC_MESSAGES/cataclysm-dda.mo
>>   share/locale/ru/LC_MESSAGES/cataclysm-dda.mo
>> -share/locale/sr/LC_MESSAGES/cataclysm-dda.mo
>>   share/locale/zh_CN/LC_MESSAGES/cataclysm-dda.mo
>>   share/locale/zh_TW/LC_MESSAGES/cataclysm-dda.mo
>>
>