Morb0 7d4b894002 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json		2023-12-16 03:05:40 +03:00
..
ISSUE_TEMPLATE	Delete toolshed-feature-request.md (#1615)	2023-12-08 16:35:24 +03:00
workflows	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00
CODEOWNERS	Remove myself from codeowners (too many notifications) (#22504)	2023-12-15 08:05:44 +11:00
config.yml	Create config.yml	2020-02-04 20:42:36 +01:00
labeler.yml	Fix labeler localization path	2022-06-21 01:24:26 +03:00
PULL_REQUEST_TEMPLATE.md	Update pull request template (#18900)	2023-08-18 09:22:00 -08:00
rsi-schema.json	Adds support for CC-BY-NC licenses (#6648)	2022-02-10 20:27:48 -07:00