Vigers Ray d86ad2ba97 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Locale/en-US/_strings/discord/watchlist-connections.ftl # Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json		2025-01-15 18:23:20 +03:00
..
Aliens	upstream	2024-09-16 12:40:23 +03:00
Animals	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-01 18:21:33 +03:00
Customization	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-01 07:50:33 +03:00
Demons	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-15 18:23:20 +03:00
Effects	Fire sprite change for mice (#26758)	2024-04-06 00:41:23 -04:00
Elemental	crystals drop shards and ore crab tweaks. (#20930)	2023-12-16 15:20:14 -07:00
Ghosts	Use new validate-rsis for workflow (#12997)	2022-12-20 06:31:17 +01:00
Pets	Added support so that smile can use hats (#33924)	2024-12-29 02:49:05 +01:00
Silicon	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-07 07:45:07 +03:00
Species	Обновление спонсорской системы (#905)	2024-12-23 20:45:39 +03:00