Morb0 3cb4017c90 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Audio/Announcements/license.txt # Resources/Audio/Effects/Shuttle/licenses.txt # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Textures/Structures/Storage/tanks.rsi/meta.json		2023-11-14 16:35:33 +03:00
..
Components	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-14 16:35:33 +03:00