Merge branch 'main' into gamemode_fdgamemode_fd

18 files changed, 1153 insertions, 97 deletions

diff --git a/Northstar.Client/mod/resource/fontfiletable.txt b/Northstar.Client/mod/resource/fontfiletable.txt
deleted file mode 100644
index b42381341..000000000
--- a/Northstar.Client/mod/resource/fontfiletable.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-FontFileTable
-{
-	"Default"					"resource/MetronicPro-Regular.vfont"	[!$JAPANESE && !$TCHINESE]
-	"Default"					"resource/NotoSansJP-Regular.vfont"		[$JAPANESE]
-	"Default"					"resource/NotoSansTC-Regular.vfont"		[$TCHINESE]
-
-	"DefaultBold"				"resource/MetronicPro-SemiBold.vfont"	[!$JAPANESE && !$TCHINESE]
-	"DefaultBold"				"resource/NotoSansJP-Regular.vfont"		[$JAPANESE]
-	"DefaultBold"				"resource/NotoSansTC-Regular.vfont"		[$TCHINESE]
-
-	"Titanfall"					"resource/Titanfall-Regular.vfont"		[!$JAPANESE && !$TCHINESE && !$RUSSIAN]
-	"Titanfall"					"resource/NotoSansJP-Regular.vfont"		[$JAPANESE]
-	"Titanfall"					"resource/NotoSansTC-Regular.vfont"		[$TCHINESE]
-	"Titanfall"					"resource/MetronicPro-SemiBold.vfont"	[$RUSSIAN]
-
-	"marlett"					"vgui/fonts/marlett.ttf"
-
-	// Everything below is DONOTSHIP / Dev only
-
-	"arial unicode ms"			"resource/Lato-Regular.ttf"
-
-	"lucida console"			"resource/NorthstarMono.ttf"			[$PC]
-	"lucida console"			"resource/MetronicPro-Regular.vfont"	[$GAMECONSOLE]
-
-	"tahoma"					"fonts\\tahoma.ttf"						[$PC]
-	"tahoma"					"resource/MetronicPro-Regular.vfont"  	[$GAMECONSOLE]
-
-	"tahoma bold"				"fonts\\tahomabd.ttf" 					[$PC]
-	"tahoma bold"				"resource/MetronicPro-SemiBold.vfont"  	[$GAMECONSOLE]
-
-	"courier new"				"fonts\\cour.ttf"						[$PC]
-	"courier new"				"vgui/fonts/cour.ttf"					[$GAMECONSOLE]
-
-	"times new roman"			"fonts\\times.ttf"						[$PC]
-	"times new roman"			"vgui/fonts/times.ttf" 					[$GAMECONSOLE]
-
-	"arial"						"resource/Lato-Regular.ttf"
-	"arial bold"				"resource/Lato-Regular.ttf"
-	"arial narrow"				"resource/Lato-Regular.ttf"
-}
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
index e6518febb..29d7cddf8 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
@@ -320,7 +320,7 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"UNAUTHORIZED_PWD" 				"Wrong password"
 		"STRYDER_RESPONSE" 				"Couldn't parse stryder response"
 		"PLAYER_NOT_FOUND" 				"Couldn't find player account"
-		"INVALID_MASTERSERVER_TOKEN" 	"Invalid or expired masterserver token"
+		"INVALID_MASTERSERVER_TOKEN" 	"Invalid or expired masterserver token, try restarting EA App."
 		"JSON_PARSE_ERROR" 				"Error parsing json response"
 		"UNSUPPORTED_VERSION" 			"The version you are using is no longer supported"
 
@@ -373,12 +373,14 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"WRONG_MOD_VERSION"					"Server has mod \"%s1\" v%s2 while you have v%s3"
 		"MOD_NOT_VERIFIED"					"(mod is not verified, and couldn't be downloaded automatically)"
 		"MOD_DL_DISABLED"					"(automatic mod downloading is disabled)"
+		"MANIFESTO_FETCHING_TITLE"			"Setting up mod download"
+		"MANIFESTO_FETCHING_TEXT"			"Retrieving the list of verified mods..."
 		"DOWNLOADING_MOD_TITLE"				"Downloading mod"
 		"DOWNLOADING_MOD_TITLE_W_PROGRESS" 	"Downloading mod (%s1%)"
 		"DOWNLOADING_MOD_TEXT"				"Downloading %s1 v%s2..."
 		"DOWNLOADING_MOD_TEXT_W_PROGRESS"	"Downloading %s1 v%s2...\n(%s3/%s4 MB)"
-		"CHECKSUMING_TITLE"					"Checksuming mod"
-		"CHECKSUMING_TEXT"					"Verifying contents of %s1 v%s2..."
+		"CHECKSUMING_TITLE"					"Verifying mod integrity"
+		"CHECKSUMING_TEXT"					"Validating files of %s1 v%s2..."
 		"EXTRACTING_MOD_TITLE"				"Extracting mod (%s1%)"
 		"EXTRACTING_MOD_TEXT"				"Extracting %s1 v%s2...\n(%s3/%s4 MB)"
 		"FAILED_DOWNLOADING"				"Failed downloading mod"
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_french.txt b/Northstar.Client/mod/resource/northstar_client_localisation_french.txt
index b0e579cff..9444a39e3 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_french.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_french.txt
@@ -316,7 +316,7 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"UNAUTHORIZED_PWD"                 "Mot de passe incorrect"
 		"STRYDER_RESPONSE"                 "Impossible d'analyser la réponse de Stryder"
 		"PLAYER_NOT_FOUND"                 "Impossible de trouver le compte du joueur"
-		"INVALID_MASTERSERVER_TOKEN"     "Jeton du server maître invalide ou expiré"
+		"INVALID_MASTERSERVER_TOKEN"     "Token du server maître invalide ou expiré, veuillez relancer l'application EA."
 		"JSON_PARSE_ERROR"                 "Une erreur est survenue durant l'analyse JSON"
 		"UNSUPPORTED_VERSION"             "La version que vous utilisez n'est plus supportée"
 
@@ -348,7 +348,7 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"PROGRESSION_ENABLED_HEADER"        "Progression activée !"
 		"PROGRESSION_DISABLED_HEADER"        "Progression désactivée !"
 		"PROGRESSION_DISABLED_BODY"        "^CCCC0000La progression a été désactivée.^\n\nLes Titans, Armes, Factions, Skins, et autres seront débloqués et utilisables en tout temps.\n\nPeut être changé à n'importe que moment dans le salon multijoueurs."
-		"PROGRESSION_TOGGLE_DISABLED_BODY"        "Les Titans, Armes, Factions, Skins et autres seront débloqués par la monté en niveau ou par leur achats en mérites.\n\nPeut être changé à n'importe que moment dans le salon multijoueurs.\n\n^CC000000Warning : Si vous équiper des objets que vous n'avez pas encore débloqués, ils seront déséquipés !"
+		"PROGRESSION_TOGGLE_DISABLED_BODY"        "Les Titans, Armes, Factions, Skins et autres seront débloqués par la monté en niveau ou par leur achats en mérites.\n\nPeut être changé à n'importe que moment dans le salon multijoueurs.\n\n^CC000000Warning : Si vous équipez des objets que vous n'avez pas encore débloqués, ils seront déséquipés !"
 		"PROGRESSION_ENABLED_BODY"        "^CCCC0000La progression a été activée.^\n\nLes Titans, Armes, Factions, Skins et autres seront débloqués par la monté en niveau ou par leur achats en mérites.\n\nPeut être changé à n'importe que moment dans le salon multijoueurs."
 		"TOGGLE_PROGRESSION"        "Activer la progression"
 		"Y_BUTTON_TOGGLE_PROGRESSION"        "%[Y_BUTTON|]% Activer la progression"
@@ -357,5 +357,27 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"AUTHENTICATION_FAILED_HELP"        "Aide"
 		"AUTHENTICATION_FAILED_ERROR_CODE"        "Code d'erreur : ^DB6F2C00%s1^"
 		"AUTHENTICATION_FAILED_BODY"        "L'authentification avec Atlas a échoué."
+		"MISSING_MOD"        "Mod manquant \"%s1\" v%s2"
+		"MOD_REQUIRED_WARNING"        " : Ce mod peut être (dé)chargé automatiquement en rejoignant un serveur"
+		"EXTRACTING_MOD_TITLE"        "Extraction du mod (%s1%)"
+		"MOD_NOT_VERIFIED"        "(ce mod n'est pas vérifié, et n'a donc pas pu être automatiquement téléchargé)"
+		"MOD_DL_DISABLED"        "(le téléchargement automatique de mods est désactivé)"
+		"DOWNLOADING_MOD_TITLE"        "Téléchargement du mod"
+		"DOWNLOADING_MOD_TITLE_W_PROGRESS"        "Téléchargement du mod (%s1%)"
+		"DOWNLOADING_MOD_TEXT"        "Téléchargement de %s1 v%s2..."
+		"WRONG_MOD_VERSION"        "Le serveur requiert la version v%s2 du mod \"%s1\" (vous avez la version v%s3)"
+		"DOWNLOADING_MOD_TEXT_W_PROGRESS"        "Téléchargement de %s1 v%s2...\n(%s3/%s4 Mo)"
+		"CHECKSUMING_TITLE"        "Vérification de la somme de contrôle du mod"
+		"CHECKSUMING_TEXT"        "Vérification du contenu de %s1 v%s2..."
+		"EXTRACTING_MOD_TEXT"        "Extraction de %s1 v%s2...\n(%s3/%s4 Mo)"
+		"FAILED_DOWNLOADING"        "Echec du téléchargement du mod"
+		"FAILED_READING_ARCHIVE"        "Une erreur est survenue lors de la lecture de l'archive."
+		"FAILED_WRITING_TO_DISK"        "Une erreur est survenue lors de l'extraction des fichiers."
+		"MOD_FETCHING_FAILED"        "L'archive n'a pas pu être téléchargée depuis Thunderstore."
+		"MOD_CORRUPTED"        "La somme de contrôle de l'archive ne correspond pas à la signature vérifiée."
+		"NO_DISK_SPACE_AVAILABLE"        "L'espace restant sur votre disque est insuffisant."
+		"MOD_FETCHING_FAILED_GENERAL"        "L'extraction du mod a échoué. Consultez le journal pour plus d'informations."
+		"MANIFESTO_FETCHING_TITLE"        "Préparation du téléchargement du mod"
+		"MANIFESTO_FETCHING_TEXT"        "Récupération de la liste des mods vérifiés..."
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_german.txt b/Northstar.Client/mod/resource/northstar_client_localisation_german.txt
index f1994a243..726ad6ac8 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_german.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_german.txt
@@ -17,9 +17,9 @@
 Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü ändern."
 		"BACK_AUTHENTICATION_AGREEMENT" "Authentifizierungs-Einwilligung"
 		"AUTHENTICATION_AGREEMENT" "Authentifizierungs-Einwilligung"
-		"AUTHENTICATION_AGREEMENT_RESTART" "Ein Neustart ist notwendig, um diese Änderung zu übernehmen"
+		"AUTHENTICATION_AGREEMENT_RESTART" "Ein Neustart ist notwendig, um diese Änderung zu übernehmen."
 
-		"DIALOG_AUTHENTICATING_MASTERSERVER" "Authentifizierung mit Master Server"
+		"DIALOG_AUTHENTICATING_MASTERSERVER" "Authentifizierung mit Master Server."
 		"AUTHENTICATIONAGREEMENT_NO" "Du hast dich gegen die Authentifizierung mit Northstar entschieden. Du kannst die Authentifizierungs-Einwilligung im Modmenü ansehen."
 
 		"MENU_TITLE_SERVER_BROWSER" "Server Browser"
@@ -312,5 +312,69 @@ Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü �
 		"UNSUPPORTED_VERSION"             "Die Version die du benutzt ist nicht länger unterstützt"
 		"SNS_LEADER_BANKRUPT_SUB"             "%s1 Wurde Von %s2 Zurückgesetzt"
 		"SNS_BANKRUPT_SUB"             "Dein Punkestand wurde von %s1 zurückgesetzt"
+		"respawnprotection"             "Respawn Schutzdauer"
+		"SNS_BANKRUPT"             "Bankrott!"
+		"SNS_LEADER_BANKRUPT"             "Punktzahlführer Bankrott!"
+		"sns_reset_pulse_blade_cooldown_on_pulse_blade_kill"             "Kill Cooldown Zurücksetzungen"
+		"player_force_respawn"             "Erzwungener Respawn"
+		"SHOW_ONLY_NOT_REQUIRED"             "Nur optionale Mods"
+		"SHOW_ONLY_REQUIRED"             "Nur notwendige Mods"
+		"PROGRESSION_TOGGLE_DISABLED_HEADER"             "Fortschritt aktivieren?"
+		"TOGGLE_PROGRESSION"             "Fortschritt umschalten"
+		"PROGRESSION_TOGGLE_ENABLED_HEADER"             "Fortschritt deaktivieren?"
+		"PROGRESSION_TOGGLE_ENABLED_BODY"             "Titans, Waffen, Fraktionen, Skins, usw werden freigeschaltet und sind zu jeder Zeit verfügbar .\n\nDies kann in der Mehrspielerlobby zu jedem Zeitpunkt geändert werden."
+		"MATCH_COUNTDOWN_LENGTH"             "Countdown für privates Match"
+		"LOG_UNKNOWN_CLIENTCOMMANDS"             "Unbekannte Clientbefehle loggen"
+		"DISALLOWED_TACTICALS"             "Verbotene Taktiken"
+		"TACTICAL_REPLACEMENT"             "Taktischer Austausch"
+		"AUTHENTICATION_FAILED_HEADER"             "Authentifizierung fehlgeschlagen"
+		"AUTHENTICATION_FAILED_BODY"             "Authentifizierung mit Atlas fehlgeschlagen!"
+		"AUTHENTICATION_FAILED_ERROR_CODE"             "Fehlercode: ^DB6F2C00%s1^"
+		"AUTHENTICATION_FAILED_HELP"             "Hilfe"
+		"NORTHSTAR_BASE_SETTINGS"             "Northstar Grundeinstellungen"
+		"ONLY_HOST_MATCH_SETTINGS"             "Nur der Host kann die Einstellungen eines privaten Matches ändern"
+		"ONLY_HOST_CAN_START_MATCH"             "Nur der Host kann das Match starten"
+		"MISSING_MOD"             "Fehlender Mod \"%s1\" v%s2"
+		"MOD_DL_DISABLED"             "(automatisches Herunterladen ist deaktiviert)"
+		"DOWNLOADING_MOD_TITLE"             "Lade Mod herunter"
+		"DOWNLOADING_MOD_TITLE_W_PROGRESS"             "Lade Mod (%s1%)"
+		"DOWNLOADING_MOD_TEXT"             "Lade %s1 v%s2..."
+		"DOWNLOADING_MOD_TEXT_W_PROGRESS"             "Lade %s1 v%s2...\n(%s3/%s4 MB)"
+		"CHECKSUMING_TITLE"             "Überprüfe Mod Prüfsumme"
+		"MOD_NOT_VERIFIED"             "(mod ist nicht verifiziert und kann nicht automatisch herunterladen werden)"
+		"MOD_REQUIRED_WARNING"             " : Dieser Mod könnte Sie (un)ausgestattet hinterlassen, sobald Sie einem Server beitreten"
+		"MOD_SETTINGS"             "Mod Einstellungen"
+		"DISALLOWED_WEAPONS"             "Verbotene Waffen"
+		"REPLACEMENT_WEAPON"             "Austausch Waffen"
+		"SHOULD_RETURN_TO_LOBBY"             "Zur Lobby nach Matchende zurückkehren"
+		"ARE_YOU_SURE"             "Sind Sie sich sicher?"
+		"MOD_SETTINGS_SERVER"             "Server"
+		"MOD_SETTINGS_RESET"             "Zurücksetzen"
+		"MOD_SETTINGS_RESET_ALL"             "Alles zurücksetzen"
+		"NO_RESULTS"             "Keine Ergebnisse."
+		"NO_MODS"             "Keine Einstellungen verfügbar! Installieren sie weitere Mods über^5588FF00northstar.thunderstore.io^0."
+		"PROGRESSION_ENABLED_HEADER"             "Fortschritt aktiviert!"
+		"PROGRESSION_DISABLED_HEADER"             "Fortschritt deaktiviert!"
+		"WILL_RESET_ALL_SETTINGS"             "Dadurch werden ALLE Einstellungen, die zu dieser Kategorie gehören, zurückgesetzt.\n\nDies kann nicht rückgängig gemacht werden."
+		"WILL_RESET_SETTING"             "Dies setzten die Einstellungen %s1 auf deren Ursprungeswert zurück.\n\nDies kann nicht rückgängig gemacht werden."
+		"Y_BUTTON_TOGGLE_PROGRESSION"             "%[Y_BUTTON|]% Fortschritt umschalten"
+		"PROGRESSION_TOGGLE_DISABLED_BODY"             "Titans, Waffen, Fraktionen, Skins usw. müssen durch Levelaufstieg freigeschaltet oder mit Verdiensten gekauft werden.\n\nDies kann jederzeit in der Mehrspieler-Lobby geändert werden.\n\n^CC000000Warnung: Wenn Sie derzeit ausgerüstete Gegenstände besitzen, die Sie nicht freigeschaltet haben, werden diese zurückgesetzt!"
+		"PROGRESSION_ENABLED_BODY"             "^CCCC0000Fortschritt wurde aktiviert.^\n\nTitans, Waffen, Fraktionen, Skins usw. müssen durch Levelaufstieg freigeschaltet oder mit Verdiensten gekauft werden.\n\nDies kann jederzeit in der Mehrspieler-Lobby geändert werden."
+		"PROGRESSION_DISABLED_BODY"             "^CCCC0000Fortschritt wurde deaktiviert.^\n\nTitans, Waffen, Fraktionen, Skins usw. werden alle freigeschaltet und jederzeit nutzbar sein.\n\nDies kann jederzeit in der Mehrspieler-Lobby geändert werden."
+		"CHECKSUMING_TEXT"             "Verifiziere Inhalte von %s1 v%s2..."
+		"EXTRACTING_MOD_TITLE"             "Extrahiere Mod (%s1%)"
+		"EXTRACTING_MOD_TEXT"             "Extrahiere %s1 v%s2...\n(%s3/%s4 MB)"
+		"FAILED_DOWNLOADING"             "Herunterladen der Mod fehlgeschlagen"
+		"FAILED_READING_ARCHIVE"             "Während des Lesens der Mod Archivs ist ein Fehler aufgetreten."
+		"FAILED_WRITING_TO_DISK"             "Während des Extrahierens der Mod in das Dateisysteme ist ein Fehler aufgetreten."
+		"WRONG_MOD_VERSION"             "Der Server verfügt über Mod \"%s1\" v%s2 während Sie v%s3 haben"
+		"MOD_FETCHING_FAILED"             "Mod Archiv konnte nicht von Thunderstore heruntergeladen werden."
+		"MOD_CORRUPTED"             "Prüfsumme des heruntergeladenen Archivs stimmt nicht mit der verifizierten Signatur überein."
+		"NO_DISK_SPACE_AVAILABLE"             "Sie verfügen nicht über ausreichend Speicherplatz auf ihrer Festplatte."
+		"MOD_FETCHING_FAILED_GENERAL"             "Mod Extraktion fehlgeschlagen. Überprüfen Sie die Logs für weitere Details."
+		"gg_assist_reward"             "Assist Anteilige Belohnung"
+		"SCOREBOARD_BANKRUPTS"             "Bankrott Kills"
+		"sns_offhand_kill_value"             "Freihand Killwert"
+		"PROGRESSION_ANNOUNCEMENT_BODY"             "^CCCC0000Fortschritt kann jetzt aktiviert werden!^\n\nNorthstar unterstützt nun den standardmäßigen Fortschritt, was bedeutet, dass Sie Waffen, Skins, Titans usw. durch Levelaufstieg und das Abschließen von Herausforderungen freischalten können.\n\nSie können den Fortschritt mit dem Button am unteren Rand des Lobbybildschirms aktivieren.\n\nDies kann jederzeit geändert werden."
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_italian.txt b/Northstar.Client/mod/resource/northstar_client_localisation_italian.txt
index 38e67dea4..089edf35b 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_italian.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_italian.txt
@@ -316,7 +316,7 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
 		"UNAUTHORIZED_PWD"                 "Password errata"
 		"STRYDER_RESPONSE"                 "Non è stato possibile analizzare la risposta di Stryder"
 		"PLAYER_NOT_FOUND"                 "Non è stato trovato l'account player"
-		"INVALID_MASTERSERVER_TOKEN"     "Token Masterserver invalido o scaduto"
+		"INVALID_MASTERSERVER_TOKEN"     "Token Masterserver invalido o scaduto, prova a riavviare l'App EA"
 		"JSON_PARSE_ERROR"                 "Errore nell'analisi della risposta json"
 		"UNSUPPORTED_VERSION"             "La versione che stai usando non è più supportata"
 
@@ -380,5 +380,42 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
 		"sns_wme_kill_value"		"Valore per uccisione Wingman d'Elite"
 		"sns_reset_kill_value"		"Valore per uccisione Lama Impulsi/Esecuzione"
 		"PL_tffa_desc"		"Ogni pilota per sè, distruggi tutti i titan nemici."
+		"player_force_respawn"		"Respawn Forzato"
+		"PROGRESSION_TOGGLE_DISABLED_HEADER"		"Attivare Progressione?"
+		"TOGGLE_PROGRESSION"		"Attiva/Disattiva Progressione"
+		"Y_BUTTON_TOGGLE_PROGRESSION"		"%[Y_BUTTON|]% Attiva/Disattiva Progressione"
+		"PROGRESSION_TOGGLE_ENABLED_HEADER"		"Disattivare la Progressione?"
+		"AUTHENTICATION_FAILED_BODY"		"Fallimento nell'autenticare con Atlas"
+		"AUTHENTICATION_FAILED_ERROR_CODE"		"Codice di errore: ^DB6F2C00%s1^"
+		"AUTHENTICATION_FAILED_HELP"		"Aiuto"
+		"AUTHENTICATION_FAILED_HEADER"		"Autenticazione Fallita"
+		"MISSING_MOD"		"Mod mancante \"%s1\" v%s2"
+		"MOD_NOT_VERIFIED"		"(Mod non verificata, non è stato possibile il download automatico)"
+		"MOD_DL_DISABLED"		"(Il download automatico delle mod è disabilitato)"
+		"DOWNLOADING_MOD_TEXT"		"Download %s1 v%s2..."
+		"CHECKSUMING_TEXT"		"Verifica contenuti %s1 v%s2..."
+		"EXTRACTING_MOD_TITLE"		"Estrazione mod (%s1%)"
+		"FAILED_DOWNLOADING"		"Download della mod fallito"
+		"NO_DISK_SPACE_AVAILABLE"		"Non c'è abbastanza spazio sul disco."
+		"MOD_FETCHING_FAILED_GENERAL"		"Estrazione mod fallita. Controlla i file di log per più dettagli."
+		"DOWNLOADING_MOD_TITLE"		"Download mod in corso"
+		"DOWNLOADING_MOD_TITLE_W_PROGRESS"		"Download in corso della mod (%s1%)"
+		"FAILED_READING_ARCHIVE"		"C'è stato un errore durante la lettura dell'archivio della mod."
+		"FAILED_WRITING_TO_DISK"		"C'è stato un errore durante l'estrazione della mod al filesystem."
+		"MOD_FETCHING_FAILED"		"Impossibile scaricare l'archivio mod da Thunderstore."
+		"MOD_CORRUPTED"		"La firma dell'archivio scaricato non corrisponde con quella verificata."
+		"DOWNLOADING_MOD_TEXT_W_PROGRESS"		"Download %s1 v%s2...\n(%s3/%s4 MB)"
+		"EXTRACTING_MOD_TEXT"		"Estraendo %s1 v%s2...\n(%s3/%s4 MB)"
+		"MOD_REQUIRED_WARNING"		" : Questa mod potrebbe venire (non)caricata entrando in un server"
+		"PROGRESSION_ENABLED_HEADER"		"Progressione Attivata!"
+		"PROGRESSION_ENABLED_BODY"		"^CCCC0000La progessione è stata abilitata.^\n\nTitan, Armi, Fazioni, Skin, etc. dovranno essere sbloccate livellando, o comprate con i Meriti.\n\nQuesto può essere cambiato in qualsiasi momento nella lobby multigiocatore."
+		"PROGRESSION_DISABLED_HEADER"		"Progressione Disabilitata!"
+		"PROGRESSION_DISABLED_BODY"		"^CCCC0000La progressione è stata disabilitata.^\n\nTitan, Armi, Fazioni, Skin, etc. saranno sbloccate e utilizzabili in qualsiasi momento.\n\nQuesto può essere cambiato in qualsiasi momento nella lobby multigiocatore."
+		"WRONG_MOD_VERSION"		"Il server ha la mod \"%s1\" v%s2 mentre tu hai v%s3"
+		"MANIFESTO_FETCHING_TITLE"		"Iniziando download mod"
+		"MANIFESTO_FETCHING_TEXT"		"Recuperando lista delle mod verificate..."
+		"PROGRESSION_TOGGLE_ENABLED_BODY"		"Titan, Armi, Fazioni, Skin, etc. saranno tutti sbloccati e utilizzabili in ogni momento.\n\nQuesto può essere cambiato in qualsiasi momento nella lobby Multigiocatore."
+		"PROGRESSION_TOGGLE_DISABLED_BODY"		"Titan, Armi, Factions, Skin, etc. avranno bisogno di essere sbloccate livellando, o comprate con i Meriti.\n\nQuesto può essere cambiato in ogni momento nella lobby Multiplayer.\n\n^CC000000Attenzione: se al momento hai equipaggiato degli item che non hai sbloccato, verranno resettati!"
+		"PROGRESSION_ANNOUNCEMENT_BODY"		"^CCCC0000La progressione può essere abilitata ora!^\n\nNorthstar ora supporta la progressione vanilla, ciò significa che puoi scegliere di sbloccare Armi, Skin, Titan, etc. attraverso i livelli e le sfide.\n\nPuoi abilitare la progressione cliccando il pulsante in basso nella schermata lobby.\n\nQuesto può essere cambiato in qualsiasi momento."
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_japanese.txt b/Northstar.Client/mod/resource/northstar_client_localisation_japanese.txt
index b7fadeaff..798d603e0 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_japanese.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_japanese.txt
@@ -233,8 +233,8 @@
 		"GAMEMODE_fastball" "ファストボール"
 		"PL_fastball" "ファストボール"
 		"PL_fastball_lobby" "ファストボール ロビー"
-		"PL_fastball_desc" "ライブファイア。パネルをハックし、味方を蘇生できる"
-		"PL_fastball_hint" "ライブファイア。パネルをハックし、味方を蘇生できる"
+		"PL_fastball_desc" "ライブファイア。パネルをハックし、味方を蘇生できる。"
+		"PL_fastball_hint" "ライブファイア。パネルをハックし、味方を蘇生できる。"
 		"PL_fastball_abbr" "FB"
 		"FASTBALL_PANEL_CAPTURED" "%s1 がパネル%s2を制圧した"
 		"SCOREBOARD_FASTBALL_HACKS" "制圧パネル"
@@ -265,10 +265,10 @@
 		"player_bleedout_aiBleedingPlayerMissChance" "ダウン時のAI命中率"
 
 		// coop stuff
-		"PL_sp_coop" "(UNFINISHED) Singleplayer Coop"
-		"PL_sp_coop_lobby" "Singleplayer Coop Lobby"
-		"PL_sp_coop_desc" "Play through the singleplayer campaign with friends"
-		"PL_sp_coop_hint" "Play through the singleplayer campaign with friends"
+		"PL_sp_coop" "(未完成) シングルプレイヤー 協力モード"
+		"PL_sp_coop_lobby" "シングルプレイヤー 協力モード ロビー"
+		"PL_sp_coop_desc" "シングルプレイヤーのキャンペーンモードをフレンドと一緒にプレイできる"
+		"PL_sp_coop_hint" "シングルプレイヤーのキャンペーンモードをフレンドと一緒にプレイできる"
 		"PL_sp_coop_abbr" "SP"
 
 		"SP_TRAINING" "パイロット・ガントレット"
@@ -340,13 +340,70 @@
 		"NO_GAMESERVER_RESPONSE" 		"ゲームサーバーに接続できません\n(Couldn't reach game server)"
 		"BAD_GAMESERVER_RESPONSE" 		"ゲームサーバーが不明なレスポンスを返しました\n(Game server gave an invalid response)"
 		"UNAUTHORIZED_GAMESERVER" 		"ゲームサーバーにそのリクエストを作成する許可がありません\n(Game server is not authorized to make that request)"
-		"UNAUTHORIZED_GAME"				"StryderはこのアカウントがTitanfall 2を所持しているかどうかを確認できませんでした\nStryder couldn't confirm that this account owns Titanfall 2"
+		"UNAUTHORIZED_GAME"				"StryderはこのアカウントがTitanfall 2を所持しているかどうかを確認できませんでした\n(Stryder couldn't confirm that this account owns Titanfall 2)"
 		"UNAUTHORIZED_PWD" 				"パスワードが間違っています\n(Wrong password)"
 		"STRYDER_RESPONSE" 				"Stryderからのレスポンスの処理に失敗しました\n(Couldn't parse stryder response)"
 		"PLAYER_NOT_FOUND" 				"プレイヤーのアカウントが見つかりません\n(Couldn't find player account)"
-		"INVALID_MASTERSERVER_TOKEN" 	"マスターサーバーのトークンが不明か期限切れです\n(Invalid or expired masterserver token)"
+		"INVALID_MASTERSERVER_TOKEN" 	"マスターサーバーのトークンが不明か期限切れです。EAアプリの再起動をお試しください。\n(Invalid or expired masterserver token, try restarting EA App.)"
 		"JSON_PARSE_ERROR" 				"JSONレスポンスの処理に失敗しました\n(Error parsing json response)"
 		"UNSUPPORTED_VERSION" 			"現在使用しているバージョンはサポートされていません\n(The version you are using is no longer supported)"
+		"player_force_respawn" 			"強制リスポーン"
+		"SHOW_ONLY_REQUIRED" 			"必須のModのみ"
+		"Y_BUTTON_TOGGLE_PROGRESSION" 			"%[Y_BUTTON|]% 進行システム切り替え"
+		"TOGGLE_PROGRESSION" 			"進行システム切り替え"
+		"AUTHENTICATION_FAILED_HEADER" 			"認証に失敗"
+		"DOWNLOADING_MOD_TITLE" 			"Modをダウンロード中"
+		"PROGRESSION_TOGGLE_ENABLED_BODY" 			"タイタン、武器、勢力、スキンなどが全てアンロックされ、いつでも使えるようになる。\n\nこの設定は、マルチプレイヤーロビーでいつでも変更可能だ。"
+		"PROGRESSION_TOGGLE_DISABLED_HEADER" 			"進行システムを有効にしますか？"
+		"PROGRESSION_TOGGLE_ENABLED_HEADER" 			"進行システムを無効にしますか？"
+		"PROGRESSION_DISABLED_HEADER" 			"進行システムが無効になりました！"
+		"PROGRESSION_ENABLED_HEADER" 			"進行システムが有効になりました！"
+		"PROGRESSION_DISABLED_BODY" 			"^CCCC0000進行システムが無効化された。^\n\nタイタン、武器、勢力、スキンなどが全てアンロックされ、いつでも使えるようになる。\n\nこの設定は、マルチプレイヤーロビーでいつでも変更可能だ。"
+		"SHOULD_RETURN_TO_LOBBY" 			"マッチ終了後にロビーへ戻る"
+		"REPLACEMENT_WEAPON" 			"武器の置き換え"
+		"TACTICAL_REPLACEMENT" 			"戦術の置き換え"
+		"DISALLOWED_TACTICALS" 			"戦術の禁止"
+		"DISALLOWED_WEAPONS" 			"武器の禁止"
+		"ONLY_HOST_CAN_START_MATCH" 			"マッチを開始できるのはホストのみ"
+		"ONLY_HOST_MATCH_SETTINGS" 			"プライベートマッチの設定を変更できるのはホストのみ"
+		"AUTHENTICATION_FAILED_HELP" 			"ヘルプ"
+		"MATCH_COUNTDOWN_LENGTH" 			"プライベートマッチのカウントダウン時間"
+		"ARE_YOU_SURE" 			"よろしいですか？"
+		"MOD_SETTINGS_SERVER" 			"サーバー"
+		"MOD_SETTINGS_RESET" 			"リセット"
+		"MOD_SETTINGS_RESET_ALL" 			"全てリセット"
+		"NO_RESULTS" 			"リザルトなし。"
+		"MOD_SETTINGS" 			"Modの設定"
+		"NORTHSTAR_BASE_SETTINGS" 			"Northstarの基本設定"
+		"NO_DISK_SPACE_AVAILABLE" 			"ディスクに十分な領域がありません。"
+		"FAILED_DOWNLOADING" 			"Modのダウンロードに失敗"
+		"FAILED_READING_ARCHIVE" 			"Modアーカイブの読込中にエラーが発生しました。"
+		"DOWNLOADING_MOD_TITLE_W_PROGRESS" 			"Modをダウンロード中 (%s1%)"
+		"DOWNLOADING_MOD_TEXT" 			"ダウンロード中 %s1 v%s2..."
+		"DOWNLOADING_MOD_TEXT_W_PROGRESS" 			"ダウンロード中 %s1 v%s2...\n(%s3/%s4 MB)"
+		"MOD_FETCHING_FAILED" 			"ThunderstoreからModアーカイブをダウンロードできませんでした。"
+		"EXTRACTING_MOD_TITLE" 			"Modを抽出中 (%s1%)"
+		"EXTRACTING_MOD_TEXT" 			"抽出中 %s1 v%s2...\n(%s3/%s4 MB)"
+		"FAILED_WRITING_TO_DISK" 			"Modファイルをファイルシステムに抽出する際にエラーが発生しました。"
+		"MOD_FETCHING_FAILED_GENERAL" 			"Modの抽出に失敗。詳細はログを確認してください。"
+		"MOD_CORRUPTED" 			"ダウンロードしたアーカイブのチェックサムが検証済み署名と一致しませんでした。"
+		"CHECKSUMING_TITLE" 			"Modをチェックサム中"
+		"CHECKSUMING_TEXT" 			"コンテンツを検証中 %s1 v%s2..."
+		"MOD_DL_DISABLED" 			"(自動Modダウンロードは無効です)"
+		"PROGRESSION_TOGGLE_DISABLED_BODY" 			"タイタン、武器、勢力、スキンなどのアンロックにレベル上げやメリットが必要になる。\n\nこの設定は、マルチプレイヤーロビーでいつでも変更可能だ。\n\n^CC000000警告: 現在装備しているアイテムがロック中の場合、装備状況は初期化されます！"
+		"PROGRESSION_ENABLED_BODY" 			"^CCCC0000進行システムが有効化された。^\n\nタイタン、武器、勢力、スキンなどのアンロックにレベル上げやメリットが必要になる。\n\nこの設定は、マルチプレイヤーロビーでいつでも変更可能だ。"
+		"LOG_UNKNOWN_CLIENTCOMMANDS" 			"不明なクライアントコマンドを記録する"
+		"SHOW_ONLY_NOT_REQUIRED" 			"任意のModのみ"
+		"AUTHENTICATION_FAILED_ERROR_CODE" 			"エラーコード: ^DB6F2C00%s1^"
+		"AUTHENTICATION_FAILED_BODY" 			"Atlasの認証に失敗しました！\n(Failed to authenticate with Atlas!)"
+		"MISSING_MOD" 			"Mod消失 \"%s1\" v%s2"
+		"MOD_REQUIRED_WARNING" 			" :このModはサーバーに参加した際に読み込まる(または読み込まれない)ことがあります"
+		"WILL_RESET_ALL_SETTINGS" 			"カテゴリー内の全設定をリセットしようとしています。\n\nこの操作は取り消せません。"
+		"WILL_RESET_SETTING" 			"%s1 の設定を初期値に戻そうとしています。\n\nこの操作は取り消せません。"
+		"NO_MODS" 			"設定が利用できません！Modのインストールはこちらから: ^5588FF00northstar.thunderstore.io^0"
+		"PROGRESSION_ANNOUNCEMENT_BODY" 			"^CCCC0000進行システムが開放されました！^\n\nNorthstarはバニラの進行システム、つまり武器、スキン、タイタン等をレベルアップやチャレンジ達成で解除する機能をサポートしています。\n\nこの進行システムは、ロビー画面下のボタンから有効にできます。\n\nこの設定はいつでも変更可能です。"
+		"MOD_NOT_VERIFIED" 			"(Modが検証されていないため、自動ダウンロードできませんでした)"
+		"WRONG_MOD_VERSION" 			"サーバーはMod\"%s1\"v%s2 を要求していますが、あなたのModバージョンは%s3です"
 
 		// Translation done by Zetryox and CYakigasi
 	}
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_polish.txt b/Northstar.Client/mod/resource/northstar_client_localisation_polish.txt
new file mode 100644
index 000000000..9b570cebe
--- /dev/null
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_polish.txt
@@ -0,0 +1,394 @@
+"lang"
+{
+	"Language" "polish"
+	"Tokens"
+	{
+		// This file needs to be encoded as UTF-16 LE
+
+		"MENU_LAUNCH_NORTHSTAR" "Uruchom Northstar"
+		"MENU_TITLE_MODS" "Mody"
+		"RELOAD_MODS" "Przeładuj Mody"
+		"WARNING" "Ostrzeżenie"
+		"CORE_MOD_DISABLE_WARNING"  "Wyłączenie kluczowych Modów może zepsuć Northstar!"
+		"DISABLE" "Wyłącz"
+
+		"DIALOG_TITLE_INSTALLED_NORTHSTAR" "Dzięki za instalację Northstar!"
+		"AUTHENTICATION_AGREEMENT_DIALOG_TEXT" "Dla poprawnego działania Northstar potrzebne jest uwierzytelnienie z głównym serwerem. Potrzebne będzie wysłanie twojego tokena Origin do głównego serwera, nie będzie on przechowywany ani użyty do żadnych innych celów.
+Naciśnij Tak jeżeli wyrażasz zgodę. Wybór może zostać zmieniony w menu Modów."
+		"BACK_AUTHENTICATION_AGREEMENT" "Zgoda na uwierzytelnianie"
+		"AUTHENTICATION_AGREEMENT" "Zgoda na uwierzytelnianie"
+		"AUTHENTICATION_AGREEMENT_RESTART" "Potrzebne jest ponowne odpalenie Titanfall 2 by zmiany dały efekt."
+
+		"DIALOG_AUTHENTICATING_MASTERSERVER" "Uwierzytelnianie z głównym serwerem."
+		"AUTHENTICATIONAGREEMENT_NO" "Zdecydowałeś się nie uwierzytelniać się z Northstar. Zgodę można wyrazić w menu z modami."
+
+		"MENU_TITLE_SERVER_BROWSER" "Wyszukiwarka serwerów"
+		"NS_SERVERBROWSER_NOSERVERS" "Nie znaleziono serwerów"
+		"NS_SERVERBROWSER_UNKNOWNMODE" "Nieznany tryb"
+		"NS_SERVERBROWSER_WAITINGFORSERVERS" "Oczekiwanie na serwery..."
+		"NS_SERVERBROWSER_CONNECTIONFAILED" "Połączenie nieudane!"
+		"REFRESH_SERVERS" "Odśwież"
+
+		"MENU_TITLE_CONNECT_PASSWORD" "Dołącz z hasłem"
+		"MENU_CONNECT_MENU_CONNECT" "Dołącz"
+
+		"PRIVATE_MATCH_PAGE_PREV" "Poprzednia strona"
+		"PRIVATE_MATCH_PAGE_NEXT" "Następna strona"
+
+		"MENU_MATCH_SETTINGS" "Ustawienia meczu"
+		"MENU_MATCH_SETTINGS_SUBMENU" "%s1 Ustawienia trybu"
+
+		"PRIVATE_MATCH_SINGLEPLAYER_LEVEL" "%s1 (Tryb Jednoosobowy)"
+
+		// fra hint for private match menu, because fra only has PL_fra_desc in vanilla
+		"PL_fra_hint" "Każdy na każdego. Zbierz 3 baterie, aby otrzymać Tytana."
+
+		// mode settings
+		"MODE_SETTING_CATEGORY_PILOT" "Pilot"
+		"MODE_SETTING_CATEGORY_TITAN" "Tytan"
+		"MODE_SETTING_CATEGORY_RIFF" "Modyfikatory rozgrywki"
+		"MODE_SETTING_CATEGORY_MATCH" "Mecz"
+
+		"classic_mp" "Klasyczny tryb wieloosobowy"
+		"run_epilogue" "Epilog"
+		"scorelimit" "Limit wyniku"
+		"roundscorelimit" "Limit wyniku (na rundę)"
+		"timelimit" "Limit Czasu"
+		"roundtimelimit" "Limit Czasu (na rundę)"
+		"respawnprotection" "Ochrona po odrodzeniu"
+
+		"pilot_health_multiplier" "Mnożnik życia"
+		"respawn_delay" "Opóźnienie odrodzeń"
+		"boosts_enabled" "Wzmocnienia"
+		"earn_meter_pilot_overdrive" "Doładowanie wskaźnika Tytana/wzmocnienia"
+		"earn_meter_pilot_multiplier" "Mnożnik wsk. Tytana/wzm."
+
+		"earn_meter_titan_multiplier" "Mnożnik wskaźnika rdzenia"
+		"aegis_upgrades" "POSTĘPY DOTYCZĄCE RANGI EGIDY"
+		"infinite_doomed_state" "Stan tytana spisany na straty jest nieskończony"
+		"titan_shield_regen" "Regeneracja tarczy Tytanów"
+
+		"riff_floorislava" "Deadly ground"
+		"featured_mode_all_holopilot" "The Great Bamboozle"
+		"featured_mode_all_grapple" "Attack on Titanfall"
+		"featured_mode_all_phase" "The Otherside"
+		"featured_mode_all_ticks" "Spicy"
+		"featured_mode_tactikill" "Tactikill"
+		"featured_mode_amped_tacticals" "Amped Tacticals"
+		"featured_mode_rocket_arena" "Rocket Arena"
+		"featured_mode_shotguns_snipers" "Armed and Dangerous"
+		"iron_rules" "Iron Titan Rules"
+
+		"cp_amped_capture_points" "Obrona umocnień"
+		"coliseum_loadouts_enabled" "Uzbrojenie Koloseum"
+    
+		"aitdm_archer_grunts" "Piechurzy z łucznikami"
+    
+		// northstar.custom localisation is just deciding not to work, so putting it here for now
+		"PL_sbox" "Piaskownica"
+		"PL_sbox_lobby" "Piaskownica Lobby"
+		"PL_sbox_desc" "jak gmod tylko gorsze"
+		"PL_sbox_abbr" "Piaskownica"
+		"GAMEMODE_SBOX" "Piaskownica"
+
+		"PL_gg" "Gun Game"
+		"PL_gg_lobby" "Gun Game"
+		"PL_gg_desc" "Zdobądź zabójstwo każdą bronią by wygrać."
+		"PL_gg_hint" "Zdobądź zabójstwo każdą bronią by wygrać."
+		"PL_gg_abbr" "GG"
+		"GAMEMODE_GG" "Gun Game"
+		"gg_kill_reward" "Procentowa nagroda za zabójstwo"
+		"gg_assist_reward" "Procentowa nagroda za asystę"
+		"gg_execution_reward" "Procentowa nagroda za egzekucję"
+
+		"PL_tt" "Titan Tag"
+		"PL_tt_lobby" "Titan Tag Lobby"
+		"PL_tt_desc" "Zdobywaj punkty będąc w Tytanie. Zniszcz Tytana by otrzymać własnego."
+		"PL_tt_hint" "Zdobywaj punkty będąc w Tytanie. Zniszcz Tytana by otrzymać własnego."
+		"PL_tt_abbr" "TT"
+		"GAMEMODE_TT" "Titan Tag"
+
+		"PL_chamber" "One in the Chamber"
+		"PL_chamber_lobby" "One in the Chamber Lobby"
+		"PL_chamber_desc" "Jeden strzał, Jedno zabójstwo. Zdobądź kolejny pocisk w magazynku zabijając przeciwnika."
+		"PL_chamber_hint" "Jeden strzał, Jedno zabójstwo. Zdobądź kolejny pocisk w magazynku zabijając przeciwnika."
+		"PL_chamber_abbr" "CHAMBER"
+		"GAMEMODE_CHAMBER" "One in the Chamber Lobby"
+
+		"PL_hidden" "The Hidden"
+		"PL_hidden_lobby" "The Hidden Lobby" 
+		"PL_hidden_desc" "Jeden gracz jest niewidzialny i poluję na resztę."
+		"PL_hidden_hint" "Jeden gracz jest niewidzialny i poluję na resztę." 
+		"PL_hidden_abbr" "HIDDEN" 
+		"GAMEMODE_HIDDEN" "The Hidden" 
+		"HIDDEN_YOU_ARE_HIDDEN" "Jesteś The Hidden!" 
+		"HIDDEN_KILL_SURVIVORS" "Zabij wszystkich ocaleńców." 
+		"HIDDEN_FIRST_HIDDEN" "%s1 jest The Hidden." 
+
+		"PL_sns" "Sticks and Stones"
+		"PL_sns_lobby" "Sticks and Stones Lobby"
+		"PL_sns_desc" "Każdy na każdego. Zabij przeciwnika ostrzem pulsacyjnym lub wykonaj egzekucję by zresetować jego wynik"
+		"PL_sns_abbr" "SNS"
+		"GAMEMODE_SNS" "Sticks and Stones"
+		"SCOREBOARD_BANKRUPTS" "Zabójstwa resetujące"
+		"SNS_LEADER_BANKRUPT" "Wynik Lidera został zresetowany!"
+		"SNS_LEADER_BANKRUPT_SUB" "Wynik %s1 został zresetowany przez %s2"
+		"SNS_BANKRUPT" "Reset!"
+		"SNS_BANKRUPT_SUB" "Twój wynik został zresetowany przez %s1"
+		"sns_wme_kill_value" "Wartość zabójstwa przy użyciu Elitarny skrzydłowy"
+		"sns_softball_kill_value" "Wartość zabójstwa przy użyciu Softball"
+		"sns_offhand_kill_value" "Wartość zabójstwa przy użyciu Offhand "
+		"sns_reset_kill_value" "Wartość zabójstwa przy użyciu Ostrza pulsacyjnego/egzekucji"
+		"sns_melee_kill_value" "Wartość zabójstwa wręcz"
+		"sns_reset_pulse_blade_cooldown_on_pulse_blade_kill" "Zabójstwa regenerują zdolność taktyczną - Ostrze pulsacyjne"
+		"sns_softball_enabled" "Softball Włączony"
+
+		"PL_inf" "Infekcja"
+		"PL_inf_lobby" "Infekcja Lobby"
+		"PL_inf_desc" "Przeżyj zarazę. Ocaleńcy zostają zainfekowani gdy zabici."
+		"PL_inf_hint" "Przeżyj zarazę. Ocaleńcy zostają zainfekowani gdy zabici.."
+		"PL_inf_abbr" "INF"
+		"GAMEMODE_INF" "Infekcja"
+		"INFECTION_YOU_ARE_INFECTED" "Zostałeś zainfekowany!"
+		"INFECTION_KILL_SURVIVORS" "Zainfekuj pozostałych ocaleńców."
+		"INFECTION_FIRST_INFECTED" "%s1 jest pierwszym zainfekowanym."
+		"INFECTION_LAST_SURVIVOR" "%s1 jest ostatnim ocaleńcem!"
+		"INFECTION_KILL_LAST_SURVIVOR" "Zainfekuj ich przed końcem czasu!"
+		"INFECTION_YOU_ARE_LAST_SURVIVOR" "Jesteś ostatnim ocaleńcem!"
+		"INFECTION_SURVIVE_LAST_SURVIVOR" "Przeżyj..."
+
+		"PL_tffa" "Każdy na każdego Tytany"
+		"PL_tffa_lobby" "Każdy na każdego Tytany"
+		"PL_tffa_desc" "Każdy na każdego, zniszcz tytany przeciwników."
+		"PL_tffa_hint" "Każdy na każdego, zniszcz tytany przeciwników."
+		"PL_tffa_abbr" "TFFA"
+		"GAMEMODE_TFFA" "Każdy na każdego Tytany"
+
+		"PL_hs" "Chowany"
+		"PL_hs_lobby" "Chowany Lobby"
+		"PL_hs_desc" "Szukający szukają chowających się."
+		"PL_hs_hint" "Szukający szukają chowających się."
+		"PL_hs_abbr" "HS"
+		"GAMEMODE_hs" "Chowany"
+		"HIDEANDSEEK_YOU_ARE_SEEKER" "JESTEŚ SZUKAJĄCYM"
+		"HIDEANDSEEK_SEEKER_DESC" "Znajdź chowających się i przyłóż im wręcz.\nOdrodzisz się w %s1 sekund"
+		"HIDEANDSEEK_YOU_ARE_HIDER" "JESTEŚ CHOWAJĄCYM SIĘ"
+		"HIDEANDSEEK_HIDER_DESC" "Schowaj się."
+		"HIDEANDSEEK_SEEKERS_INCOMING" "Szukający nadchodzi"
+		"HIDEANDSEEK_DONT_GET_FOUND" "Nie daj się znaleźć!"
+		"HIDEANDSEEK_GET_LAST_HIDER" "%s1 JEST OSTATNIM CHOWAJĄCYM SIĘ"
+		"HIDEANDSEEK_YOU_ARE_LAST_HIDER" "JESTEŚ OSTATNIM CHOWAJĄCYM SIĘ"
+		"HIDEANDSEEK_GOT_STIM" "Masz Stymulant! Nie daj się złapać!"
+		"hideandseek_balance_teams" "Automatyczny balans Chowający się/Szukający"
+		"hideandseek_hiding_time" "Czas na ukrycie się dla Chowających się" 
+
+		// these are defined in r1_english but titan war is a shit name so i'm changing it to another one that was referenced in development
+		"GAMEMODE_fw" "Wojna Kresów"
+		"PL_fw" "Wojna Kresów"
+		"PL_fw_lobby" "Wojna Kresów Lobby"
+		"PL_fw_desc" "Zniszcz Zbieracz przeciwnika i ochroń swój"
+		"PL_fw_abbr" "FW"
+
+		"GAMEMODE_kr" "Seria Zabójstw"
+		"PL_kr" "Seria Zabójstw"
+		"PL_kr_lobby" "Seria Zabójstw Lobby"
+		"PL_kr_desc" "Zabijaj przeciwników by ustanowić rekord serii i wygrać. Zbierz flagę by ją aktywować."
+		"PL_kr_hint" "Zabijaj przeciwników by ustanowić rekord serii i wygrać. Zbierz flagę by ją aktywować."
+		"PL_kr_abbr" "KR"
+		"SCOREBOARD_KR_RECORD" "Rekord Zabójstw"
+		"KR_NEW_RACER" "%s1 aktywował Serię"
+		"KR_YOU_ARE_NEW_RACER" "Aktywowałeś Serię"
+		"KR_YOU_SET_NEW_RECORD" "Ustaw nowy rekord zabójstw!"
+		"KR_FLAG_INCOMING" "Niedługo pojawi się flaga"
+		"KR_COLLECT_FLAG" "Zdobądź ją by aktywować Serię!"
+		"KR_ENEMY_KILLRACE_OVER" "Seria %s1 się skończyła"
+		"KR_YOUR_KILLRACE_OVER" "Twoja Seria się skończyła"
+		"KR_YOUR_KILLRACE_SCORE" "Zdobyłeś %s1 zabójstw."
+
+		"GAMEMODE_fastball" "Fastball"
+		"PL_fastball" "Fastball"
+		"PL_fastball_lobby" "Fastball Lobby"
+		"PL_fastball_desc" "Śmierć pernamentna. Hackuj panele kotrolne by wygrywać rundy i odradzać swoich osoby z swojej drużyny."
+		"PL_fastball_hint" "Śmierć pernamentna. Hackuj panele kotrolne by wygrywać rundy i odradzać swoich osoby z swojej drużyny."
+		"PL_fastball_abbr" "FB"
+		"FASTBALL_PANEL_CAPTURED" "%s1 przęjeli panel %s2"
+		"SCOREBOARD_FASTBALL_HACKS" "Przejęte panele"
+
+		"GAMEMODE_ctf_comp" "Kompetetywne - Walka o flagę"
+
+		// mode settings
+		"MODE_SETTING_CATEGORY_PROMODE" "Tryb pro"
+		"MODE_SETTING_CATEGORY_BLEEDOUT" "Krwawienie Pilotów"
+
+		"custom_air_accel_pilot" "Air Acceleration"
+		"no_pilot_collision" "Kolidowanie Pilotów"
+		"promode_enable" "Bronie trybu pro"
+		"fp_embark_enabled" "Pierwszoosobowe wsiadanie/egzekucje"
+		"classic_rodeo" "Klasyczne Rodeo"
+		"oob_timer_enabled" "Licznik czasu poza granicami mapy"
+		"riff_instagib" "Instagib Mode"
+		"player_force_respawn" "Wymuszone odrodzenie"
+
+		"riff_player_bleedout" "Krwawienie Pilotów"
+		"player_bleedout_forceHolster" "Schowaj bronie gdy powalonym"
+		"player_bleedout_forceDeathOnTeamBleedout" "Umrzyj przy wykrawieniu się drużyny"
+		"player_bleedout_bleedoutTime" "Czas do wykrwawienia się"
+		"player_bleedout_firstAidTime" "Czas potrzebny do udzielenia pierwszej pomocy"
+		"player_bleedout_firstAidTimeSelf" "Czas potrzebny do samo-reanimacji"
+		"player_bleedout_firstAidHealPercent" "Procent życia po otrzymaniu pierwszej pomocy"
+		"player_bleedout_aiBleedingPlayerMissChance" "Szanasa na nietrafienie przez powalone SI"
+
+		// coop stuff
+		"PL_sp_coop" "(NIE UKOŃCZONE) Kampania w trybie Kooperacji"
+		"PL_sp_coop_lobby" "Kampania w trybie Kooperacji Lobby"
+		"PL_sp_coop_desc" "Zagraj kampanie z przyjaciółmi"
+		"PL_sp_coop_hint" "Zagraj kampanie z przyjaciółmi"
+		"PL_sp_coop_abbr" "SP"
+
+		"SP_TRAINING" "Tor przeszkód"
+		"SP_TRAINING_CLASSIC_DESC" "Symulacja kapitana Lastimosy."
+
+		"SP_CRASHSITE" "BT-7274"
+		"SP_CRASHSITE_CLASSIC_DESC" "Jack Cooper spotyka BT-7274."
+
+		"SP_SEWERS1" "Krew i rdza"
+		"SP_SEWERS1_CLASSIC_DESC" "Cooper i BT ruszają spotkać się z majorem Andersonem."
+
+		"SP_BOOMTOWN_START" "W paszczę otchłani"
+		"SP_BOOMTOWN_START_CLASSIC_DESC" "Przeprawa podziemnym skrótem przynosi nieoczekiwane skutki."
+
+		"SP_HUB_TIMESHIFT" "Skutek i przyczyna"
+		"SP_HUB_TIMESHIFT_CLASSIC_DESC" "W miejscu, w którym przebywa major Anderson zaobserwowano osobliwe zjawisko."
+
+		"SP_BEACON" "Nadajnik"
+		"SP_BEACON_CLASSIC_DESC" "Cooper i BT podejmują próbę nawiązania kontaktu z pozostałymi siłami by przekazać im plany IMC."
+
+		"SP_TDAY" "Próba ognia"
+		"SP_TDAY_CLASSIC_DESC" "Zdolności pilotażu Coopera zostają wystawione na próbę w ostatecznym starciu o Arkę."
+
+		"SP_S2S" "Arka"
+		"SP_S2S_CLASSIC_DESC" "Cooper i BT ruszają statkiem w pościg za Arką."
+
+		"SP_SKYWAY_V1" "Zakrzywiacz"
+		"SP_SKYWAY_V1_CLASSIC_DESC" "Cooper i BT zostają pojmani przez Kubena Bliska."
+
+		// Better.Serverbrowser
+		"SERVERS_COLUMN" "Serwery"
+		"PLAYERS_COLUMN" "Gracze"
+		"MAP_COLUMN" "Mapa"
+		"GAMEMODE_COLUMN" "Tryb gry"
+		"REGION_COLUMN" "Region"
+		"SEARCHBAR_LABEL" "Wyszukiwanie:"
+		"MAP_FILTER" "Mapa"
+		"GAMEMODE_FILTER" "Tryb gry"
+		"HIDE_FULL_FILTER" "Ukryj Pełne Serwery"
+		"HIDE_EMPTY_FILTER" "Ukryj Puste Serwery"
+		"HIDE_PROT_FILTER" "Ukryj Chronione Hasłem Serwery"
+		"SERVER_DESCRIPTION" "Opis"
+		"SERVER_MODS" "Mody"
+		"CLEAR_FILTERS" "WYCZYŚĆ"
+		"JOIN_BUTTON" "DOŁĄCZ"
+
+		"SWITCH_YES" "Tak"
+		"SWITCH_NO" "Nie"
+		"SWITCH_ANY" "Dowolnie"
+
+		"CONNECTING" "Łączenie..."
+		"INGAME_PLAYERS" "Gracze: ^6BA6C400%s1"
+		"TOTAL_SERVERS" "Serwery: ^C46C6C00%s1"
+
+		// Mods menu
+		"SHOW" "Pokaż"
+		"SHOW_ALL" "Wszystko"
+		"SHOW_ONLY_ENABLED" "Tylko Włączone"
+		"SHOW_ONLY_DISABLED" "Tylko Wyłączone"
+		"SHOW_ONLY_NOT_REQUIRED" "Tylko Mody Opcjonalne"
+		"SHOW_ONLY_REQUIRED" "Tylko Mody Wymagane"
+		"MOD_REQUIRED_WARNING" " : Ten mod może zostać wyłączony po dołączeniu na serwer"
+
+		// Maps menu
+		"HIDE_LOCKED" "Ukryj zablokowane"
+
+		// In-game chat
+		"HUD_CHAT_WHISPER_PREFIX" "[SZEPT]"
+		"HUD_CHAT_SERVER_PREFIX" "[SERWER]"
+
+		"NO_GAMESERVER_RESPONSE" 		"Nie udało się osiągnąć serwera"
+		"BAD_GAMESERVER_RESPONSE" 		"Serwer dał nieprawidłową odpowiedź"
+		"UNAUTHORIZED_GAMESERVER" 		"Serwer nie ma autoryzacji by przedstawić takie zapytanie"
+		"UNAUTHORIZED_GAME"				"Stryder nie może potwierdzić że to konto ma Titanfall 2"
+		"UNAUTHORIZED_PWD" 				"Nieprawidłowe hasło"
+		"STRYDER_RESPONSE" 				"Nieprawidłowa odpowiedź od Stryder" 
+		"PLAYER_NOT_FOUND" 				"Nie udało się znaleźć konta gracza"
+		"INVALID_MASTERSERVER_TOKEN" 	"Token głównego serwera jest nieprawidłowy lub wygasł, spróbuj odpalić ponownie aplikację EA"
+		"JSON_PARSE_ERROR" 				"Wystąpił błąd przy sprawdzaniu pliku json"
+		"UNSUPPORTED_VERSION" 			"Wersja której używasz nie jest już wspierana"
+
+		"AUTHENTICATION_FAILED_HEADER"		"Uwierzytelnianie się nie powiodło"
+		"AUTHENTICATION_FAILED_BODY"		"Uwierzytelnianie z Atlas się nie powiodło!"
+		"AUTHENTICATION_FAILED_ERROR_CODE"	"Kod błędu: ^DB6F2C00%s1^"
+		"AUTHENTICATION_FAILED_HELP"		"Pomoc"
+		
+		// Mod Settings
+		"MOD_SETTINGS"					"Ustawienia Modów"
+		"NORTHSTAR_BASE_SETTINGS"		"Główne ustawienia Northstar"
+		"ONLY_HOST_MATCH_SETTINGS"		"Tylko Host może zmienić ustawienia meczu prywatnego"
+		"ONLY_HOST_CAN_START_MATCH"		"Tylko Host może rozpocząć mecz"
+		"MATCH_COUNTDOWN_LENGTH"		"Długość odliczana do rozpoczęcia meczu prywatnego"
+		"LOG_UNKNOWN_CLIENTCOMMANDS"	"Loguj nieznane komendy klienta"
+		"DISALLOWED_TACTICALS"			"Zabroniona umiejętność taktyczna"
+		"TACTICAL_REPLACEMENT"			"Zastępująca umiejętność taktyczna"
+		"DISALLOWED_WEAPONS"			"Zabroniona broń"
+		"REPLACEMENT_WEAPON"			"Zastępująca broń"
+		"SHOULD_RETURN_TO_LOBBY"		"Powróć do lobby po zakończeniu meczu"
+		"ARE_YOU_SURE"					"Jesteś pewien?"
+		"WILL_RESET_ALL_SETTINGS"		"Zresetujesz WSZYSTKIE ustawienia tej kategorii.\n\nAkcja jest nieodwracalna." 
+		"WILL_RESET_SETTING"			"Zresetujesz %s1 do startowej wartości.\n\nAkcja jest nieodwracalna."
+		"MOD_SETTINGS_SERVER"			"Serwer"
+		"MOD_SETTINGS_RESET"			"Zresetuj"
+		"MOD_SETTINGS_RESET_ALL"		"Zresetuj WSZYSTKO"
+		"NO_RESULTS"					"Brak rezultatu."
+		"NO_MODS"						"Brak dostępnych ustawień, zainstaluj więcej modów w ^5588FF00northstar.thunderstore.io^0."
+
+		// Toggleable progression
+		"TOGGLE_PROGRESSION"			"Przełącz Progresję"
+		"Y_BUTTON_TOGGLE_PROGRESSION"	"%[Y_BUTTON|]% Przełącz Progresję"
+
+		"PROGRESSION_TOGGLE_ENABLED_HEADER" "Wyłączyć Progresję?"
+		"PROGRESSION_TOGGLE_ENABLED_BODY" "Tytany, Bronie, Fakcje, Skórki, itd. zostaną wszytskie odblokowane.\n\nDecyzję możesz zmienić kiedykolwiek w Lobby trybu wieloosobowego."
+
+		"PROGRESSION_TOGGLE_DISABLED_HEADER" "Włączyć Progresję?"
+		"PROGRESSION_TOGGLE_DISABLED_BODY" "Tytany, Bronie, Fakcje, Skórki, itd. będą musiały być odblokowane poprzez zwiększanie swojego poziomu lub zakupione.\n\nDecyzję możesz zmienić kiedykolwiek w Lobby trybu wieloosobowego.\n\n^CC000000Ostrzeżenie: jeżeli masz wyekwipowane uzbrojenie której nie jest odblokowane zostenie ono zresetowane!"
+
+		"PROGRESSION_ENABLED_HEADER"	"Progresja została Włączona!"
+		"PROGRESSION_ENABLED_BODY"		"^CCCC0000Progresja została Włączona.^\n\nTytany, Bronie, Fakcje, Skórki, itd. będą musiały być odblokowane poprzez zwiększanie swojego poziomu lub zakupione.\n\nDecyzję możesz zmienić kiedykolwiek w Lobby trybu wieloosobowego."
+
+		"PROGRESSION_DISABLED_HEADER"	"Progresja została Wyłączona!"
+		"PROGRESSION_DISABLED_BODY"		"^CCCC0000Progresja została Wyłączona.^\n\nTytany, Bronie, Fakcje, Skórki, itd. zostaną wszytskie odblokowane.\n\nDecyzję możesz zmienić kiedykolwiek w Lobby trybu wieloosobowego."
+	
+		"PROGRESSION_ANNOUNCEMENT_BODY"	"^CCCC0000Jest już możliwość włączenia Progresjii!^\n\nNorthstar teraz wspiera klasyczną Progresję, Dzięki niej możesz wybrać odblokowawanie Broni, Tytanów, Skórek, itd. poprzez zwiększanie swojego poziomu lub ukańczanie wyzwań.\n\nProgresja może zostać włączona poprzez przycisk na dole ekranu Lobby.\n\nDecyzję możesz zmienić kiedykolwiek."
+	
+		// Mod downloading
+		"MISSING_MOD"						"Brakujący Mod \"%s1\" v%s2"
+		"WRONG_MOD_VERSION"					"Serwer ma Moda \"%s1\" v%s2 podczas gdy ty masz v%s3"
+		"MOD_NOT_VERIFIED"					"(Mod nie został zweryfikowany i nie mógł być pobrany automatycznie)"
+		"MOD_DL_DISABLED"					"(Automatyczne pobieranie modów jest wyłączone)"
+		"MANIFESTO_FETCHING_TITLE"			"Przygotowywanie do pobierania Moda"
+		"MANIFESTO_FETCHING_TEXT"			"Zdobywanie listy zweryfikowanych modów..."
+		"DOWNLOADING_MOD_TITLE"				"Pobieranie"
+		"DOWNLOADING_MOD_TITLE_W_PROGRESS" 	"Pobieranie (%s1%)"
+		"DOWNLOADING_MOD_TEXT"				"Pobieranie %s1 v%s2..."
+		"DOWNLOADING_MOD_TEXT_W_PROGRESS"	"Pobieranie %s1 v%s2...\n(%s3/%s4 MB)"
+		"CHECKSUMING_TITLE"					"Sprawdzanie wartości kontrolnej Moda" 
+		"CHECKSUMING_TEXT"					"Weryfikowanie zawartości %s1 v%s2..."
+		"EXTRACTING_MOD_TITLE"				"Rozpakowywanie Moda (%s1%)"
+		"EXTRACTING_MOD_TEXT"				"Rozpakowywanie %s1 v%s2...\n(%s3/%s4 MB)"
+		"FAILED_DOWNLOADING"				"Pobieranie Moda się nie powiodło"
+		"FAILED_READING_ARCHIVE"			"Wystąpił błąd podczas czytania archiwum Moda."
+		"FAILED_WRITING_TO_DISK"			"Wystąpił błąd podczas rozpakowywania Moda."
+		"MOD_FETCHING_FAILED"				"Pobieranie archiwum Moda się nie powiodło."
+		"MOD_CORRUPTED"						"Wartość kontrolna pobranego archiwum/moda nie zgadza się z zweryfikowaną wartośćią kontrolną."
+		"NO_DISK_SPACE_AVAILABLE"			"Nie ma wystarczająco miejsca na dysku."
+		"MOD_FETCHING_FAILED_GENERAL"		"Rozpakowywanie Moda się nie powiodło. Sprawdź Logi po więcej detali."
+	}
+}
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_portuguese.txt b/Northstar.Client/mod/resource/northstar_client_localisation_portuguese.txt
index b6364db4e..75a5faad6 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_portuguese.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_portuguese.txt
@@ -326,7 +326,7 @@ Clique em Sim se você concorda. Esta escolha pode ser alterada a qualquer momen
 		"UNAUTHORIZED_GAMESERVER" "Servidor da partida não está autorizado a fazer tal requisição"
 		"UNAUTHORIZED_PWD" "Senha inválida"
 		"PLAYER_NOT_FOUND" "Não foi possível encontrar conta do jogador"
-		"INVALID_MASTERSERVER_TOKEN" "Token do servidor mestre inválido ou vencido"
+		"INVALID_MASTERSERVER_TOKEN" "Token do servidor mestre inválido ou vencido, tente reiniciar o EA App."
 		"JSON_PARSE_ERROR" "Erro ao ler a resposta json"
 		"SHOW_ONLY_REQUIRED" "Somente Mods Mandatórios"
 		"UNAUTHORIZED_GAME" "Stryder não pode confirmar que esta conta possui Titanfall 2"
@@ -338,5 +338,43 @@ Clique em Sim se você concorda. Esta escolha pode ser alterada a qualquer momen
 		"SHOULD_RETURN_TO_LOBBY" "Retornar ao saguão após término de Partida"
 		"WILL_RESET_SETTING" "Isso irá resetar a configuração %s1 ao valor padrão.\n\nAção não reversível."
 		"aitdm_archer_grunts" "Soldados com Archer"
+		"player_force_respawn" "Resurgimento Forçado"
+		"PROGRESSION_ENABLED_HEADER" "Progressão Habilitada!"
+		"PROGRESSION_ENABLED_BODY" "^CCCC0000Progressão foi habilitada.^\n\nTitãs, Armas, Facções, Cosméticos, etc. serão destravados ao ganhar níveis, ou comprados com Méritos.\n\nIsso pode ser alterado a qualquer momento no menu de multijogador."
+		"PROGRESSION_DISABLED_HEADER" "Progressão Desabilitada!"
+		"TOGGLE_PROGRESSION" "Habilitar Progressão"
+		"PROGRESSION_TOGGLE_ENABLED_HEADER" "Desabilitar Progressão?"
+		"PROGRESSION_TOGGLE_ENABLED_BODY" "Titãs, Armas, Facções, Cosméticos etc. serão todos destravados e usáveis a qualquer momento.\n\nIsso pode ser alterado a qualquer hora no menu de multijogador."
+		"PROGRESSION_TOGGLE_DISABLED_HEADER" "Habilitar Progressão?"
+		"PROGRESSION_TOGGLE_DISABLED_BODY" "Titãs, Armas, Facções, Cosméticos, etc. terão que ser destravados ao ganhar níveis, ou comprados com Méritos.\n\nIsso pode ser alterado a qualquer momento no menu de multijogador.\n\n^CC000000Aviso: Se você atualmente tem qualquer item equipado que não foi préviamente destravado, ele será resetado!"
+		"Y_BUTTON_TOGGLE_PROGRESSION" "%[Y_BUTTON|]% Alternar Progressão"
+		"DOWNLOADING_MOD_TITLE_W_PROGRESS" "Baixando mod (%s1%)"
+		"DOWNLOADING_MOD_TEXT" "Baixando %s1 v%s2..."
+		"MISSING_MOD" "Mod em falta \"%s1\" v%s2"
+		"MOD_NOT_VERIFIED" "(o mod não é verificado, e não pode ser baixado automaticamente)"
+		"MOD_DL_DISABLED" "(download automático de mod está desabilitado)"
+		"DOWNLOADING_MOD_TITLE" "Baixando mod"
+		"DOWNLOADING_MOD_TEXT_W_PROGRESS" "Baixando %s1 v%s2...\n(%s3/%s4 MB)"
+		"CHECKSUMING_TITLE" "Verificando o mod"
+		"CHECKSUMING_TEXT" "Verificando conteúdo de %s1 v%s2..."
+		"EXTRACTING_MOD_TITLE" "Extraíndo mod (%s1%)"
+		"MOD_REQUIRED_WARNING" " Este mod pode ser desativado quando entrar em um servidor"
+		"AUTHENTICATION_FAILED_HEADER" "Autenticação Falhou"
+		"AUTHENTICATION_FAILED_BODY" "Falha ao autenticar com Atlas!"
+		"AUTHENTICATION_FAILED_ERROR_CODE" "Código de Erro: ^DB6F2C00%s1^"
+		"AUTHENTICATION_FAILED_HELP" "Ajuda"
+		"EXTRACTING_MOD_TEXT" "Extraíndo %s1 v%s2...\n(%s3/%s4 MB)"
+		"FAILED_DOWNLOADING" "Falha ao baixar mod"
+		"FAILED_READING_ARCHIVE" "Um erro ocorreu ao ler o aqruivo do mod."
+		"MOD_FETCHING_FAILED" "O arquivo do mod não pode ser baixado da Thunderstore."
+		"MOD_CORRUPTED" "O aquivo baixado não condiz com a assinatura de verificação registrada."
+		"NO_DISK_SPACE_AVAILABLE" "Não há espaço suficiente no disco."
+		"PROGRESSION_DISABLED_BODY" "^CCCC0000Progressão foi desabilitada.^\n\nTitãs, Facções, Armas, Cosméticos, etc. estarão disponíveis para uso a qualquer momento.\n\nIsso pode ser alterado a qualquer hora no menu de multijogador."
+		"PROGRESSION_ANNOUNCEMENT_BODY" "^CCCC0000Progressão agora pode ser habilitada!^\n\nNorthstar agora suporta a progressão original, o que significa que você pode optar por destravar Armas, Cosméticos, Titãs e outros através do ganho de níveis e completando os desafios.\n\nVocê pode habilitar a progressão usando o botão no rodapé do menu de multijogador.\n\nIsso pode ser alterado a qualquer momento."
+		"WRONG_MOD_VERSION" "O servidor tem o mod \"%s1\" v%s2 enquanto você possui v%s3"
+		"FAILED_WRITING_TO_DISK" "Um erro ocorreu enquanto se extraía o conteúdo do mod para o sistema."
+		"MOD_FETCHING_FAILED_GENERAL" "Extração do mod falhou. Verifique os logs para mais detalhes."
+		"MANIFESTO_FETCHING_TEXT" "Retornando a lista de mods verificados..."
+		"MANIFESTO_FETCHING_TITLE" "Preparando o download do mod"
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_russian.txt b/Northstar.Client/mod/resource/northstar_client_localisation_russian.txt
index cf410ff29..91a0dedee 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_russian.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_russian.txt
@@ -250,7 +250,7 @@
 		"UNAUTHORIZED_PWD"                       "Неправильный пароль"
 		"STRYDER_RESPONSE"                             "Не удалось разобрать ответ Stryder"
 		"PLAYER_NOT_FOUND"                           "Не удалось найти аккаунт игрока"
-		"INVALID_MASTERSERVER_TOKEN"    "Некорректный или истёкший токен главного сервера"
+		"INVALID_MASTERSERVER_TOKEN"    "Некорректный или истёкший токен главного сервера. Перезапустите EA App, чтобы обновить токен."
 		"JSON_PARSE_ERROR"                              "Ошибка разбора json-ответа"
 		"UNSUPPORTED_VERSION"                    "Используемая вами версия больше не поддерживается"
 		"DISABLE"                    "Выключить"
@@ -345,5 +345,27 @@
 		"AUTHENTICATION_FAILED_ERROR_CODE"                    "Код ошибки: ^DB6F2C00%s1^"
 		"AUTHENTICATION_FAILED_HELP"                    "Справка"
 		"AUTHENTICATION_FAILED_HEADER"                    "Ошибка аутентификации"
+		"MISSING_MOD"                    "Отсутствует мод \"%s1\" v%s2"
+		"MOD_NOT_VERIFIED"                    "(мод не был загружен автоматически, т.к. он не проверенный)"
+		"MOD_DL_DISABLED"                    "(автоматическая загрузка модов не включена)"
+		"DOWNLOADING_MOD_TITLE"                    "Загрузка мода"
+		"DOWNLOADING_MOD_TEXT"                    "Загружаем %s1 v%s2..."
+		"DOWNLOADING_MOD_TEXT_W_PROGRESS"                    "Загружаем %s1 v%s2...\n(%s3/%s4 МБ)"
+		"DOWNLOADING_MOD_TITLE_W_PROGRESS"                    "Загрузка мода (%s1%)"
+		"CHECKSUMING_TITLE"                    "Проверка целостности"
+		"MOD_REQUIRED_WARNING"                    " : Этот мод может автоматически включиться / отключиться при подключении к серверу"
+		"WRONG_MOD_VERSION"                    "Версии мода \"%s1\" не совпадают. На сервере: v%s2. У вас: v%s3"
+		"CHECKSUMING_TEXT"                    "Проверяем целостность %s1 v%s2..."
+		"EXTRACTING_MOD_TITLE"                    "Распаковка мода (%s1%)"
+		"EXTRACTING_MOD_TEXT"                    "Распаковываем %s1 v%s2...\n(%s3/%s4 МБ)"
+		"FAILED_DOWNLOADING"                    "Ошибка загрузки мода"
+		"FAILED_READING_ARCHIVE"                    "Ошибка чтения архива мода."
+		"FAILED_WRITING_TO_DISK"                    "Ошибка распаковки файлов мода."
+		"MOD_FETCHING_FAILED"                    "Ошибка скачивания мода с Thunderstore."
+		"MOD_CORRUPTED"                    "Файл архива мода повреждён: контрольная сумма не совпадает."
+		"NO_DISK_SPACE_AVAILABLE"                    "Недостаточно места на диске."
+		"MOD_FETCHING_FAILED_GENERAL"                    "Ошибка распаковки мода. Проверьте файл лога, чтобы узнать подробности."
+		"MANIFESTO_FETCHING_TEXT"                    "Скачиваем список проверенных модов..."
+		"MANIFESTO_FETCHING_TITLE"                    "Начало загрузки модов"
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_spanish.txt b/Northstar.Client/mod/resource/northstar_client_localisation_spanish.txt
index 3d9ae4c6c..d4172232e 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_spanish.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_spanish.txt
@@ -352,5 +352,6 @@ Presiona Sí al estar de acuerdo. Esta opcion se puede cambiar en el menú de mo
 		"WILL_RESET_SETTING"             "Ésta acción reiniciará %s1 a su valor por defecto.\n\nNo se podrá revertir el proceso." 
 		"PROGRESSION_ANNOUNCEMENT_BODY"             "^CCCC0000El progreso puede ser habilitado desde ahora^\n\nNorthstar ahora es compatible con el progreso normal del juego, esto significa que puedes elegir desbloquear Armas, Aspectos, Titanes y otros a través de desafíos y subiendo de nivel.\n\nPuedes habilitar el progreso normal del juego en la opción ubicada al final de la pantalla de la sala de espera.\n\nÉsta opción puede ser cambiada en cualquier momento." 
 		"player_force_respawn"             "Reaparición Forzada" 
+		"MOD_REQUIRED_WARNING"             " : Esta modificacion puede ser desactivada al entrar a un servidor" 
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_tchinese.txt b/Northstar.Client/mod/resource/northstar_client_localisation_tchinese.txt
index 500f8a969..fd649cdb6 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_tchinese.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_tchinese.txt
@@ -320,7 +320,7 @@
 		"UNAUTHORIZED_PWD"                 "密碼錯誤"
 		"STRYDER_RESPONSE"                 "無法讀取Stryder回應"
 		"PLAYER_NOT_FOUND"                 "找不到玩家賬戶"
-		"INVALID_MASTERSERVER_TOKEN"     "主伺服器token過期或無效"
+		"INVALID_MASTERSERVER_TOKEN"     "主伺服器token過期或無效。"
 		"JSON_PARSE_ERROR"                 "讀取json回應時發生錯誤"
 		"UNSUPPORTED_VERSION"             "您的遊戲版本過低"
 		"NORTHSTAR_BASE_SETTINGS"             "北极星基础设置"
@@ -356,5 +356,31 @@
 		"PROGRESSION_DISABLED_BODY"             "^CCCC0000個人進度已停用^\n\n泰坦，武器，陣營，皮膚及所有其他一切需要解鎖的物品將隨時可以進行解鎖並使用。\n\n您可以隨時在多人大廳中更改此項。"
 		"PROGRESSION_ENABLED_BODY"             "^CCCC0000個人進度已啟用^\n\n泰坦，武器， 陣營，皮膚以及其他一切需要解鎖的物品將通過升級或是使用點數購買來進行解鎖。.\n\n您可以隨時在多人大廳中更改此項。"
 		"PROGRESSION_ANNOUNCEMENT_BODY"             "^CCCC0000現在可以隨時開啟個人進度！^\n\nNorthstar 現在支持類似官服的進度系統, 这意味着你可以选择通过升级和完成挑战来解锁武器、皮肤、泰坦等。\n\n您可以通過多人大廳底部的“遊戲進度”按鈕來進行開啟。\n\n您可以隨時在多人大廳中更改此項。"
+		"AUTHENTICATION_FAILED_HEADER"             "認證失敗"
+		"AUTHENTICATION_FAILED_BODY"             "無法與Atlas驗證！"
+		"AUTHENTICATION_FAILED_ERROR_CODE"             "錯誤代碼：^DB6F2C00%s1^"
+		"AUTHENTICATION_FAILED_HELP"             "幫助"
+		"MISSING_MOD"             "缺少Mod \"%s1\" v%s2"
+		"MOD_NOT_VERIFIED"             "（Mod未經驗證并且無法自動下載）"
+		"MOD_REQUIRED_WARNING"             " ： 加入一個服務器時，這個Mod可能加載或不加載"
+		"DOWNLOADING_MOD_TEXT"             "正在下載Mod %s1 %s2..."
+		"DOWNLOADING_MOD_TEXT_W_PROGRESS"             "正在下載Mod %s1 %s2...\n(%s3/%s4 MB)"
+		"CHECKSUMING_TITLE"             "正在校驗Mod"
+		"WRONG_MOD_VERSION"             "服務器的 \"%s1\" Mod版本為 %s2 而你的版本是 %s3"
+		"MOD_DL_DISABLED"             "（Mod自動下載已禁用）"
+		"DOWNLOADING_MOD_TITLE"             "下載Mod中"
+		"DOWNLOADING_MOD_TITLE_W_PROGRESS"             "下載Mod中（%s1%）"
+		"CHECKSUMING_TEXT"             "驗證内容 %s1 %s2……"
+		"EXTRACTING_MOD_TITLE"             "解壓Mod中 （%s1%）"
+		"EXTRACTING_MOD_TEXT"             "解壓Mod中 %s1 %s2...\n(%s3/%s4 MB)"
+		"FAILED_DOWNLOADING"             "下載Mod失敗"
+		"FAILED_READING_ARCHIVE"             "在讀取Mod檔案時發生錯誤。"
+		"FAILED_WRITING_TO_DISK"             "在解壓Mod文件到文件系統時發生錯誤。"
+		"MOD_FETCHING_FAILED"             "從Thunderstore下載Mod檔案失敗。"
+		"MOD_CORRUPTED"             "已下載檔案的校驗和無法與驗證簽名匹配。"
+		"NO_DISK_SPACE_AVAILABLE"             "你的存儲設備沒有足夠空間。"
+		"MOD_FETCHING_FAILED_GENERAL"             "Mod解壓失敗。在日志中查看更多詳情。"
+		"MANIFESTO_FETCHING_TITLE"             "設置Mod下載"
+		"MANIFESTO_FETCHING_TEXT"             "獲取已驗證Mod列表……"
 	}
 }
diff --git a/Northstar.Client/mod/resource/ui/menus/mode_select.menu b/Northstar.Client/mod/resource/ui/menus/mode_select.menu
new file mode 100644
index 000000000..f8afcf0ff
--- /dev/null
+++ b/Northstar.Client/mod/resource/ui/menus/mode_select.menu
@@ -0,0 +1,343 @@
+resource/ui/menus/mode_select.menu

+{

+	menu

+	{

+		ControlName				Frame

+		xpos					0

+		ypos					0

+		zpos					3

+		wide					f0

+		tall					f0

+		autoResize				0

+		pinCorner				0

+		visible					1

+		enabled					1

+		PaintBackgroundType		0

+		infocus_bgcolor_override	"0 0 0 0"

+		outoffocus_bgcolor_override	"0 0 0 0"

+

+		MenuCommon

+		{

+			ControlName				CNestedPanel

+			xpos					0

+			ypos					0

+			wide					f0

+			tall					f0

+			visible					1

+			controlSettingsFile		"resource/ui/menus/panels/menu_common.res"

+		}

+

+		MatchmakingStatus

+		{

+			ControlName				CNestedPanel

+			xpos					0

+			ypos					0

+			wide					f0

+			tall					f0

+			visible					1

+			controlSettingsFile		"resource/ui/menus/panels/matchmaking_status.res"

+		}

+

+        NextModeImageFrame

+        {

+            ControlName				RuiPanel

+			xpos 					800

+			ypos					160

+			wide					860

+			tall					418

+            labelText				""

+            visible				    1

+            bgcolor_override        "0 0 0 0"

+            paintbackground         1

+            rui                     "ui/basic_border_box.rpak"

+        }

+

+		NextModeImage

+		{

+			ControlName				RuiPanel

+			pin_to_sibling			NextModeImageFrame

+			pin_corner_to_sibling	BOTTOM

+			pin_to_sibling_corner	BOTTOM

+//			xpos                    -12

+			ypos                    -12

+			wide					480

+			tall					240

+			visible					1

+			scaleImage				1

+            rui                     "ui/basic_menu_image.rpak"

+			zpos					2

+		}

+

+		ModeIconImage

+		{

+			ControlName				RuiPanel

+			pin_to_sibling			NextModeImage

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	TOP_LEFT

+			xpos                    0

+			ypos                    -16

+			wide					72

+			tall					72

+			visible					1

+			scaleImage				1

+            rui                     "ui/basic_image_add.rpak"

+			zpos					2

+		}

+

+		NextModeName

+		{

+			ControlName				Label

+			pin_to_sibling			NextModeImageFrame

+			pin_corner_to_sibling	TOP

+			pin_to_sibling_corner	TOP

+			ypos					-20

+			wide                    840

+			auto_tall_tocontents	1

+			visible					1

+			labelText				"Foo"

+			textAlignment           center

+			centerWrap              1

+			font					Default_43_DropShadow

+			allcaps					1

+			fgcolor_override		"255 255 255 255"

+		}

+

+		NextModeDesc

+		{

+			ControlName				Label

+			pin_to_sibling			NextModeName

+			pin_corner_to_sibling	TOP

+			pin_to_sibling_corner	BOTTOM

+			xpos					0

+			ypos					0

+			wide					840

+			wrap					1

+			auto_tall_tocontents	1

+			visible					1

+			labelText				"Bar"

+			textAlignment           center

+			centerWrap              1

+			font					Default_27

+			allcaps					0

+			fgcolor_override		"255 255 255 255"

+		}

+

+		MenuTitle

+		{

+			ControlName				Label

+			InheritProperties		MenuTitle

+			labelText				"#SELECT_GAME_MODE"

+		}

+

+		ButtonRowAnchor

+		{

+			ControlName				Label

+			labelText				""

+

+			xpos                    96

+            ypos                    160

+		}

+

+		BtnMode1

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				0

+			navUp					BtnMode15

+			navDown					BtnMode2

+

+			pin_to_sibling				ButtonRowAnchor

+			pin_corner_to_sibling		TOP_LEFT

+			pin_to_sibling_corner		TOP_LEFT

+		}

+		BtnMode2

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				1

+			pin_to_sibling			BtnMode1

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode1

+			navDown					BtnMode3

+		}

+		BtnMode3

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				2

+			pin_to_sibling			BtnMode2

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode2

+			navDown					BtnMode4

+		}

+		BtnMode4

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				3

+			pin_to_sibling			BtnMode3

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			//ypos					11

+			navUp					BtnMode3

+			navDown					BtnMode5

+		}

+		BtnMode5

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				4

+			pin_to_sibling			BtnMode4

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode4

+			navDown					BtnMode6

+		}

+		BtnMode6

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				5

+			pin_to_sibling			BtnMode5

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode5

+			navDown					BtnMode7

+		}

+		BtnMode7

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				6

+			pin_to_sibling			BtnMode6

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode6

+			navDown					BtnMode8

+		}

+		BtnMode8

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				7

+			pin_to_sibling			BtnMode7

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode7

+			navDown					BtnMode9

+		}

+		BtnMode9

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				8

+			pin_to_sibling			BtnMode8

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode8

+			navDown					BtnMode10

+		}

+		BtnMode10

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				9

+			pin_to_sibling			BtnMode9

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode9

+			navDown					BtnMode11

+		}

+		BtnMode11

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				10

+			pin_to_sibling			BtnMode10

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode10

+			navDown					BtnMode12

+		}

+		BtnMode12

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				11

+			pin_to_sibling			BtnMode11

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode11

+			navDown					BtnMode13

+		}

+		BtnMode13

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				12

+			pin_to_sibling			BtnMode12

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode12

+			navDown					BtnMode14

+		}

+		BtnMode14

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				13

+			pin_to_sibling			BtnMode13

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode13

+			navDown					BtnMode15

+		}

+		BtnMode15

+		{

+			ControlName				RuiButton

+			InheritProperties		RuiSmallButton

+			classname 				ModeButton

+			scriptID				14

+			pin_to_sibling			BtnMode14

+			pin_corner_to_sibling	TOP_LEFT

+			pin_to_sibling_corner	BOTTOM_LEFT

+			navUp					BtnMode14

+			navDown					BtnMode1

+		}

+

+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

+

+		ButtonTooltip

+		{

+			ControlName				CNestedPanel

+			InheritProperties		ButtonTooltip

+		}

+

+		FooterButtons

+		{

+			ControlName				CNestedPanel

+			xpos					0

+			ypos					r119

+			wide					f0

+			tall					36

+			visible					1

+			controlSettingsFile		"resource/ui/menus/panels/footer_buttons.res"

+		}

+	}

+}

diff --git a/Northstar.Client/mod/scripts/vscripts/cl_northstar_client_init.nut b/Northstar.Client/mod/scripts/vscripts/cl_northstar_client_init.nut
index 3560fd562..9e683a869 100644
--- a/Northstar.Client/mod/scripts/vscripts/cl_northstar_client_init.nut
+++ b/Northstar.Client/mod/scripts/vscripts/cl_northstar_client_init.nut
@@ -20,6 +20,9 @@ global struct GameStateStruct {
     int otherHighestScore
     int maxScore
     float timeEnd
+    int serverGameState
+    int fd_waveNumber
+    int fd_totalWaves
 }
 
 global struct UIPresenceStruct {
diff --git a/Northstar.Client/mod/scripts/vscripts/presence/cl_presence.nut b/Northstar.Client/mod/scripts/vscripts/presence/cl_presence.nut
index f17216fbc..142c94bad 100644
--- a/Northstar.Client/mod/scripts/vscripts/presence/cl_presence.nut
+++ b/Northstar.Client/mod/scripts/vscripts/presence/cl_presence.nut
@@ -30,6 +30,19 @@ GameStateStruct function DiscordRPC_GenerateGameState( GameStateStruct gs )
     if ( IsValid( GetLocalClientPlayer() ) )
 		gs.ownScore = GameRules_GetTeamScore( GetLocalClientPlayer().GetTeam() )
 
+    if ( GameRules_GetGameMode() == FD )
+    {
+        gs.playlist = "fd" // So it returns only one thing to the plugin side instead of the 5 separate difficulties FD have
+        if ( GetGlobalNetInt( "FD_waveState" ) == WAVE_STATE_INCOMING || GetGlobalNetInt( "FD_waveState" ) == WAVE_STATE_IN_PROGRESS )
+        {
+            gs.fd_waveNumber = GetGlobalNetInt( "FD_currentWave" ) + 1
+            gs.fd_totalWaves = GetGlobalNetInt( "FD_totalWaves" )
+        }
+        else
+            gs.fd_waveNumber = -1 // Tells plugin it's on Wave Break
+    }
+
+    gs.serverGameState = GetGameState() == -1 ? 0 : GetGameState()
     gs.otherHighestScore = gs.ownScore == highestScore ? secondHighest : highestScore
 
     gs.maxScore = IsRoundBased() ? GetCurrentPlaylistVarInt( "roundscorelimit", 0 ) : GetCurrentPlaylistVarInt( "scorelimit", 0 )
diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_connect_password.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_connect_password.nut
index 1e10aa45f..b89e665b8 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_connect_password.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_connect_password.nut
@@ -56,6 +56,6 @@ void function ConnectWithPassword( var button )
 	if ( GetTopNonDialogMenu() == file.menu )
 	{
 		TriggerConnectToServerCallbacks()
-		thread ThreadedAuthAndConnectToServer( Hud_GetUTF8Text( Hud_GetChild( file.menu, "EnterPasswordBox" ) ) )
+		thread ThreadedAuthAndConnectToServer( Hud_GetUTF8Text( Hud_GetChild( file.menu, "EnterPasswordBox" ) ), true )
 	}
 }
\ No newline at end of file
diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_moddownload.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_moddownload.nut
index 4d299362d..4968714c7 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_moddownload.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_moddownload.nut
@@ -1,8 +1,10 @@
 global function DownloadMod
 global function DisplayModDownloadErrorDialog
+global function FetchVerifiedModsManifesto
 
 global enum eModInstallStatus
 {
+    MANIFESTO_FETCHING,
     DOWNLOADING,
     CHECKSUMING,
     EXTRACTING,
@@ -18,6 +20,35 @@ global enum eModInstallStatus
 
 const int MB = 1024*1000;
 
+
+void function FetchVerifiedModsManifesto()
+{
+	print("Start fetching verified mods manifesto from the Internet")
+
+	// Fetching UI
+	DialogData dialogData
+	dialogData.header = Localize( "#MANIFESTO_FETCHING_TITLE" )
+	dialogData.message = Localize( "#MANIFESTO_FETCHING_TEXT" )
+	dialogData.showSpinner = true;
+
+	// Prevent user from closing dialog
+	dialogData.forceChoice = true;
+	OpenDialog( dialogData )
+
+	// Do the actual fetching
+	NSFetchVerifiedModsManifesto()
+
+	ModInstallState state = NSGetModInstallState()
+	while ( state.status == eModInstallStatus.MANIFESTO_FETCHING )
+	{
+		state = NSGetModInstallState()
+		WaitFrame()
+	}
+
+	// Close dialog when manifesto has been received
+	CloseActiveMenu()
+}
+
 bool function DownloadMod( RequiredModInfo mod )
 {
 	// Downloading mod UI
@@ -58,6 +89,10 @@ void function UpdateModDownloadDialog( RequiredModInfo mod, ModInstallState stat
 {
 	switch ( state.status )
 	{
+	case eModInstallStatus.MANIFESTO_FETCHING:
+		Hud_SetText( header, Localize( "#MANIFESTO_FETCHING_TITLE" ) )
+		Hud_SetText( body, Localize( "#MANIFESTO_FETCHING_TEXT" ) )
+		break
 	case eModInstallStatus.DOWNLOADING:
 		Hud_SetText( header, Localize( "#DOWNLOADING_MOD_TITLE_W_PROGRESS", string( state.ratio ) ) )
 		Hud_SetText( body, Localize( "#DOWNLOADING_MOD_TEXT_W_PROGRESS", mod.name, mod.version, floor( state.progress / MB ), floor( state.total / MB ) ) )
diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_modmenu.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_modmenu.nut
index 3f643aa3d..f08d69a72 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_modmenu.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_modmenu.nut
@@ -338,6 +338,10 @@ void function RefreshMods()
 	{
 		string mod = modNames[i]
 
+		// Do not display remote mods
+		if ( NSIsModRemote( mod ) )
+			continue
+
 		if ( searchTerm.len() && mod.tolower().find( searchTerm ) == null )
 			continue
 
diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut
index 1bc8e405b..cdeb8b3e0 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut
@@ -967,49 +967,93 @@ void function OnServerSelected_Threaded( var button )
 	bool autoDownloadAllowed = GetConVarBool( "allow_mod_auto_download" )
 	int downloadedMods = 0;
 
+	// Check out if there's any server-required mod that is not locally installed
+	array<string> modNames = NSGetModNames()
+	bool uninstalledModFound = false
+	foreach ( requiredModInfo in server.requiredMods )
+	{
+		// Tolerate core mods having different versions
+		if ( requiredModInfo.name.len() > 10 && requiredModInfo.name.slice(0, 10) == "Northstar." )
+			continue
+
+		if ( !modNames.contains( requiredModInfo.name ) )
+		{
+			print( format ( "\"%s\" was not found locally, triggering manifesto fetching.", requiredModInfo.name ) )
+			uninstalledModFound = true
+			break
+		} else if ( NSGetModVersionByModName( requiredModInfo.name ) != requiredModInfo.version ) {
+			print( format ( "\"%s\" was found locally but has version \"%s\" while server requires \"%s\", triggering manifesto fetching.", requiredModInfo.name, NSGetModVersionByModName( requiredModInfo.name ), requiredModInfo.version ) )
+			uninstalledModFound = true
+			break
+		}
+	}
+	
+	// If yes, we fetch the verified mods manifesto, to check whether uninstalled
+	// mods can be installed through auto-download
+	if ( uninstalledModFound && autoDownloadAllowed )
+	{
+		print("Auto-download is allowed, checking if missing mods can be installed automatically.")
+		FetchVerifiedModsManifesto()
+	}
+
 	foreach ( RequiredModInfo mod in server.requiredMods )
 	{
-		if ( !NSGetModNames().contains( mod.name ) )
+		// Tolerate core mods having different versions
+		if ( mod.name.len() > 10 && mod.name.slice(0, 10) == "Northstar." )
+			continue
+
+		if ( !NSGetModNames().contains( mod.name ) || NSGetModVersionByModName( mod.name ) != mod.version )
 		{
-			// Check if mod can be auto-downloaded
-			bool modIsVerified = NSIsModDownloadable( mod.name, mod.version )
+			// Auto-download mod
+			if ( autoDownloadAllowed )
+			{
+				bool modIsVerified = NSIsModDownloadable( mod.name, mod.version )
 
-			// Display an error message if not
-			if ( !modIsVerified || !autoDownloadAllowed )
+				// Display error message if mod is not verified
+				if ( !modIsVerified )
+				{
+					DialogData dialogData
+					dialogData.header = "#ERROR"
+					dialogData.message = Localize( "#MISSING_MOD", mod.name, mod.version )
+					dialogData.message += "\n" + Localize( "#MOD_NOT_VERIFIED" )
+					dialogData.image = $"ui/menu/common/dialog_error"
+
+					AddDialogButton( dialogData, "#DISMISS" )
+					AddDialogFooter( dialogData, "#A_BUTTON_SELECT" )
+					AddDialogFooter( dialogData, "#B_BUTTON_DISMISS_RUI" )
+
+					OpenDialog( dialogData )
+					return
+				}
+				else
+				{
+					if ( DownloadMod( mod ) )
+					{
+						downloadedMods++
+					}
+					else
+					{
+						DisplayModDownloadErrorDialog( mod.name )
+						return
+					}
+				}
+			}
+
+			// Mod not found, display error message
+			else
 			{
 				DialogData dialogData
 				dialogData.header = "#ERROR"
 				dialogData.message = Localize( "#MISSING_MOD", mod.name, mod.version )
 				dialogData.image = $"ui/menu/common/dialog_error"
 
-				// Specify error (only if autoDownloadAllowed is set)
-				if ( autoDownloadAllowed )
-				{
-					dialogData.message += "\n" + Localize( "#MOD_NOT_VERIFIED" )
-				}
-
 				AddDialogButton( dialogData, "#DISMISS" )
-
 				AddDialogFooter( dialogData, "#A_BUTTON_SELECT" )
 				AddDialogFooter( dialogData, "#B_BUTTON_DISMISS_RUI" )
 
 				OpenDialog( dialogData )
-
 				return
 			}
-
-			else // Launch download
-			{
-				if ( DownloadMod( mod ) )
-				{
-					downloadedMods++
-				}
-				else
-				{
-					DisplayModDownloadErrorDialog( mod.name )
-					return
-				}
-			}
 		}
 		else
 		{
@@ -1050,13 +1094,6 @@ void function OnServerSelected_Threaded( var button )
 		}
 	}
 
-	// Make Northstar aware new mods have been added
-	if ( downloadedMods > 0 )
-	{
-		print( "Some new mods have been downloaded or enabled, reloading mods." )
-		NSReloadMods();
-	}
-
 	if ( server.requiresPassword )
 	{
 		OnCloseServerBrowserMenu()
@@ -1065,12 +1102,12 @@ void function OnServerSelected_Threaded( var button )
 	else
 	{
 		TriggerConnectToServerCallbacks()
-		thread ThreadedAuthAndConnectToServer()
+		thread ThreadedAuthAndConnectToServer( "", downloadedMods != 0 )
 	}
 }
 
 
-void function ThreadedAuthAndConnectToServer( string password = "" )
+void function ThreadedAuthAndConnectToServer( string password = "", bool modsChanged = false )
 {
 	if ( NSIsAuthenticatingWithServer() )
 		return
@@ -1098,8 +1135,6 @@ void function ThreadedAuthAndConnectToServer( string password = "" )
 
 	if ( NSWasAuthSuccessful() )
 	{
-		bool modsChanged = false
-
 		// disable all RequiredOnClient mods that are not required by the server and are currently enabled
 		foreach ( string modName in NSGetModNames() )
 		{