Morb0 be480aced1 Merge remote-tracking branch 'wizards/master' into upstream-sync ...

# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml

2024-10-30 16:38:56 +03:00

..

ContentLocalizationManager.cs

Merge remote-tracking branch 'wizards/master' into upstream-sync

2024-10-30 16:38:56 +03:00

Units.cs

Fix warnings and code cleanup/fixes (#13570)

2023-01-19 13:56:45 +11:00

UserInputParser.cs

Fix atmos UI decimal separator bug (#23009)

2024-01-04 21:18:09 -08:00