VigersRay bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Lobby/LobbyUIController.cs # Resources/Locale/en-US/chemistry/components/mixing-component.ftl # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Recipes/Crafting/crates.yml # Resources/ServerInfo/Guidebook/Mobs/Diona.xml # Resources/ServerInfo/Guidebook/Mobs/Species.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Science/Technologies.xml # Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png # Resources/Textures/Tiles/attributions.yml # Resources/migration.yml		2024-07-11 14:05:37 +03:00
..
ISSUE_TEMPLATE	Update issue templates (#19458)	2023-08-23 16:50:49 -05:00
workflows	Обнова вики через воркфлоу	2024-07-01 20:06:06 +03:00
CODEOWNERS	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-23 21:07:25 +03:00
config.yml	Create config.yml	2020-02-04 20:42:36 +01:00
labeler.yml	Update map changes labeler (#29858)	2024-07-09 23:35:31 +02:00
PULL_REQUEST_TEMPLATE.md	Update PULL_REQUEST_TEMPLATE.md	2024-06-12 23:46:23 +03:00
rsi-schema.json	Adds support for CC-BY-NC licenses (#6648)	2022-02-10 20:27:48 -07:00