Morb0 e76bb1fa57 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/Names/borer.yml # Resources/Prototypes/Datasets/Names/diona.yml # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # Resources/Textures/Tiles/plating_burnt.png		2024-12-05 01:22:35 +03:00
..
ISSUE_TEMPLATE	Delete toolshed-feature-request.md (#1615)	2023-12-08 16:35:24 +03:00
workflows	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-12-05 01:22:35 +03:00
CODEOWNERS	Update CODEOWNERS (#2721)	2024-11-07 07:48:06 +03:00
config.yml	Create config.yml	2020-02-04 20:42:36 +01:00
labeler.yml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-11-19 19:20:31 +03:00
PULL_REQUEST_TEMPLATE.md	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-09-11 10:56:49 +03:00
rsi-schema.json	Adds support for CC-BY-NC licenses (#6648)	2022-02-10 20:27:48 -07:00