Ed 4173d96d83 Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.IntegrationTests/Tests/ResearchTest.cs
#	Resources/Prototypes/Entities/Objects/Decoration/flora.yml
#	Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2024-12-22 15:48:30 +03:00

..

ControlExtensions

Filtering reagents (#18211)

2023-07-26 02:05:09 -06:00

Controls

Dialog windows now grab the keyboard focus (#31294)

2024-09-20 00:01:54 +10:00

Fragments

Refactor serialization copying to use source generators (#19412)

2023-08-22 18:14:33 -07:00

RichText

Monospace Support for Rich Text (#33830)

2024-12-13 15:24:34 +01:00

Screens

Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"

2024-11-06 16:52:08 +03:00

Systems

Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream

2024-12-22 15:48:30 +03:00

XamlExtensions

Revert "Update submodule to 175.0.0 (#21318)" (#21319)

2023-10-29 15:29:30 +11:00

BoundKeyHelpers.cs

Use different chatbox placeholder when dependent keys unbound (#22747)

2023-12-22 11:39:29 -08:00

ButtonHelpers.cs

Add ButtonHelpers and the SetButtonDisabledRecursive helper.

2021-07-29 12:55:37 +02:00

IEntityControl.cs

Improve vv /c/enthover and add keybind (#20127)

2023-09-16 14:09:51 +10:00

StatsWindow.xaml

Cargo economy balance (#11123)

2022-09-15 11:53:17 +10:00

StatsWindow.xaml.cs

Cargo economy balance (#11123)

2022-09-15 11:53:17 +10:00

StatValuesEui.cs

Cargo economy balance (#11123)

2022-09-15 11:53:17 +10:00