rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/ServerInfo
History
Vigers Ray 19ff7831b6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
#	Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/ServerInfo/Guidebook/SpaceStation14.xml
2024-06-09 22:32:37 +03:00
..
Guidebook Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-09 22:32:37 +03:00
FishStationLRPRules.txt Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
FishStationMRPRules.txt Merge sunrise build (#2) 2024-05-31 02:16:18 +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
SunriseRules.txt Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00