Morb0 ec5d3e98b6 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Audio/Weapons/Guns/Gunshots/attributions.yml # Resources/Prototypes/Maps/aspid.yml # Resources/Prototypes/Maps/gemini.yml # Resources/Prototypes/Roles/Jobs/Civilian/detective.yml # Tools/actions_changelogs_since_last_run.py		2024-01-31 00:23:19 +03:00
..
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-31 00:23:19 +03:00
WireActions	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00