rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Launcher
History
Vigers Ray fffada0d68 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Launcher/LauncherConnectingGui.xaml
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs
#	Content.Server/Cargo/Components/StationBankAccountComponent.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
#	Content.Shared/Weapons/Reflect/ReflectSystem.cs
#	Resources/Locale/en-US/_strings/cargo/cargo-accounts.ftl
2025-04-13 17:18:35 +03:00
..
ExtendedDisconnectInformationManager.cs Redial Button II - Now with magic! (#8237) 2022-05-21 18:56:18 -07:00
LauncherConnecting.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-08-22 06:50:04 +03:00
LauncherConnectingGui.xaml Merge remote-tracking branch 'space-wizards/master' 2025-04-13 17:18:35 +03:00
LauncherConnectingGui.xaml.cs Уменьшил время на переподключение до 15с 2024-11-26 20:46:48 +03:00