Vigers Ray 2fd4797159 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/ServerInfo/Guidebook/Science/APE.xml # Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json		2024-12-13 02:10:38 +03:00
..
Guidebook	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-13 02:10:38 +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