Arthur 6ca4c0ceb8 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/species.yml # Resources/manifest.yml		2022-05-07 05:32:09 +03:00
..
Names	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-05-07 05:32:09 +03:00
adjectives.yml	Translate traitor codewords to russian (#72)	2022-01-17 17:23:32 +03:00
news.yml	ports over datasets (#2663)	2021-01-14 18:08:55 +11:00
verbs.yml	Translate traitor codewords to russian (#72)	2022-01-17 17:23:32 +03:00