Vigers Ray 28484c893c Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Damage/modifier_sets.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml # Resources/migration.yml		2024-12-16 18:50:05 +03:00
..
magic.ftl
spells-actions.ftl	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-16 18:50:05 +03:00