@@ -8,8 +8,8 @@ set(CMAKE_INSTALL_MESSAGE "LAZY")
 
 # set up versioning.
 set(DF_VERSION "53.16")
-set(DFHACK_RELEASE "r1.1")
-set(DFHACK_PRERELEASE FALSE)
+set(DFHACK_RELEASE "r2rc2")
+set(DFHACK_PRERELEASE TRUE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 set(DFHACK_ABI_VERSION 2)
@@ -356,7 +356,7 @@ INCLUDE(FetchContent)
 FetchContent_Declare(
     fmt
     GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-    GIT_TAG 790b9389ae99c4ddebdd2736a8602eca1fec684e # 12.1.0 + bugfix for MSVC warning + build time improvements
+    GIT_TAG 12.2.0
 )
 FetchContent_MakeAvailable(fmt)
 set(FMTLIB fmt)
 
@@ -33,6 +33,7 @@ Template for new versions:
 ## New Features
 
 ## Fixes
+- ``Units::setPathGoal``: no longer crashes when passed NULL as a unit.  Also fixes ``dfhack.units.setPathGoal()``.
 
 ## Misc Improvements
 
@@ -80,6 +81,7 @@ Template for new versions:
 - Fixed out-of-bounds color table access in ``Screen`` module when Lua pens use ``COLOR_RESET``
 - ``Units::teleport``: update unit occupancy on the full 3x3 footprint of EQUIPMENT units (e.g. wagons) instead of only their center tile
 - ``Units::teleport``: only clear tile unit occupancy flags when no other unit of the same kind remains on the tile
+- ``Units::isCitizen`` and ``Units::isResident`` now exclude dead units even when ``include_insane`` is set; the flag previously skipped the sanity check that also happened to exclude the dead
 - `3dveins`: fix crash when a tile's biome cannot be resolved
 - `3dveins`: fix failure on embarks that cross midmap tiles
 - `aquifer`: make ``--skip-top`` and top-relative ``--levels`` take effect for the ``drain``, ``convert``, and ``add`` actions instead of being silently ignored
@@ -89,9 +91,15 @@ Template for new versions:
 - `buildingplan`: fix roller material estimate asking for one chain per tile instead of one chain total
 - `buildingplan`: fix "Unlink all" only unlinking some mechanisms (or crashing) when freeing mechanisms from the building
 - `burrow`: fix ``tiles clear`` and other tile operations silently failing because burrow block z-coordinates were stored incorrectly in the ``Burrows`` module
+- `dfhack-run`: on Windows, no longer mutates, hides, and closes the console it inherits when run from an existing terminal (issue #3827)
+- `dig-now`: update light/outside flags of tiles below tiles that are dug into solid rather than open tiles
 - `export-world-map`: fix crash exporting site data for a site whose owner has an undefined race
 - `gui/quickfort`: show smoothing designations immediately after applying a blueprint
+- `liquids`: allow painting liquids and obsidian into unallocated sky blocks
+- `liquids`: update light/outside flags of covered tiles when painting obsidian or river sources
 - `overlay`: overlay hotkeys no longer steal typed characters while the game is capturing text input, e.g. when renaming a building
+- `preserve-rooms`: no longer assigns zones to dead units who still hold a noble position
+- `sort`: the clickable stress icon citizen lists no longer include dead or missing units (issue #5975)
 - `sort`: fix the Places/Workshops and task searches missing workshops by their current display names (e.g. "Stoneworker's Workshop", "Screw Press")
 - `stocks`: overlay now resets scroll position when collapsing categories so the item list is no longer left blank and unscrollable
 - `strangemood`: updated to match behavior of current DF version
@@ -101,27 +109,33 @@ Template for new versions:
 - `stocks`: overlay now resets scroll position when collapsing categories so the item list is no longer left blank and unscrollable
 - `strangemood`: fix crash when ``--id`` is given a non-numeric unit id
 - `suspendmanager`: fix out-of-bounds parameter read when ``set`` is given too few arguments
+- `probe`: fix malformed output of local/global map feature names
 
 ## Misc Improvements
 - Added ``Coord2d`` and ``Coord3d`` C++ templates, providing a standard set operations for 2-tuples and 3-tuples of any numeric type
 - Renamed the ``stockpiles`` tool tag to ``stockpile`` so it no longer collides with the `stockpiles` plugin in `gui/launcher`
+- Writes to ``stderr.log`` are no longer buffered on Windows, so log output is not lost if DF crashes
 
 ## Documentation
 - Document ``autodump-destroy-here``. Remove mention of ``autodump destroy`` able to revert destruction.
 
 ## API
+- Added ``Maps::getTileBlockCoord``, ``Maps::getBlockOrigin``, and ``Maps::getTileBlockOffset`` to convert between tile and block coordinates
 - Added ``Maps::getSiteTypeName`` to print the sites classification as a string (e.g. "mountain halls")
 - Added ``Maps::addRegionBiomeOffset`` to shift world region coordinate by region_details biome reference
 - Added ``Maps::describeSurroundings`` to get surroundings classification from savagery and evilness
 - Added ``Maps::getCurrentWeather`` to determine the current weather on the map.
 - Added ``Maps::forEachTile`` with ``Maps::TileFilter``/``Maps::TileActions`` to scan a cuboid of tiles, matching tiles by tiletype, tiletype attributes, and designation/occupancy bits, and counting, rewriting tiletypes, editing designation/occupancy bits, spawning constructions, or invoking a callback on matching tiles
+- Added ``MapExtras::MapCache::propagateVerticalFlags`` to update the light/outside/subterranean flags of tiles below a tile that changed between an open and a solid shape
 - Added ``MiscUtils::print_range`` to print ranges with prefix, separator, and suffix
 - Added ``Units::breathes`` and ``Units::getBreathingState``
 - Deprecated ``World::ReadCurrentWeather`` in favor of ``Maps::getCurrentWeather``
 
 ## Lua
 - Added ``dfhack.maps.forEachTile`` to scan a cuboid of tiles with a declarative filter and apply actions (count, set tiletype or per-tiletype replacements, set designation/occupancy fields, spawn constructions, Lua callback) in a single native call
 - ``widgets.Slider`` and ``widgets.RangeSlider``: fix sliders allowing values outside their number of stops (``num_stops``) when clicked or dragged with the mouse
+- Fixed ``ipairs()`` on enum attribute tables (e.g. ``df.item_type.attrs``) never terminating (issue #1860)
+- Added ``dfhack.maps.getTileBlockCoord``, ``dfhack.maps.getBlockOrigin``, and ``dfhack.maps.getTileBlockOffset`` to convert between tile and block coordinates
 
 ## Removed
 
@@ -177,6 +191,7 @@ Template for new versions:
 - `EventManager`: add safety check to potentially avoid a DFHack crash when DF's ``reports`` table is out of order
 
 ## Documentation
+- ``dfhack.translation.generateName``: added a table containing explanations and data types for each of the parameters
 
 ## API
 - ``DFSDL``: added ``obtain_library_handle`` and ``obtain_image_library_handle`` so that a plugin can obtain DFHack's already-open handle to these libs instead of having to do it itself.
 
@@ -1060,7 +1060,64 @@ Translation module
 
 * ``dfhack.translation.generateName(name,language,type,major_selector,minor_selector)``
 
-  Dynamically generate a name using the same logic the game itself uses.
+  Dynamically generate a random name using the same logic the game itself uses.
+
+  **Parameters:**
+
+  .. list-table::
+    :class: dfhack-param-table
+    :header-rows: 1
+    :widths: 21 60 19
+
+    * - Name
+      - Explanation
+      - Data Type
+    * - ``name``
+      - | ``name`` property of the object that will have its name generated. This is an output parameter.
+        |
+        | Example values:
+        | ``df.global.world.entities.all[0].name``
+        | ``df.unit.find(79).name``
+        | ``dfhack.gui.getSelectedUnit().name``
+        | ``df.language_name::new()``
+      - ``df.language_name``
+    * - ``language``
+      - | Integer index of the language used for generating the name within ``df.language_translation``.
+        |
+        | Example values:
+        | ``df.global.world.entities.all[0].name.language``
+        | ``df.unit.find(79).name.language``
+        | ``dfhack.gui.getSelectedUnit().name.language``
+        | ``0``
+      - ``int``
+    * - ``type``
+      - | Integer value of the name type. This ensures that the generated name will be appropriate for the given category of object. For allowed values see ``df.language_name_type`` enum.
+        |
+        | Example values:
+        | ``df.global.world.entities.all[100].name.type``
+        | ``df.unit.find(79).name.type``
+        | ``dfhack.gui.getSelectedUnit().name.type``
+        | ``df.language_name_type.Figure``
+        | ``13``
+      - ``df.language_name_type``
+    * - ``major_selector``
+      - | Section of the loaded game raws containing words used for generating the name.
+        |
+        | Example value for sites belonging to civ with id 100:
+        | ``df.historical_entity.find(100).entity_raw.symbols.symbols_major[df.entity_name_type.SITE]``
+        |
+        | Example value for units:
+        | ``df.global.world.raws.language.word_table[0][df.language_name_category.Unit]``
+      - ``df.language_word_table``
+    * - ``minor_selector``
+      - | Section of the loaded game raws containing words used for generating the name.
+        |
+        | Example value for sites belonging to civ with id 100:
+        | ``df.historical_entity.find(100).entity_raw.symbols.symbols_minor[df.entity_name_type.SITE]``
+        |
+        | Example value for units:
+        | ``df.global.world.raws.language.word_table[1][df.language_name_category.Unit]``
+      - ``df.language_word_table``
 
 Gui module
 ----------
@@ -1508,12 +1565,14 @@ Units module
   same checks the game uses to decide game-over by extinction,
   with an additional sanity check. You can identify citizens,
   regardless of their sanity, by passing ``true`` as the optional
-  second parameter.
+  second parameter. Dead units are never considered citizens, even
+  when ``include_insane`` is set (though animate intelligent
+  undead citizens still count).
 
 * ``dfhack.units.isResident(unit[,include_insane])``
 
-  The unit is a resident of the fortress. Same ``include_insane`` semantics as
-  ``isCitizen``.
+  The unit is a non-dead resident of the fortress. Same
+  ``include_insane`` semantics as ``isCitizen``.
 
 * ``dfhack.units.isFortControlled(unit)``
 
@@ -2412,6 +2471,23 @@ Maps module
 
   Like ``getTileBlock``, but if the block is not allocated, try creating it.
 
+* ``dfhack.maps.getTileBlockCoord(coords)``, or ``getTileBlockCoord(x,y,z)``
+
+  Returns the *x, y, z* block coordinates of the map block containing the
+  given tile position. The z coordinate is a level and is preserved, not
+  scaled.
+
+* ``dfhack.maps.getBlockOrigin(coords)``, or ``getBlockOrigin(x,y,z)``
+
+  Returns the *x, y, z* tile coordinates of the north-west corner of the map
+  block with the given block coordinates. The z coordinate is a level and is
+  preserved, not scaled.
+
+* ``dfhack.maps.getTileBlockOffset(coords)``, or ``getTileBlockOffset(x,y,z)``
+
+  Returns the *x, y* offset (0-15) of the given tile position within its
+  containing map block, along with the unchanged *z* coordinate.
+
 * ``dfhack.maps.getTileType(coords)``, or ``getTileType(x,y,z)``
 
   Returns the tile type at the given coordinates, or *nil* if invalid.
 
@@ -48,13 +48,34 @@ history shapes specialization:
   (smithing, crafting, cooking, mechanics, engraving, and so on) are
   preferred for higher-skilled workers -- both when choosing a specialty
   and when deciding who to keep out of the laborer pool.
+* **Assignment stickiness.** A unit assigned to a skill detail keeps the
+  assignment while any work for that skill remains -- including claimed
+  jobs, the fetch-materials phase, and breaks -- so jobs aren't aborted
+  by reassignment churn. For tool-carrying labors (mining, woodcutting,
+  hunting) this also prevents dropping and re-equipping tools between
+  cycles. Assignments are recorded in the save data and restored on load.
+* **Builtin tool details.** DF v50 only equips tools for members of the
+  game's predefined work details, so mining, woodcutting, and hunting
+  specialists are assigned to the builtin Miners, Woodcutters, and
+  Hunters details instead of plugin-created ones. Memberships added by
+  the plugin are tracked and removed cleanly on disable; members you
+  assigned yourself are never touched.
 * **Strange-mood shaping.** Dwarves that can still have a strange mood
   (their race has the ``STRANGE_MOODS`` token and they haven't had one
   yet) and that have already started a moodable craft are steered toward
   skills a strange mood can advance -- preferably valuable ones like
   weaponsmithing or armorsmithing -- so a mood pays out in a useful
   legendary skill.
 
+Workshop restrictions are honored as well: when a job is posted at a
+workshop that has a permitted-worker list, the engine ensures at least
+one listed worker is assigned the job's labor, and when the workshop
+restricts jobs by skill level it ensures at least one worker within the
+allowed range holds that labor. Units on any workshop's permitted list
+are treated as reserved for that shop's work -- they are preferentially
+assigned the labors its jobs require and deprioritized for the laborer
+pool and unrelated specialties.
+
 Labormanager also reads each citizen's unmet personal needs and biases
 assignments toward work that satisfies them:
 
@@ -146,6 +167,13 @@ Advanced usage
     command exists under `autolabor`. In monitor mode the plugin performs
     no labor management -- all work details are left to the player -- but
     still tracks the job board and shows the task starvation warning.
+``labormanager dump``
+    Print a diagnostic snapshot of everything the engine can see: every
+    job and posting on the board with its flags and resolved labor, the
+    per-labor demand and starvation streaks, skill usage, tool counts,
+    work detail memberships, and each citizen's state, pins, and enabled
+    labors. Intended for bug reports; also available as
+    ``autolabor dump``, and meaningful in monitor mode.
 
 Monitor mode (``labormanager mode monitor`` or the work details overlay)
 runs the same tracking without any labor management, for players who want
 
@@ -79,3 +79,12 @@ div.dfhack-tool-summary p:last-child,
 aside.dfhack-tool-summary p:last-child {
    margin-bottom: 0;
 }
+
+table.dfhack-param-table {
+    table-layout: fixed;
+    width: 110%;
+}
+
+table.dfhack-param-table span.pre {
+    white-space: wrap;
+}
@@ -78,6 +78,9 @@ namespace DFHack
             state = con_unclaimed;
             in_batch = false;
             raw_cursor = 0;
+            console_owned = false;
+            saved_cp = 0;
+            saved_output_cp = 0;
         };
         virtual ~Private()
         {
@@ -396,6 +399,9 @@ namespace DFHack
         HWND ConsoleWindow;
         HWND MainWindow;
         WORD default_attributes;
+        bool console_owned;   // false if the console was inherited from a parent process
+        UINT saved_cp;        // code pages to restore on shutdown if the console is borrowed
+        UINT saved_output_cp;
         // current state
         enum console_state
         {
@@ -467,22 +473,32 @@ bool Console::init(bool)
     }
     d->MainWindow = h;
 
-    // Allocate a console!
-    AllocConsole();
+    // Allocate a console! If the process already has one (e.g. dfhack-run
+    // launched from an existing terminal), the console is borrowed and must
+    // not be mutated or freed.
+    d->console_owned = AllocConsole() != FALSE;
     d->ConsoleWindow = GetConsoleWindow();
     wlock = new std::recursive_mutex();
-    HMENU  hm = GetSystemMenu(d->ConsoleWindow,false);
-    DeleteMenu(hm, SC_CLOSE, MF_BYCOMMAND);
+    if (d->console_owned)
+    {
+        HMENU  hm = GetSystemMenu(d->ConsoleWindow,false);
+        DeleteMenu(hm, SC_CLOSE, MF_BYCOMMAND);
+    }
 
     // force console code pages to utf-8
+    d->saved_cp = GetConsoleCP();
+    d->saved_output_cp = GetConsoleOutputCP();
     SetConsoleCP(CP_UTF8);
     SetConsoleOutputCP(CP_UTF8);
 
     // set the screen buffer to be big enough to let us scroll text
     GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &coninfo);
     d->default_attributes = coninfo.wAttributes;
-    coninfo.dwSize.Y = MAX_CONSOLE_LINES;  // How many lines do you want to have in the console buffer
-    SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), coninfo.dwSize);
+    if (d->console_owned)
+    {
+        coninfo.dwSize.Y = MAX_CONSOLE_LINES;  // How many lines do you want to have in the console buffer
+        SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), coninfo.dwSize);
+    }
 
     // redirect unbuffered STDOUT to the console
     d->console_out = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -506,7 +522,10 @@ bool Console::init(bool)
 
     // make our own weird streams so our IO isn't redirected
     std::cin.tie(this);
-    clear();
+    if (d->console_owned)
+    {
+        clear();
+    }
     inited = true;
     // DOESN'T WORK - locks up DF!
     // ForceForegroundWindow(d->MainWindow);
@@ -518,7 +537,17 @@ bool Console::shutdown(void)
 {
     assert(inited);
     std::lock_guard<std::recursive_mutex> lock{*wlock};
-    FreeConsole();
+    if (d->console_owned)
+    {
+        FreeConsole();
+    }
+    else
+    {
+        // the console is borrowed from a parent process; restore the state
+        // we changed and leave it attached
+        SetConsoleCP(d->saved_cp);
+        SetConsoleOutputCP(d->saved_output_cp);
+    }
     inited = false;
     return true;
 }
@@ -611,12 +640,16 @@ void Console::msleep (unsigned int msec)
 
 bool Console::hide()
 {
+    if (!inited || !d->console_owned)
+        return false;
     ShowWindow( GetConsoleWindow(), SW_HIDE );
     return true;
 }
 
 bool Console::show()
 {
+    if (!inited || !d->console_owned)
+        return false;
     ShowWindow( GetConsoleWindow(), SW_RESTORE );
     return true;
 }
@@ -1114,6 +1114,9 @@ bool Core::InitMainThread(std::filesystem::path path) {
     fprintf(stderr, "dfhack: redirecting stderr to stderr.log\n");
     if (!freopen("stderr.log", "w", stderr))
         std::cerr << "Could not redirect stderr to stderr.log" << std::endl;
+    // freopen makes stderr fully buffered on Windows; restore unbuffered
+    // writes so that stderr.log is up to date (e.g. in the event of a crash)
+    setvbuf(stderr, NULL, _IONBF, 0);
 
     std::cerr << "DFHack build: " << Version::git_description() << std::endl;
     if (strlen(Version::dfhack_run_url())) {