Merge branch 'develop' into adv-beta

DFHack · Oct 6, 2024 · f296296 · f296296
2 parents 81a6508 + 40c8c45
commit f296296
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -58,6 +58,7 @@ Template for new versions:
 
 ## Fixes
 - Fix mouse clicks bleeding through DFHack windows when clicking in the space between the frame and the window content in resizable windows
+- `logistics`: don't ignore rotten items when applying stockpile logistics operations (e.g. autodump, autoclaim, etc.)
 
 ## Misc Improvements
 - DFHack text edit fields now delete the character at the cursor when you hit the Delete key

diff --git a/plugins/logistics.cpp b/plugins/logistics.cpp
@@ -431,7 +431,7 @@ static const struct BadFlags {
         df::item_flags flags;
         #define F(x) flags.bits.x = true;
         F(garbage_collect); F(hostile); F(on_fire);
-        F(rotten); F(trader); F(in_building); F(construction);
+        F(trader); F(in_building); F(construction);
         F(artifact); F(spider_web); F(owned); F(in_job);
         #undef F
         return flags.whole;

diff --git a/scripts b/scripts