Morb0 8ffde2eea4 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # .github/workflows/test-packaging.yml # Content.Server/Administration/Systems/AdminSystem.cs # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png # Tools/gen_build_info.py		2024-07-14 12:15:16 +03:00
..
ControlExtensions	Filtering reagents (#18211)	2023-07-26 02:05:09 -06:00
Controls	Dynamic Radial Menus (#29678)	2024-07-04 11:25:25 +10:00
Fragments	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
RichText	Cap scramble tag (#28804)	2024-06-09 16:01:05 -04:00
Screens	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Systems	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-07-14 12:15:16 +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
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