Merge branch 'master' into adv-beta

DFHack · Sep 27, 2024 · bc2b7b9 · bc2b7b9
2 parents 5ce59e1 + 8db66a0
commit bc2b7b9
Show file tree

Hide file tree

Showing 3 changed files with 4,073 additions and 4,063 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -20,6 +20,14 @@ Template for new versions:
 
 ## Structures
 
+# 50.14-r1
+
+## Structures
+
+# ``job_item_flags3``: added new flag ``grown_not_crafted``
+# ``widget``: changed ``visibility_flag`` to ``flag`` (matching DF internal name)
+# added new keybindings for 50.14
+
 # 50.13-r5
 
 # 50.13-r4

diff --git a/df.viewscreen.xml b/df.viewscreen.xml
@@ -174,7 +174,7 @@
         <stl-vector name='custom_render'> <stl-function/> </stl-vector>
         <stl-vector name='custom_activated'> <stl-function/> </stl-vector>
         <stl-string name='name'/>
-        <bitfield name='visibility_flags' base-type='int8_t'> bay12: WidgetFlag
+        <bitfield name='flag' base-type='int8_t'> bay12: WidgetFlag
             <flag-bit name='VISIBILITY_ACTIVE'/>
             <flag-bit name='VISIBILITY_VISIBLE'/> plus ACTUALLY_VISIBLE for both of the above
             <flag-bit name='CAN_KEY_ACTIVATE'/>