diff --git a/.gitignore b/.gitignore index 42d4ea1508..b657b89dc8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,6 @@ ## ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore -server.cfg - # Microsoft DI related files *.[Dd]evelopment.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000000..8cb56582a5 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,8 @@ +{ + "recommendations": [ + "avaloniateam.vscode-avalonia", + "ms-dotnettools.csharp", + "ms-dotnettools.csdevkit", + "ms-dotnettools.vscode-dotnet-runtime" + ] +} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000000..b56419025f --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,32 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Nitrox.Launcher", + "type": "dotnet", + "request": "launch", + "preLaunchTask": "dotnet: build", + "projectPath": "${workspaceFolder}/Nitrox.Launcher/Nitrox.Launcher.csproj" + }, + { + "name": "Nitrox.Server.Subnautica", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "dotnet: build", + "program": "", + "args": [], + "cwd": "${workspaceFolder}/Nitrox.Server.Subnautica/", + "stopAtEntry": false, + "console": "externalTerminal", + "windows": { + "program": "${workspaceFolder}/Nitrox.Server.Subnautica/bin/Debug/net10.0/Nitrox.Server.Subnautica.exe" + }, + "linux": { + "program": "${workspaceFolder}/Nitrox.Server.Subnautica/bin/Debug/net10.0/Nitrox.Server.Subnautica" + }, + "osx": { + "program": "${workspaceFolder}/Nitrox.Server.Subnautica/bin/Debug/net10.0/Nitrox.Server.Subnautica" + } + }, + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..ca098724f7 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "files.autoSave": "afterDelay", + "editor.bracketPairColorization.enabled": true +} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 25dc1387b9..60a2f19203 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,6 +16,8 @@ true false true + + false diff --git a/Directory.Packages.props b/Directory.Packages.props index 1450e135cd..b78046676c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,21 +1,28 @@ + true true + + + 11.3.12 + 10.0.5 + + - - + + - + - + - + @@ -26,24 +33,24 @@ - + - - - - - - + + + + + + - + @@ -60,8 +67,9 @@ - + + diff --git a/Nitrox.Assets.Subnautica/LanguageFiles/cs.json b/Nitrox.Assets.Subnautica/LanguageFiles/cs.json index 5dfe18b165..cc484803f2 100644 --- a/Nitrox.Assets.Subnautica/LanguageFiles/cs.json +++ b/Nitrox.Assets.Subnautica/LanguageFiles/cs.json @@ -79,11 +79,14 @@ "Nitrox_ServerEntry_DeleteWarning": "Jste si jistý, že chcete smazat tento server?", "Nitrox_ServerStopped": "Server byl zastaven", "Nitrox_Settings_Bandwidth": "Nastavení šířky pásma", + "Nitrox_Settings_ChatVisibilityDuration": "Doba viditelnosti chatu (s)", + "Nitrox_Settings_ChatVisibilityDuration_Tooltip": "Jak dlouho zůstane chat viditelný. Nastavte hodnotu 0, chcete-li zakázat vyskakovací okna chatu.", "Nitrox_Settings_HigherForUnstable_Tooltip": "Zvyš hodnotu pro nestabilní připojení", "Nitrox_Settings_Keybind_FocusDiscord": "Zaměření na okno s pozvánkou na Discordu", "Nitrox_Settings_Keybind_OpenChat": "Otevřít chat", "Nitrox_Settings_LatencyUpdatePeriod": "Doba zpoždění aktualizace (s)", "Nitrox_Settings_OfflineClockSyncDuration": "Doba trvání procedury synchronizace hodin (s)", + "Nitrox_Settings_Privacy": "Soukromí", "Nitrox_Settings_SafetyLatencyMargin": "Bezpečnostní rozpětí zpoždění (ms)", "Nitrox_ShowPing": "Zobrazit odezvu", "Nitrox_SilenceChat": "Ztlumit chat", diff --git a/Nitrox.Assets.Subnautica/LanguageFiles/de.json b/Nitrox.Assets.Subnautica/LanguageFiles/de.json index 267c82d980..3c3c54975b 100644 --- a/Nitrox.Assets.Subnautica/LanguageFiles/de.json +++ b/Nitrox.Assets.Subnautica/LanguageFiles/de.json @@ -79,11 +79,14 @@ "Nitrox_ServerEntry_DeleteWarning": "Willst du diesen Server wirklich löschen?", "Nitrox_ServerStopped": "Der Server wurde gestoppt", "Nitrox_Settings_Bandwidth": "Bandbreiteneinstellungen", + "Nitrox_Settings_ChatVisibilityDuration": "Sichtbarkeitsdauer des Chats (s)", + "Nitrox_Settings_ChatVisibilityDuration_Tooltip": "Die Dauer, für die der Chat sichtbar bleibt. Setzen Sie den Wert auf 0, um Chat-Popups zu deaktivieren.", "Nitrox_Settings_HigherForUnstable_Tooltip": "Gib bei instabilen Verbindungen einen höheren Wert ein", "Nitrox_Settings_Keybind_FocusDiscord": "Das Discord Anfragefenster fokussieren", "Nitrox_Settings_Keybind_OpenChat": "Chat öffnen", "Nitrox_Settings_LatencyUpdatePeriod": "Latenzaktualisierungszeitraum (s)", "Nitrox_Settings_OfflineClockSyncDuration": "Dauer des Zeitsynchronisations-Prozesses (s)", + "Nitrox_Settings_Privacy": "Datenschutz", "Nitrox_Settings_SafetyLatencyMargin": "Sicherheitslatenzpuffer (ms)", "Nitrox_ShowPing": "Signal anzeigen", "Nitrox_SilenceChat": "Chat stumm schalten", diff --git a/Nitrox.Assets.Subnautica/LanguageFiles/en.json b/Nitrox.Assets.Subnautica/LanguageFiles/en.json index d258473e43..2b13c384b2 100644 --- a/Nitrox.Assets.Subnautica/LanguageFiles/en.json +++ b/Nitrox.Assets.Subnautica/LanguageFiles/en.json @@ -79,6 +79,8 @@ "Nitrox_ServerEntry_DeleteWarning": "Are you sure you want to delete this server?", "Nitrox_ServerStopped": "The server has been stopped", "Nitrox_Settings_Bandwidth": "Bandwidth settings", + "Nitrox_Settings_ChatVisibilityDuration": "Chat visibility duration (s)", + "Nitrox_Settings_ChatVisibilityDuration_Tooltip": "How long the chat stays visible. Set to 0 to disable chat popups.", "Nitrox_Settings_HigherForUnstable_Tooltip": "Give a higher value for unstable connections", "Nitrox_Settings_Keybind_FocusDiscord": "Focus on the Discord invite window", "Nitrox_Settings_Keybind_OpenChat": "Open chat", diff --git a/Nitrox.Assets.Subnautica/LanguageFiles/es.json b/Nitrox.Assets.Subnautica/LanguageFiles/es.json index 731879918b..64ecb0e09c 100644 --- a/Nitrox.Assets.Subnautica/LanguageFiles/es.json +++ b/Nitrox.Assets.Subnautica/LanguageFiles/es.json @@ -9,13 +9,14 @@ "Nitrox_AddServer_NamePlaceholder": "Introduce un nombre para el servidor", "Nitrox_AddServer_PortDescription": "Puerto:", "Nitrox_AddServer_PortPlaceholder": "Ingresa el puerto numérico del servidor", + "Nitrox_BedGetUp": "Levantarse", "Nitrox_BuildingDesyncDetected": "El servidor detectó una desincronización con un edificio del cliente local (Ve a las opciones de Nitrox para solicitar una resincronización)", "Nitrox_BuildingSettings": "Construcción de bases", "Nitrox_Cancel": "Cancelar", "Nitrox_CommandNotAvailable": "Este comando no está disponible con Nitrox", "Nitrox_Confirm": "Confirmar", "Nitrox_ConnectTo": "Conectarse a", - "Nitrox_DenyOwnershipHand": "Otro jugador esta interactiando con ese objeto", + "Nitrox_DenyOwnershipHand": "Otro jugador esta interactuando con ese objeto", "Nitrox_DisconnectedSession": "Desconectado del servidor", "Nitrox_DiscordAccept": "Aceptar", "Nitrox_DiscordDecline": "Cancelar", @@ -78,12 +79,19 @@ "Nitrox_ServerEntry_DeleteWarning": "¿Estás seguro de que deseas eliminar este servidor?", "Nitrox_ServerStopped": "El servidor se ha parado", "Nitrox_Settings_Bandwidth": "Configuración del ancho de banda", + "Nitrox_Settings_ChatVisibilityDuration": "Duración de la visibilidad del chat", + "Nitrox_Settings_ChatVisibilityDuration_Tooltip": "Cuánto tiempo permanece visible el chat. Establécelo en 0 para desactivar las ventanas emergentes del chat.", "Nitrox_Settings_HigherForUnstable_Tooltip": "Dar un valor más alto para conexiones inestables", + "Nitrox_Settings_Keybind_FocusDiscord": "Centrarse en la ventana de invitación de Discord", + "Nitrox_Settings_Keybind_OpenChat": "Abrir chat", "Nitrox_Settings_LatencyUpdatePeriod": "Periodo(s) de actualización de la latencia", + "Nitrox_Settings_OfflineClockSyncDuration": "Duración del procedimiento de sincronización del reloj", + "Nitrox_Settings_Privacy": "Privacidad", "Nitrox_Settings_SafetyLatencyMargin": "Margen de latencia de seguridad (ms)", "Nitrox_ShowPing": "Mostrar señal", "Nitrox_SilenceChat": "Silenciar el chat", "Nitrox_SilencedChatNotif": "Se silencia el chat", + "Nitrox_SleepingPlayers": "[Durmiendo]/[Total]jugadores durmiendo", "Nitrox_StartServer": "Inicie su servidor para alcanzar a su mundo", "Nitrox_SyncingWorld": "Sincronización del mundo multijugador…", "Nitrox_TeleportTo": "Teleportar hacia {PLAYER}", diff --git a/Nitrox.Assets.Subnautica/LanguageFiles/ga.json b/Nitrox.Assets.Subnautica/LanguageFiles/ga.json index ff16c16477..991d286917 100644 --- a/Nitrox.Assets.Subnautica/LanguageFiles/ga.json +++ b/Nitrox.Assets.Subnautica/LanguageFiles/ga.json @@ -79,11 +79,14 @@ "Nitrox_ServerEntry_DeleteWarning": "An bhfuil tú cinnte go dteastaíonn uait an freastalaí seo a scriosadh?", "Nitrox_ServerStopped": "Stopadh an freastalaí", "Nitrox_Settings_Bandwidth": "Socruithe bandaleithead", + "Nitrox_Settings_ChatVisibilityDuration": "Fad infheictheachta comhrá (s)", + "Nitrox_Settings_ChatVisibilityDuration_Tooltip": "Cé chomh fada is a fhanann an comhrá le feiceáil. Socraigh go 0 chun fuinneoga aníos comhrá a dhíchumasú.", "Nitrox_Settings_HigherForUnstable_Tooltip": "Tabhair luach níos airde do naisc éagobhsaí", "Nitrox_Settings_Keybind_FocusDiscord": "Dírigh ar fhuinneog cuireadh Discord", "Nitrox_Settings_Keybind_OpenChat": "Oscail comhrá", "Nitrox_Settings_LatencyUpdatePeriod": "Tréimhse (nó) nuashonraithe moille", "Nitrox_Settings_OfflineClockSyncDuration": "Fad nós imeachta sioncrónaithe cloig (s)", + "Nitrox_Settings_Privacy": "Príobháideacht", "Nitrox_Settings_SafetyLatencyMargin": "Corrlach moille sábháilteachta (ms)", "Nitrox_ShowPing": "Taispeáin Ping", "Nitrox_SilenceChat": "Balbhaigh comhrá", diff --git a/Nitrox.Assets.Subnautica/LanguageFiles/nl.json b/Nitrox.Assets.Subnautica/LanguageFiles/nl.json index f543117be4..827a6aacb7 100644 --- a/Nitrox.Assets.Subnautica/LanguageFiles/nl.json +++ b/Nitrox.Assets.Subnautica/LanguageFiles/nl.json @@ -9,6 +9,7 @@ "Nitrox_AddServer_NamePlaceholder": "Voer een naam in voor de server", "Nitrox_AddServer_PortDescription": "Poort:", "Nitrox_AddServer_PortPlaceholder": "Voer de numerieke poort van de server in", + "Nitrox_BedGetUp": "Sta op", "Nitrox_BuildingDesyncDetected": "Synchronisatie probleem gedetecteerd in basis gebouwen (ga naar Nitrox instellingen om basissen opnieuw in te laden)", "Nitrox_BuildingSettings": "Basis bouwen", "Nitrox_Cancel": "Annuleer", @@ -78,12 +79,17 @@ "Nitrox_ServerEntry_DeleteWarning": "Weet u zeker dat u deze server wilt verwijderen?", "Nitrox_ServerStopped": "Server is gestopt", "Nitrox_Settings_Bandwidth": "Bandbreedte-instellingen", + "Nitrox_Settings_ChatVisibilityDuration": "Chat zichtbaarheid duur (s)", + "Nitrox_Settings_ChatVisibilityDuration_Tooltip": "Hoelang de chat zichtbaar blijft. Zet op 0 op chat popups uit te zetten.", "Nitrox_Settings_HigherForUnstable_Tooltip": "Geef een hogere waarde voor onstabiele verbindingen", - "Nitrox_Settings_LatencyUpdatePeriod": "Latentie-updateperiode (s)", - "Nitrox_Settings_SafetyLatencyMargin": "Veiligheidslatentiemarge (ms)", + "Nitrox_Settings_Keybind_OpenChat": "Open chat", + "Nitrox_Settings_LatencyUpdatePeriod": "Latentie-updateperiode(s)", + "Nitrox_Settings_Privacy": "Privacy", + "Nitrox_Settings_SafetyLatencyMargin": "Veiligheids latentie marge (ms)", "Nitrox_ShowPing": "Laat pin zien", "Nitrox_SilenceChat": "Chat dempen", "Nitrox_SilencedChatNotif": "Chat is gedempt", + "Nitrox_SleepingPlayers": "{SLEEPING}/{TOTAL} spelers zijn aan het slapen.", "Nitrox_StartServer": "Start je server eerst om mee toe doen met je eigen gehostte wereld", "Nitrox_SyncingWorld": "Multiplayer Wereld Synchroniseren…", "Nitrox_TeleportTo": "Teleporteer naar {PLAYER}", diff --git a/Nitrox.Assets.Subnautica/LanguageFiles/pt-BR.json b/Nitrox.Assets.Subnautica/LanguageFiles/pt-BR.json index 6855a510a7..c2bccdbb22 100644 --- a/Nitrox.Assets.Subnautica/LanguageFiles/pt-BR.json +++ b/Nitrox.Assets.Subnautica/LanguageFiles/pt-BR.json @@ -9,6 +9,7 @@ "Nitrox_AddServer_NamePlaceholder": "Digite um nome para o servidor", "Nitrox_AddServer_PortDescription": "Porta:", "Nitrox_AddServer_PortPlaceholder": "Digite o número da porta do servidor", + "Nitrox_BedGetUp": "Levantar-se", "Nitrox_BuildingDesyncDetected": "O servidor detectou uma dessincronização com as construções do cliente local (vá para as configurações do Nitrox para solicitar uma ressincronização)", "Nitrox_BuildingSettings": "Construção de base", "Nitrox_Cancel": "Cancelar", @@ -28,8 +29,8 @@ "Nitrox_EnterName": "Nome do jogador", "Nitrox_ErrorDesyncDetected": "[Construção Segura] Esta base está atualmente dessincronizada, então você não pode modificá-la, a menos que sincronize novamente as construções (nas configurações do Nitrox)", "Nitrox_ErrorRecentBuildUpdate": "Não é possível modificar uma base que foi atualizada recentemente por outro jogador", - "Nitrox_Failure": "Um erro ocorreu", - "Nitrox_FinishedResyncRequest": "Levou {TIME}ms para ressincronizar {COUNT} entities", + "Nitrox_Failure": "Ocorreu um erro", + "Nitrox_FinishedResyncRequest": "Levou {TIME}ms para ressincronizar {COUNT} entidades", "Nitrox_FirewallInterfering": "As configurações do seu Firewall estão em conflito", "Nitrox_HideIp": "Ocultar endereço IP", "Nitrox_HidePing": "Ocultar Ping", @@ -39,7 +40,7 @@ "Nitrox_Join": "Entrar", "Nitrox_JoinServer": "Entrando:", "Nitrox_JoinServerPassword": "Senha:", - "Nitrox_JoinServerPasswordHeader": "O Servidor selecionado necessita de senha", + "Nitrox_JoinServerPasswordHeader": "Senha do servidor necessária", "Nitrox_JoinServerPlaceholder": "Por favor insira a senha do servidor", "Nitrox_JoiningSession": "Entrando na Sessão", "Nitrox_Kick": "Expulsar {PLAYER}", @@ -58,7 +59,7 @@ "Nitrox_OK": "Ok", "Nitrox_OutOfDateClient": "A sua instalação do Nitrox está desatualizada. Servidor: {serverVersion}, Sua: {localVersion}.", "Nitrox_OutOfDateServer": "O servidor está rodando em uma versão antiga do Nitrox. Peça para o administrador do servidor para atualizar ou desatualizar a sua instalação do Nitrox. Versão do Servidor: {serverVersion}, Sua Versão: {localVersion}.", - "Nitrox_PlayerDeathBeaconLabel": "{PLAYER}'s morto", + "Nitrox_PlayerDeathBeaconLabel": "{PLAYER} morto", "Nitrox_PlayerDied": "{PLAYER} morreu", "Nitrox_PlayerDisconnected": "{PLAYER} desconectou-se", "Nitrox_PlayerJoined": "{PLAYER} entrou no jogo.", @@ -76,21 +77,28 @@ "Nitrox_SafeBuildingLog": "Registro de construção segura", "Nitrox_ScannerRoomWarn": "Atenção: as salas de scanner não funcionam corretamente nesta versão do Nitrox. Espere muitos bugs.", "Nitrox_ServerEntry_DeleteWarning": "Tem certeza de que deseja excluir este servidor?", - "Nitrox_ServerStopped": "O servidor foi fechado", + "Nitrox_ServerStopped": "O servidor foi desligado", "Nitrox_Settings_Bandwidth": "Configurações de largura de banda", + "Nitrox_Settings_ChatVisibilityDuration": "Duração da visibilidade do chat", + "Nitrox_Settings_ChatVisibilityDuration_Tooltip": "Por quanto tempo o chat permanece visível. Defina como 0 para desativar os pop-ups do chat.", "Nitrox_Settings_HigherForUnstable_Tooltip": "Dê um valor maior para conexões instáveis", + "Nitrox_Settings_Keybind_FocusDiscord": "Foco na janela de convite do Discord", + "Nitrox_Settings_Keybind_OpenChat": "Abrir chat", "Nitrox_Settings_LatencyUpdatePeriod": "Período(s) de atualização(ões) de latência", + "Nitrox_Settings_OfflineClockSyncDuration": "Duração de procedimento de sinc. do relógio (s)", + "Nitrox_Settings_Privacy": "Privacidade", "Nitrox_Settings_SafetyLatencyMargin": "Margem de latência de segurança (ms)", "Nitrox_ShowPing": "Mostrar ping", "Nitrox_SilenceChat": "Silenciar a conversa", "Nitrox_SilencedChatNotif": "O chat agora está silenciado", + "Nitrox_SleepingPlayers": "{SLEEPING}/{TOTAL} jogadores dormindo.", "Nitrox_StartServer": "Inicie seu servidor primeiro para entrar na sua sessão", "Nitrox_SyncingWorld": "Sincronizando com Servidor Multiplayer…", "Nitrox_TeleportTo": "Teletransportar para {PLAYER}", "Nitrox_TeleportToMe": "Teletransportar {PLAYER} para mim", "Nitrox_TeleportToMeQuestion": "Teletransportar {PLAYER} para mim?", "Nitrox_TeleportToQuestion": "Teletransportar para {PLAYER}?", - "Nitrox_ThankForPlaying": "Obrigado por utilizar Nitrox !", + "Nitrox_ThankForPlaying": "Obrigado por utilizar Nitrox!", "Nitrox_UnableToConnect": "Não foi possível conectar com o Servidor remoto:", "Nitrox_Unmute": "Desmutar {PLAYER}", "Nitrox_UnmuteQuestion": "Desmutar {PLAYER}?", diff --git a/Nitrox.Assets.Subnautica/LanguageFiles/uk.json b/Nitrox.Assets.Subnautica/LanguageFiles/uk.json index bc28e561b7..3a01f853bd 100644 --- a/Nitrox.Assets.Subnautica/LanguageFiles/uk.json +++ b/Nitrox.Assets.Subnautica/LanguageFiles/uk.json @@ -9,6 +9,7 @@ "Nitrox_AddServer_NamePlaceholder": "Введіть ім'я серверу", "Nitrox_AddServer_PortDescription": "Порт:", "Nitrox_AddServer_PortPlaceholder": "Введіть числовий порт сервера", + "Nitrox_BedGetUp": "Вставай", "Nitrox_BuildingDesyncDetected": "Сервер виявив десинхронізацію з локальними клієнтськими будівлями (перейдіть до налаштувань Nitrox, щоб надіслати запит на повторну синхронізацію)", "Nitrox_BuildingSettings": "Налаштування будівель", "Nitrox_Cancel": "Скасувати", diff --git a/Nitrox.Launcher/Models/Controls/CustomTitlebar.axaml b/Nitrox.Launcher/Models/Controls/CustomTitlebar.axaml index de1cff957c..18629d45cc 100644 --- a/Nitrox.Launcher/Models/Controls/CustomTitlebar.axaml +++ b/Nitrox.Launcher/Models/Controls/CustomTitlebar.axaml @@ -2,6 +2,7 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="clr-namespace:Nitrox.Launcher.Models.Controls" + xmlns:design="clr-namespace:Nitrox.Launcher.Models.Design" xmlns:converters="clr-namespace:Nitrox.Launcher.Models.Converters"> @@ -77,6 +78,7 @@ + + diff --git a/Nitrox.Launcher/Views/OptionsView.axaml b/Nitrox.Launcher/Views/OptionsView.axaml index 4ba8efe0ef..0b4a3c9bc3 100644 --- a/Nitrox.Launcher/Views/OptionsView.axaml +++ b/Nitrox.Launcher/Views/OptionsView.axaml @@ -236,12 +236,12 @@ FontSize="15" Foreground="{DynamicResource BrandBlack}" Opacity="0.75" - Text="{Binding ProgramDataFolderDir}" + Text="{Binding ProgramDataPath}" VerticalAlignment="Center" />