Commit graph

5 commits

Author SHA1 Message Date
Morbo
88d2445740 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Maps/origin.yml
2023-01-01 01:21:40 +03:00
metalgearsloth
007b079330
Fix some comp dirty / appearance warnings (#13193)
* Fix some comp dirty / appearance warnings

* also dis
2022-12-27 17:58:53 +01:00
Morb
6ad4a10b29
Repository cleanup (#631) 2022-12-10 12:10:27 -08:00
Morbo
8ffba84896 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-10-21 19:51:57 +03:00
Kara
7ad867fa0f
Slight localization func cleanup (#11380) 2022-10-18 19:51:18 -07:00
Renamed from Content.Shared/Localizations/Localization.cs (Browse further)