Vigers Ray fba2af74b3 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/labeler.yml # .github/workflows/labeler-needsreview.yml # .github/workflows/labeler-untriaged.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml # Resources/Prototypes/tags.yml # Resources/ServerInfo/Guidebook/Science/Cyborgs.xml # Resources/migration.yml		2024-11-15 14:52:30 +03:00
..
Guidebook	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-15 14:52:30 +03:00
Gameplay.txt	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Intro.txt	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Sandbox.txt	Rename "Server Info" to ServerInfo (#15436)	2023-04-16 10:55:59 +10:00