Arthur cc720a3f2b Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml		2022-03-29 00:25:48 +03:00
..
CharacterSetupGui.xaml	Fix rider errors with style classes.	2021-10-30 14:00:46 +02:00
CharacterSetupGui.xaml.cs	Seal/abstract/virtual everything (#6739)	2022-02-16 18:23:23 +11:00
HumanoidProfileEditor.Random.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-02-17 01:05:48 +03:00
HumanoidProfileEditor.xaml	Upstream species (#6066)	2022-01-08 19:53:14 -06:00
HumanoidProfileEditor.xaml.cs	Character editor flicker fix (#7002)	2022-03-28 19:31:23 +11:00