Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-11 a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c

 _Main/UI/MacroPlannerWebApp/Component_DialogSynchronizeStartingInventory/_ROOT_Component_DialogSynchronizeStartingInventory.def

@@ -16,7 +16,7 @@
    EnterButton: 'btnOk'
    EscapeButton: 'btnCancel'
    ExcludeFromActiveComponent: true
    MinimumRows: 30
    MinimumColumns: 30
    Padding: 'false'
    Title: 'Synchronize Starting Inventory'
  ]