Morb0 0546051cb0 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/tips.yml		2024-05-17 10:07:13 +03:00
..
Names	Rename crowbar (#2085)	2024-04-30 10:55:46 +03:00
adjectives.yml	Translate traitor codewords to russian (#72)	2022-01-17 17:23:32 +03:00
corporations.yml	Translate Upstream #2114 (#2116)	2024-05-12 00:53:50 +03:00
criminal_records.yml	Translate Upstream #2114 (#2116)	2024-05-12 00:53:50 +03:00
ion_storm.yml	Rename crowbar (#2085)	2024-04-30 10:55:46 +03:00
news.yml	Perform CentCom-ification (#9876)	2022-07-19 21:08:24 -07:00
rat_king_commands.yml	Translate rat_king_commands.yml (#1456)	2023-09-25 15:35:29 +03:00
story_generation.yml	Infinity books (#25840)	2024-04-01 14:00:10 -07:00
tips.yml	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-17 10:07:13 +03:00
verbs.yml	remove sus codewords (#20060)	2023-09-12 00:37:43 -05:00