From 5302d33b7433c68947083ef57b6bb784bd02124f Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Thu, 28 Apr 2022 00:23:34 +0200
Subject: added: error if config file isn't valid

Essentially just validates the config file and then prompts you about
it, it allows you to reset it directly or just to exit and let yourself
fix it. And because the error message appears directly in the renderer
we have access to navigator.language, and can therefore still localize
the string. However! We can't actually care if the user has disabled
auto detection of their language, since... y'know, the config file where
that's stored isn't able to be read properly.

And so I added an argument to lang(), which allows you to force it to
use a specific language if that language is available, if not it
defaults back to English.
---
 src/lang/en.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lang')

diff --git a/src/lang/en.json b/src/lang/en.json
index af388d8..6849573 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -145,5 +145,7 @@
 	"general.mods.installed": "Installed mods:",
 	"general.missingpath": "Game location could not be found automatically! Please select it manually!",
 	"general.notinstalled": "Northstar is not installed!",
-	"general.launching": "Launching"
+	"general.launching": "Launching",
+	"general.reset": "Reset",
+	"general.invalidconfig": "Your config file is improperly formatted, if it's been manually edited, please validate that everything is typed correctly.\n\nIf you did not manually edit the config file, it is recommended to simply reset the config.\n\nTo reset your config file simply click \"Ok\" below.\n\nMore details:\n"
 }
-- 
cgit v1.2.3


From 847a2178e7823749e3096daf24dfcd3df8b236cb Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Thu, 28 Apr 2022 00:29:07 +0200
Subject: removed: unused lang string

This was meant to be used for the reset config prompt, but confirm()
doesn't allow you to change the button messages, which I forgot when I
was making this lang string, and subsequently lead to me forgetting I
even made the string, accidentally pushing it...
---
 src/lang/en.json | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/lang')

diff --git a/src/lang/en.json b/src/lang/en.json
index 6849573..ee932a2 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -146,6 +146,5 @@
 	"general.missingpath": "Game location could not be found automatically! Please select it manually!",
 	"general.notinstalled": "Northstar is not installed!",
 	"general.launching": "Launching",
-	"general.reset": "Reset",
 	"general.invalidconfig": "Your config file is improperly formatted, if it's been manually edited, please validate that everything is typed correctly.\n\nIf you did not manually edit the config file, it is recommended to simply reset the config.\n\nTo reset your config file simply click \"Ok\" below.\n\nMore details:\n"
 }
-- 
cgit v1.2.3


From b053faccce5cfdf9e7dc9550c9b4814a2ecb2b80 Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Tue, 3 May 2022 20:17:53 +0200
Subject: added missing strings for general.invalidconfig

---
 src/lang/es.json | 3 ++-
 src/lang/fr.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/lang')

diff --git a/src/lang/es.json b/src/lang/es.json
index e3ef4f0..dbccad8 100644
--- a/src/lang/es.json
+++ b/src/lang/es.json
@@ -145,5 +145,6 @@
 	"general.mods.installed": "Modificiaciones intaladas:",
 	"general.missingpath": "¡La ruta del jueno no se ha podido encontrar automaticamente! ¡Por favor, elige la ruta manualmente!",
 	"general.notinstalled": "¡Northstar no se ha instalado!",
-	"general.launching": "Ejecutando"
+	"general.launching": "Ejecutando",
+	"general.invalidconfig": "Su archivo de configuración está formateado de forma incorrecta, si ha sido editado manualmente, por favor valide que ha sido escrito correctamente. \n\nSi no ha editado manualmente el archivo de configuración, es recomendado que simplemente restaure la configuración. \n\nPara restaurar tu configuración simplemente de click en \"OK\" a continuación. \n\nMas detalles:\n"
 }
diff --git a/src/lang/fr.json b/src/lang/fr.json
index 81c5ada..d162988 100644
--- a/src/lang/fr.json
+++ b/src/lang/fr.json
@@ -145,5 +145,6 @@
 	"general.mods.installed": "Mods installés :",
 	"general.missingpath": "Le chemin du client n'a pu être trouvé automatiquement, merci de le sélectionner manuellement.",
 	"general.notinstalled": "Northstar n'est pas installé !",
-	"general.launching": "Lancement"
+	"general.launching": "Lancement",
+	"general.invalidconfig": "Votre fichier de configuration n'est pas formaté correctement ; si vous l'avez manuellement édité, veuillez vérifier son contenu.\n\nSinon, il est recommandé de remettre la configuration à zéro.\n\nPour cela, cliquez sur le bouton \"Ok\" en-dessous de ce message.\n\nPlus d'informations :\n"
 }
-- 
cgit v1.2.3


From 72f85aa2297f5c46d029f1e25193aa98ced884c3 Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Thu, 12 May 2022 01:34:07 +0200
Subject: initial draft for supporting dependencies

This should allow you to install packages that have dependencies,
however maybe not with the best UI/UX experience, as currently there's
only an English localization, and we also install dependencies even if
the dependency is already installed.
---
 src/app/browser.js | 10 ++++++++--
 src/app/main.js    | 37 +++++++++++++++++++++++++++++++++++--
 src/lang/en.json   |  1 +
 src/utils.js       |  8 --------
 4 files changed, 44 insertions(+), 12 deletions(-)

(limited to 'src/lang')

diff --git a/src/app/browser.js b/src/app/browser.js
index e22ab3c..5c943ba 100644
--- a/src/app/browser.js
+++ b/src/app/browser.js
@@ -171,7 +171,8 @@ function BrowserElFromObj(obj) {
 		download: pkg.download_url,
 		version: pkg.version_number,
 		categories: pkg.categories,
-		description: pkg.description
+		description: pkg.description,
+		dependencies: pkg.dependencies,
 	})
 }
 
@@ -240,7 +241,7 @@ function BrowserEl(properties) {
 			<div class="text">
 				<div class="title">${properties.title}</div>
 				<div class="description">${properties.description}</div>
-				<button class="install" onclick="installFromURL('${properties.download}')">${installstr}</button>
+				<button class="install" onclick='installFromURL("${properties.download}", ${JSON.stringify(properties.dependencies)}, true)'>${installstr}</button>
 				<button class="info" onclick="require('electron').shell.openExternal('${properties.url}')">${lang('gui.browser.info')}</button>
 				<button class="visual">${properties.version}</button>
 				<button class="visual">${lang("gui.browser.madeby")} ${properties.author}</button>
@@ -285,6 +286,11 @@ ipcRenderer.on("installedmod", (event, mod) => {
 		title: lang("gui.toast.title.installed"),
 		description: mod.name + " " + lang("gui.toast.desc.installed")
 	})
+
+	if (installqueue.length != 0) {
+		installFromURL("https://thunderstore.io/package/download/" + installqueue[0]);
+		installqueue.shift();
+	}
 })
 
 function normalize(items) {
diff --git a/src/app/main.js b/src/app/main.js
index 95b6f4c..109ca61 100644
--- a/src/app/main.js
+++ b/src/app/main.js
@@ -190,6 +190,8 @@ function selected(all) {
 	}
 }
 
+let installqueue = [];
+
 // Tells the main process to install a mod through the file selector
 function installmod() {
 	setButtons(false);
@@ -203,9 +205,40 @@ function installFromPath(path) {
 }
 
 // Tells the main process to install a mod from a URL
-function installFromURL(url) {
+function installFromURL(url, dependencies, clearqueue) {
+	if (clearqueue) {installqueue = []};
+	console.log(installqueue)
+
+	let prettydepends = [];
+
+	if (dependencies) {
+		let newdepends = [];
+		for (let i = 0; i < dependencies.length; i++) {
+			let depend = dependencies[i].toLowerCase();
+			console.log(depend)
+			if (! depend.match(/northstar-northstar-.*/)) {
+				newdepends.push(dependencies[i].replaceAll("-", "/"));
+				let pkg = newdepends[newdepends.length - 1].split("/");
+				prettydepends.push(`${pkg[1]} v${pkg[2]} - ${lang("gui.browser.madeby")} ${pkg[0]}`);
+			}
+		}
+
+		dependencies = newdepends;
+	} 
+
+	if (dependencies && dependencies.length != 0) {
+		let confirminstall = confirm(lang("gui.mods.confirmdependencies") + prettydepends.join("\n"));
+		if (! confirminstall) {
+			return
+		}
+	}
+
 	setButtons(false);
-	ipcRenderer.send("installfromurl", url)
+	ipcRenderer.send("installfromurl", url, dependencies)
+
+	if (dependencies) {
+		installqueue = dependencies;
+	}
 }
 
 // Frontend part of settings a new game path
diff --git a/src/lang/en.json b/src/lang/en.json
index ee932a2..024b44a 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -68,6 +68,7 @@
 	"gui.mods.installing": "Installing mod...",
 	"gui.mods.installedmod": "Installed mod!",
 	"gui.mods.dragdrop": "Drag and drop a mod to install",
+	"gui.mods.confirmdependencies": "This package has dependencies, shown below, clicking \"Ok\" will install the package and the dependencies.\n\n",
 
 	"gui.browser.info": "Info",
 	"gui.browser.madeby": "by",
diff --git a/src/utils.js b/src/utils.js
index eb9f195..e63297e 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -720,14 +720,6 @@ const mods = {
 			let stream = fs.createWriteStream(modlocation);
 			res.pipe(stream);
 
-			// let received = 0;
-			// // Progress messages, we should probably switch this to
-			// // percentage instead of how much is downloaded.
-			// res.on("data", (chunk) => {
-			// 	received += chunk.length;
-			// 	ipcMain.emit("ns-update-event", lang("gui.update.downloading") + " " + (received / 1024 / 1024).toFixed(1) + "mb");
-			// })
-
 			stream.on("finish", () => {
 				stream.close();
 				mods.install(modlocation);
-- 
cgit v1.2.3


From 71e4fd2600d015c4cf978cb448640efeabff3371 Mon Sep 17 00:00:00 2001
From: Delta <31860825+AA-Delta@users.noreply.github.com>
Date: Thu, 12 May 2022 08:49:40 -0500
Subject: "gui.mods.confirmdependencies" "es" localization

#122
---
 src/lang/es.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/lang')

diff --git a/src/lang/es.json b/src/lang/es.json
index dbccad8..c2871f1 100644
--- a/src/lang/es.json
+++ b/src/lang/es.json
@@ -68,6 +68,7 @@
 	"gui.mods.installing": "Instalando modificación...",
 	"gui.mods.installedmod": "¡Modificación instalada!",
 	"gui.mods.dragdrop": "Arrastra y suelta una modificación para instalarla",
+	"gui.mods.confirmdependencies": "Este paquete tiene dependencias, se muestran abajo. Presionar \"Ok\" instalará el paquete y las dependencias.\n\n",
 
 	"gui.browser.info": "Información",
 	"gui.browser.madeby": "por",
-- 
cgit v1.2.3


From 0b893f9f2b01196b583222df072ae51631457649 Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Mon, 16 May 2022 20:09:43 +0200
Subject: a lot of stuff, but mainly a "Load more..." button

In the past when more than 50 packages was loaded it'd simply display a
"Maximum packages loaded" message, and it wasn't actually 50, as it just
took the first 50 packages loaded, whether or not they were filtered
out, so now that's fixed and a "Load more..." button has been added.

With that comes some changes to the lang strings for
"gui.browser.endoflist" and a new one "gui.browser.loadmore".

I also fixed the filtered packages issue also occurring in searches.

This will overall allow a user to more easily find the maximum amount of
packages without loading literally over a hundred packages at once, not
good for performance...
---
 src/app/browser.js | 89 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 src/app/main.css   |  4 +++
 src/lang/en.json   |  3 +-
 3 files changed, 87 insertions(+), 9 deletions(-)

(limited to 'src/lang')

diff --git a/src/app/browser.js b/src/app/browser.js
index 5c943ba..0646ad1 100644
--- a/src/app/browser.js
+++ b/src/app/browser.js
@@ -2,9 +2,21 @@ const Fuse = require("fuse.js");
 var fuse;
 var packages = [];
 
+var packagecount = 0;
+
 var Browser = {
 	maxentries: 50,
 	filters: {
+		getpkgs: () => {
+			let pkgs = [];
+			for (let i in packages) {
+				if (! Browser.filters.isfiltered(packages[i].categories)) {
+					pkgs.push(packages[i]);
+				}
+			}
+
+			return pkgs;
+		},
 		get: () => {
 			let filtered = [];
 			let unfiltered = [];
@@ -81,6 +93,8 @@ var Browser = {
 	},
 	loadfront: async () => {
 		Browser.loading();
+
+		packagecount = 0;
 		
 		if (packages.length < 1) {
 			packages = await (await fetch("https://northstar.thunderstore.io/api/v1/package/")).json();
@@ -90,8 +104,15 @@ var Browser = {
 			})
 		}
 		
-		for (let i in packages) {
-			new BrowserElFromObj(packages[i]);
+		let pkgs = Browser.filters.getpkgs();
+		for (let i in pkgs) {
+			if (packagecount >= Browser.maxentries) {
+				Browser.endoflist();
+				break
+			}
+
+			new BrowserElFromObj(pkgs[i]);
+			packagecount++;
 		}
 	},
 	loading: (string) => {
@@ -107,9 +128,31 @@ var Browser = {
 			browserEntries.innerHTML = `<div class="loading">${lang('gui.browser.loading')}</div>`;
 		}
 	},
-	endoflist: () => {
-		if (browserEntries.querySelector(".message")) {return}
-		browserEntries.innerHTML += `<div class="message">${lang('gui.browser.endoflist')}</div>`
+	endoflist: (isEnd) => {
+		let pkgs = [];
+		let filtered = Browser.filters.getpkgs();
+		for (let i = 0; i < filtered.length; i++) {
+			if ([packagecount + i]) {
+				pkgs.push(filtered[packagecount + i]);
+			} else {
+				break
+			}
+		}
+
+		if (browserEntries.querySelector(".message")) {
+			browserEntries.querySelector(".message").remove();
+		}
+
+		if (pkgs.length == 0 || isEnd) {
+			browserEntries.innerHTML += `<div class="message">${lang('gui.browser.endoflist')}</div>`
+			return
+		}
+
+		browserEntries.innerHTML += `<div class="message"><button id="loadmore">${lang("gui.browser.loadmore")}</button></div>`
+		loadmore.addEventListener("click", () => {
+			Browser.loadpkgs(pkgs);
+			Browser.endoflist(pkgs);
+		})
 	},
 	search: (string) => {
 		Browser.loading();
@@ -120,8 +163,14 @@ var Browser = {
 			return
 		}
 
+		packagecount = 0;
+
+		let count = 0;
 		for (let i = 0; i < res.length; i++) {
+			if (count >= Browser.maxentries) {break}
+			if (Browser.filters.isfiltered(res[i].item.categories)) {continue}
 			new BrowserElFromObj(res[i].item);
+			count++;
 		}
 	},
 	setbutton: (mod, string) => {
@@ -157,6 +206,33 @@ var Browser = {
 				}
 			}, 1501)
 		}
+	},
+	loadpkgs: (pkgs, clear) => {
+		if (clear) {packagecount = 0}
+
+		if (browserEntries.querySelector(".message")) {
+			browserEntries.querySelector(".message").remove();
+		}
+
+		let count = 0;
+		for (let i in pkgs) {
+			if (count >= Browser.maxentries) {
+				if (pkgs[i] === undefined) {
+					Browser.endoflist(true);
+				}
+
+				Browser.endoflist();
+				console.log(pkgs)
+				break
+			}
+
+			try {
+				new BrowserElFromObj(pkgs[i])
+			}catch(e) {}
+
+			count++;
+			packagecount++;
+		}
 	}
 }
 
@@ -179,9 +255,6 @@ function BrowserElFromObj(obj) {
 function BrowserEl(properties) {
 	if (Browser.filters.isfiltered(properties.categories)) {return}
 
-	let entries = browser.querySelectorAll(".el").length;
-	if (entries == Browser.maxentries) {Browser.endoflist();return}
-	
 	properties = {
 		title: "No name",
 		version: "1.0.0",
diff --git a/src/app/main.css b/src/app/main.css
index 7b54ec7..d7f8284 100644
--- a/src/app/main.css
+++ b/src/app/main.css
@@ -245,6 +245,10 @@ button {
 	font-weight: 700;
 }
 
+.popup .message #loadmore {
+	background: rgb(var(--blue2));
+}
+
 .popup .el .description {font-size: 0.8em}
 .popup .el button {
 	background: rgb(var(--blue));
diff --git a/src/lang/en.json b/src/lang/en.json
index 024b44a..345a83c 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -77,7 +77,8 @@
 	"gui.browser.install": "Install",
 	"gui.browser.reinstall": "Re-Install",
 	"gui.browser.loading": "Loading mods...",
-	"gui.browser.endoflist": "Maximum packages has been loaded.<br>Use the search for finding other packages!",
+	"gui.browser.loadmore": "Load more...",
+	"gui.browser.endoflist": "All packages have been loaded.",
 	"gui.browser.noresults": "No results...",
 	"gui.browser.filter.mods": "Mods",
 	"gui.browser.filter.skins": "Skins",
-- 
cgit v1.2.3


From bb5446be8164176219784290f18751c6f35c4047 Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Tue, 17 May 2022 01:11:25 +0200
Subject: added external link button and changed string

"Info" -> "View", along with a button in the previewer to open the mod
page in the browser if you so choose.
---
 src/app/browser.js         |   7 ++++++-
 src/app/icons/external.png | Bin 0 -> 9764 bytes
 src/app/index.html         |   5 ++++-
 src/app/main.css           |  13 +++++++++----
 src/lang/en.json           |   1 +
 5 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 src/app/icons/external.png

(limited to 'src/lang')

diff --git a/src/app/browser.js b/src/app/browser.js
index 5a5a752..138aef8 100644
--- a/src/app/browser.js
+++ b/src/app/browser.js
@@ -244,6 +244,10 @@ var Browser = {
 	}
 }
 
+function openExternal(url) {
+	require("electron").shell.openExternal(url);
+}
+
 var view = document.querySelector(".popup#preview webview");
 var Preview = {
 	show: () => {
@@ -255,6 +259,7 @@ var Preview = {
 	set: (url, autoshow) => {
 		if (autoshow != false) {Preview.show()}
 		view.src = url;
+		document.querySelector("#preview #external").setAttribute("onclick", `openExternal("${url}")`);
 	}
 }
 
@@ -340,7 +345,7 @@ function BrowserEl(properties) {
 			<div class="title">${properties.title}</div>
 			<div class="description">${properties.description}</div>
 			<button class="install" onclick='installFromURL("${properties.download}", ${JSON.stringify(properties.dependencies)}, true)'>${installstr}</button>
-			<button class="info" onclick="Preview.set('${properties.url}')">${lang('gui.browser.info')}</button>
+			<button class="info" onclick="Preview.set('${properties.url}')">${lang('gui.browser.view')}</button>
 			<button class="visual">${properties.version}</button>
 			<button class="visual">${lang("gui.browser.madeby")} ${properties.author}</button>
 		</div>
diff --git a/src/app/icons/external.png b/src/app/icons/external.png
new file mode 100644
index 0000000..0b4f99e
Binary files /dev/null and b/src/app/icons/external.png differ
diff --git a/src/app/index.html b/src/app/index.html
index b146ba3..f67a7a8 100644
--- a/src/app/index.html
+++ b/src/app/index.html
@@ -134,10 +134,13 @@
 			</div>
 		</div>
 		<div class="popup small" id="preview">
-			<div class="misc fixed">
+			<div class="misc fixed vertical">
 				<button id="close" onclick="Preview.hide()">
 					<img src="icons/close.png">
 				</button>
+				<button id="external" onclick="">
+					<img src="icons/external.png">
+				</button>
 			</div>
 			<webview></webview>
 		</div>
diff --git a/src/app/main.css b/src/app/main.css
index e4c6a2c..903c03e 100644
--- a/src/app/main.css
+++ b/src/app/main.css
@@ -123,10 +123,6 @@ button {
 	width: calc(50% - var(--spacing) * 4);
 }
 
-.popup#preview #close {
-	margin: var(--spacing) var(--spacing) 0 auto !important;
-}
-
 .popup .misc, .popup #search, .option .actions input {
 	--height: var(--mischeight);
 }
@@ -135,6 +131,10 @@ button {
 	display: flex;
 }
 
+.popup .misc.vertical {
+	display: block;
+}
+
 .popup .misc.fixed {
 	width: 100%;
 	position: fixed;
@@ -177,6 +177,11 @@ button {
 	margin-left: 0px !important;
 }
 
+.popup#preview #close,
+.popup .misc.vertical button {
+	margin: var(--spacing) var(--spacing) 0 auto !important;
+}
+
 .popup .loading {
 	width: 100%;
 	color: white;
diff --git a/src/lang/en.json b/src/lang/en.json
index 345a83c..2c068ac 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -71,6 +71,7 @@
 	"gui.mods.confirmdependencies": "This package has dependencies, shown below, clicking \"Ok\" will install the package and the dependencies.\n\n",
 
 	"gui.browser.info": "Info",
+	"gui.browser.view": "View",
 	"gui.browser.madeby": "by",
 	"gui.browser.search": "Search...",
 	"gui.browser.update": "Update",
-- 
cgit v1.2.3


From 4232301aa5b88f4a3af3f6619517f8cd149fbc0f Mon Sep 17 00:00:00 2001
From: Delta <31860825+AA-Delta@users.noreply.github.com>
Date: Fri, 20 May 2022 08:34:37 -0500
Subject: Better browser "es" localization

#125
---
 src/lang/es.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lang')

diff --git a/src/lang/es.json b/src/lang/es.json
index c2871f1..8128440 100644
--- a/src/lang/es.json
+++ b/src/lang/es.json
@@ -77,12 +77,14 @@
 	"gui.browser.install": "Instalar",
 	"gui.browser.reinstall": "Re-Instalar",
 	"gui.browser.loading": "Cargando modificaciones...",
-	"gui.browser.endoflist": "Se ha cargado el máximo de paquetes.<br>¡Usa la búsqueda para encontrar otros paquetes!",
+	"gui.browser.endoflist": "Todos los paquetes han sido cargados",
 	"gui.browser.noresults": "Sin resultados...",
 	"gui.browser.filter.mods": "Modificaciones",
 	"gui.browser.filter.skins": "Skins",
 	"gui.browser.filter.client": "Del lado del cliente",
 	"gui.browser.filter.server": "Del lado del servidor",
+	"gui.browser.view": "Ver",
+	"gui.browser.loadmore": "Cargar más...",
 	
 	"gui.settings.save": "Guardar",
 	"gui.settings.discard": "Descartar",
-- 
cgit v1.2.3


From e7317656c3777e12518574f5898c97b562ea1ba2 Mon Sep 17 00:00:00 2001
From: Remy Raes <raes.remy@gmail.com>
Date: Fri, 20 May 2022 18:11:05 +0200
Subject: [feat] add missing French translations

---
 src/lang/fr.json | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/lang')

diff --git a/src/lang/fr.json b/src/lang/fr.json
index d162988..1f37948 100644
--- a/src/lang/fr.json
+++ b/src/lang/fr.json
@@ -68,14 +68,17 @@
 	"gui.mods.installing": "Installation du mod...",
 	"gui.mods.installedmod": "Mod installé !",
 	"gui.mods.dragdrop": "Glissez/déposez un mod pour l'installer",
+	"gui.mods.confirmdependencies": "Ce mod a des dépendances (affichées ci-dessous), cliquer \"Ok\" les installera en même temps que le mod.\n\n",
 
 	"gui.browser.info": "Info",
+	"gui.browser.view": "Voir",
 	"gui.browser.madeby": "par",
 	"gui.browser.search": "Rechercher",
 	"gui.browser.update": "Mise à jour",
 	"gui.browser.install": "Installer",
 	"gui.browser.reinstall": "Réinstaller",
 	"gui.browser.loading": "Chargement des mods...",
+	"gui.browser.loadmore": "Charger plus de mods...",
 	"gui.browser.endoflist": "Fin de la liste de mods.<br>Utilisez la barre de recherche pour en trouver davantage !",
 	"gui.browser.noresults": "Pas de résultat",
 	"gui.browser.filter.mods": "Mods",
-- 
cgit v1.2.3


From a844a146e88faa0c5f7239b5d05869868f2a2aab Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Sat, 28 May 2022 01:52:03 +0200
Subject: initial commit for master server status

This doesn't fully implement everything as the master server is down
whilst making this commit, so I can't fully implement it.
---
 src/app/css/launcher.css | 29 +++++++++++++++++++++++++++++
 src/app/index.html       |  3 ++-
 src/app/launcher.js      | 40 ++++++++++++++++++++++++++++++++++++++++
 src/lang/en.json         |  4 ++++
 4 files changed, 75 insertions(+), 1 deletion(-)

(limited to 'src/lang')

diff --git a/src/app/css/launcher.css b/src/app/css/launcher.css
index 03812c6..ce54ddf 100644
--- a/src/app/css/launcher.css
+++ b/src/app/css/launcher.css
@@ -297,3 +297,32 @@ code {
 	margin-top: calc(var(--spacing) / 2);
 	margin-bottom: calc(var(--spacing) / 2);
 }
+
+#serverstatus {
+	--spacing: calc(var(--padding) / 5);
+	
+	transition-duration: 0.2s;
+	transition-timing-function: ease-in-out;
+	transition-property: background, opacity;
+
+	opacity: 0.0;
+	display: block;
+	margin: 0 auto;
+	font-weight: 700;
+	width: fit-content;
+	color: transparent;
+	border-radius: 50px;
+	flex-basis: max-content;
+	background: transparent;
+	margin-top: calc(var(--spacing) * 2);
+	padding: var(--spacing) calc(var(--spacing) * 3);
+}
+
+#serverstatus.up,
+#serverstatus.down {
+	color: white;
+	opacity: 1.0;
+}
+
+#serverstatus.up {background: rgb(var(--blue));}
+#serverstatus.down {background: rgb(var(--red));}
diff --git a/src/app/index.html b/src/app/index.html
index f67a7a8..2305e4c 100644
--- a/src/app/index.html
+++ b/src/app/index.html
@@ -197,6 +197,7 @@
 							<div class="inline">
 								<div id="nsversion"></div>
 								<a id="update" href="#" onclick="update()">(%%gui.update.check%%)</a>
+								<div id="serverstatus" class="checking"></div>
 							</div>
 						</div>
 					</div>
@@ -240,4 +241,4 @@
 		<script src="settings.js"></script>
 		<script src="launcher.js"></script>
 	</body>
-</html>
+<
diff --git a/src/app/launcher.js b/src/app/launcher.js
index 51d3a63..f426775 100644
--- a/src/app/launcher.js
+++ b/src/app/launcher.js
@@ -1,5 +1,9 @@
 const markdown = require("marked").parse;
 
+var servercount;
+var playercount;
+var masterserver;
+
 // Changes the main page
 // This is the tabs in the sidebar
 function page(page) {
@@ -107,3 +111,39 @@ function showNsSection(section) {
 			break;
 	}
 }
+
+async function loadServers() {
+	serverstatus.classList.add("checking");
+
+	try {
+		let servers = await (await fetch("https://northstar.tf/client/servers/")).json();
+		masterserver = true;
+	}catch (err) {
+		playercount = 0;
+		servercount = 0;
+		masterserver = false;
+	}
+
+	serverstatus.classList.remove("checking");
+
+	if (servercount == 0) {masterserver = false}
+
+	if (masterserver) {
+		serverstatus.classList.add("up");
+		// servercount and playercount don't actually get set anywhere,
+		// the reason for this is, while writing this code, the master
+		// server is down so I don't have anyway to test the code...
+		//
+		// it'll be added whenever the masterserver comes online again.
+		serverstatus.innerHTML = `${servercount} ${lang("gui.server.servers")} - ${playercount} ${lang("gui.server.players")}`;
+	} else {
+		serverstatus.classList.add("down");
+		serverstatus.innerHTML = lang("gui.server.offline");
+
+	}
+}; loadServers()
+
+// Refreshes every 5 minutes
+setInterval(() => {
+	loadServers();
+}, 300000)
diff --git a/src/lang/en.json b/src/lang/en.json
index 2c068ac..045517d 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -113,6 +113,10 @@
 	"gui.nsupdate.gaming.title": "Northstar update available!",
 	"gui.nsupdate.gaming.body": "An update for Northstar is available.\nYou can force its installation after closing the game.",
 
+	"gui.server.servers": "servers",
+	"gui.server.players": "players",
+	"gui.server.offline": "Masterserver is Offline",
+
 	"gui.launch": "Launch",
 	"gui.launchvanilla": "Vanilla",
 	"gui.launchnorthstar": "Northstar",
-- 
cgit v1.2.3


From 6e7b66060e8655e013b74140b30f41f6d5ee52e8 Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Mon, 30 May 2022 18:15:13 +0200
Subject: support for singular players

While it's unlikely we'll ever get down to 1 player, it's best to be on
the safe side :p
---
 src/app/launcher.js | 12 ++++++------
 src/lang/en.json    |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/lang')

diff --git a/src/app/launcher.js b/src/app/launcher.js
index 719048e..569d0fe 100644
--- a/src/app/launcher.js
+++ b/src/app/launcher.js
@@ -135,14 +135,14 @@ async function loadServers() {
 
 	if (servercount == 0 || ! servercount || ! playercount) {masterserver = false}
 
+	let playerstr = lang("gui.server.players");
+	if (playercount == 1) {
+		playerstr = lang("gui.server.player");
+	}
+
 	if (masterserver) {
 		serverstatus.classList.add("up");
-		// servercount and playercount don't actually get set anywhere,
-		// the reason for this is, while writing this code, the master
-		// server is down so I don't have anyway to test the code...
-		//
-		// it'll be added whenever the masterserver comes online again.
-		serverstatus.innerHTML = `${servercount} ${lang("gui.server.servers")} - ${playercount} ${lang("gui.server.players")}`;
+		serverstatus.innerHTML = `${servercount} ${lang("gui.server.servers")} - ${playercount} ${playerstr}`;
 	} else {
 		serverstatus.classList.add("down");
 		serverstatus.innerHTML = lang("gui.server.offline");
diff --git a/src/lang/en.json b/src/lang/en.json
index 045517d..34c4619 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -113,8 +113,9 @@
 	"gui.nsupdate.gaming.title": "Northstar update available!",
 	"gui.nsupdate.gaming.body": "An update for Northstar is available.\nYou can force its installation after closing the game.",
 
-	"gui.server.servers": "servers",
+	"gui.server.player": "player",
 	"gui.server.players": "players",
+	"gui.server.servers": "servers",
 	"gui.server.offline": "Masterserver is Offline",
 
 	"gui.launch": "Launch",
-- 
cgit v1.2.3


From a52f7ccbf5da1e62b7ff71b08d032663153be885 Mon Sep 17 00:00:00 2001
From: Remy Raes <raes.remy@gmail.com>
Date: Mon, 30 May 2022 18:24:08 +0200
Subject: [feat] add missing French translations

---
 src/lang/fr.json | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/lang')

diff --git a/src/lang/fr.json b/src/lang/fr.json
index 1f37948..3fba39f 100644
--- a/src/lang/fr.json
+++ b/src/lang/fr.json
@@ -113,6 +113,11 @@
 	"gui.nsupdate.gaming.title": "Mise à jour Northstar disponible !",
 	"gui.nsupdate.gaming.body": "Une mise à jour pour Northstar est disponible.\nVous pourrez l'installer après avoir fermé le jeu.",
 
+	"gui.server.player": "joueur",
+	"gui.server.players": "joueurs",
+	"gui.server.servers": "serveurs",
+	"gui.server.offline": "Le serveur maître est hors-ligne",
+
 	"gui.launch": "Jouer",
 	"gui.launchvanilla": "Vanilla",
 	"gui.launchnorthstar": "Northstar",
-- 
cgit v1.2.3


From 03e5208f6ed208f174b6579df0d6c372f9a26a31 Mon Sep 17 00:00:00 2001
From: Delta <31860825+AA-Delta@users.noreply.github.com>
Date: Wed, 1 Jun 2022 12:16:24 -0500
Subject: Update es.json

#130
---
 src/lang/es.json | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/lang')

diff --git a/src/lang/es.json b/src/lang/es.json
index 8128440..4efa765 100644
--- a/src/lang/es.json
+++ b/src/lang/es.json
@@ -130,6 +130,11 @@
 	"gui.toast.desc.malformed": "tiene una estructura de carpetas incorrecta, si usted es el desarrollador, debe corregir esto.",
 	"gui.toast.desc.failed": "Se produjo un error desconocido al intentar instalar la modificación. Esto puede ser culpa del autor de la modificación, y también puede ser culpa de Viper.",
 
+	"gui.server.player": "jugador",
+	"gui.server.players": "jugadores",
+	"gui.server.servers": "servidores",
+	"gui.server.offline": "El servidor Master está desconectado",
+	
 	"viper.menu.main": "Viper",
 	"viper.menu.release": "Notas de la versión",
 	"viper.menu.info": "Extras",
-- 
cgit v1.2.3


From f9e51cfb04de5316a555d42aa6e23ec445c66f73 Mon Sep 17 00:00:00 2001
From: B <fitnessnonsense@gmail.com>
Date: Thu, 2 Jun 2022 03:00:06 -0600
Subject: added setting for auto-killing origin, functionality working

---
 .gitignore         |   1 +
 src/app/index.html |  12 +++
 src/index.js       |  75 ++++++++++-------
 src/lang/en.json   |   3 +
 src/utils.js       | 239 +++++++++++++++++++++++++++--------------------------
 5 files changed, 182 insertions(+), 148 deletions(-)

(limited to 'src/lang')

diff --git a/.gitignore b/.gitignore
index 1eae0cf..ec12b74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 dist/
 node_modules/
+.vscode/
\ No newline at end of file
diff --git a/src/app/index.html b/src/app/index.html
index 2305e4c..0255dd6 100644
--- a/src/app/index.html
+++ b/src/app/index.html
@@ -107,6 +107,18 @@
 						<input type="text">
 					</div>
 				</div>
+				<h2>%%gui.settings.title.misc%%</h2>
+				<div class="option" name="originkill">
+					<div class="text">
+						%%gui.settings.originkill.title%%
+						<div class="desc">
+							%%gui.settings.originkill.desc%%
+						</div>
+					</div>
+					<div class="actions">
+						<button class="switch off"></button>
+					</div>
+				</div>
 			</div>
 		</div>
 
diff --git a/src/index.js b/src/index.js
index 96976b7..ddaa928 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,6 +6,7 @@ const { app, ipcMain, BrowserWindow, dialog } = require("electron");
 const utils = require("./utils");
 const cli = require("./cli");
 const requests = require("./extras/requests");
+const { settings } = require("./utils");
 
 var log = console.log;
 
@@ -33,10 +34,10 @@ function start() {
 			nodeIntegration: true,
 			contextIsolation: false,
 		},
-	}); 
+	});
 
 	// when --debug is added it'll open the dev tools
-	if (cli.hasParam("debug")) {win.openDevTools()}
+	if (cli.hasParam("debug")) { win.openDevTools() }
 
 	// general setup
 	win.removeMenu();
@@ -46,23 +47,35 @@ function start() {
 		win.webContents.send(channel, data);
 	}; send = win.send;
 
-	ipcMain.on("exit", () => {process.exit(0)});
-	ipcMain.on("minimize", () => {win.minimize()});
-	ipcMain.on("relaunch", () => {app.relaunch();app.exit()});
+	ipcMain.on("exit", () => {
+		if (settings.originkill) {
+			utils.isOriginRunning().then((running) => {
+				if (running) {
+					utils.killOrigin().then(process.exit(0))
+				} else {
+					process.exit(0)	
+				}
+			})
+		} else {
+			process.exit(0)
+		}
+	});
+	ipcMain.on("minimize", () => { win.minimize() });
+	ipcMain.on("relaunch", () => { app.relaunch(); app.exit() });
 
 	// passthrough to renderer from main
-	ipcMain.on("win-log", (event, ...args) => {send("log", ...args)});
-	ipcMain.on("win-alert", (event, ...args) => {send("alert", ...args)});
+	ipcMain.on("win-log", (event, ...args) => { send("log", ...args) });
+	ipcMain.on("win-alert", (event, ...args) => { send("alert", ...args) });
 
 	// mod states
-	ipcMain.on("failed-mod", (event, modname) => {send("failed-mod", modname)});
-	ipcMain.on("removed-mod", (event, modname) => {send("removed-mod", modname)});
-	ipcMain.on("gui-getmods", (event, ...args) => {send("mods", utils.mods.list())});
-	ipcMain.on("installed-mod", (event, modname) => {send("installed-mod", modname)});
+	ipcMain.on("failed-mod", (event, modname) => { send("failed-mod", modname) });
+	ipcMain.on("removed-mod", (event, modname) => { send("removed-mod", modname) });
+	ipcMain.on("gui-getmods", (event, ...args) => { send("mods", utils.mods.list()) });
+	ipcMain.on("installed-mod", (event, modname) => { send("installed-mod", modname) });
 
 	// install calls
-	ipcMain.on("install-from-path", (event, path) => {utils.mods.install(path)});
-	ipcMain.on("install-from-url", (event, url) => {utils.mods.installFromURL(url)});
+	ipcMain.on("install-from-path", (event, path) => { utils.mods.install(path) });
+	ipcMain.on("install-from-url", (event, url) => { utils.mods.installFromURL(url) });
 
 	win.webContents.on("dom-ready", () => {
 		send("mods", utils.mods.list());
@@ -71,18 +84,18 @@ function start() {
 	// ensures gamepath still exists and is valid on startup
 	let gamepathlost = false;
 	ipcMain.on("gamepath-lost", (event, ...args) => {
-		if (! gamepathlost) {
+		if (!gamepathlost) {
 			gamepathlost = true;
 			send("gamepath-lost");
 		}
 	});
 
-	ipcMain.on("save-settings", (event, obj) => {utils.saveSettings(obj)});
+	ipcMain.on("save-settings", (event, obj) => { utils.saveSettings(obj) });
 
 	// allows renderer to check for updates
-	ipcMain.on("ns-update-event", (event) => {send("ns-update-event", event)});
+	ipcMain.on("ns-update-event", (event) => { send("ns-update-event", event) });
 	ipcMain.on("can-autoupdate", () => {
-		if (! autoUpdater.isUpdaterActive() || cli.hasParam("no-vp-updates")) {
+		if (!autoUpdater.isUpdaterActive() || cli.hasParam("no-vp-updates")) {
 			send("cant-autoupdate");
 		}
 	})
@@ -115,34 +128,34 @@ ipcMain.on("install-mod", () => {
 	if (cli.hasArgs()) {
 		utils.mods.install(cli.param("installmod"));
 	} else {
-		dialog.showOpenDialog({properties: ["openFile"]}).then(res => {
+		dialog.showOpenDialog({ properties: ["openFile"] }).then(res => {
 			if (res.filePaths.length != 0) {
 				utils.mods.install(res.filePaths[0]);
 			} else {
 				send("set-buttons", true);
 			}
-		}).catch(err => {error(err)});
+		}).catch(err => { error(err) });
 	}
 })
 
-ipcMain.on("remove-mod", (event, mod) => {utils.mods.remove(mod)});
-ipcMain.on("toggle-mod", (event, mod) => {utils.mods.toggle(mod)});
+ipcMain.on("remove-mod", (event, mod) => { utils.mods.remove(mod) });
+ipcMain.on("toggle-mod", (event, mod) => { utils.mods.toggle(mod) });
 
-ipcMain.on("launch-ns", () => {utils.launch()});
-ipcMain.on("launch-vanilla", () => {utils.launch("vanilla")});
+ipcMain.on("launch-ns", () => { utils.launch() });
+ipcMain.on("launch-vanilla", () => { utils.launch("vanilla") });
 
-ipcMain.on("setlang", (event, lang) => {utils.setlang(lang)});
+ipcMain.on("setlang", (event, lang) => { utils.setlang(lang) });
 
-ipcMain.on("update", () => {utils.update()})
-ipcMain.on("setpath-cli", () => {utils.setpath()});
+ipcMain.on("update", () => { utils.update() })
+ipcMain.on("setpath-cli", () => { utils.setpath() });
 ipcMain.on("setpath", (event, value) => {
-	if (! value) {
-		if (! win.isVisible()) {
+	if (!value) {
+		if (!win.isVisible()) {
 			utils.setpath(win);
 		} else {
 			utils.setpath(win, true);
 		}
-	} else if (! win.isVisible()) {
+	} else if (!win.isVisible()) {
 		win.show();
 	}
 });
@@ -157,7 +170,7 @@ function sendVersionsInfo() {
 }
 
 // sends the version info back to the renderer
-ipcMain.on("get-version", () => {sendVersionsInfo()});
+ipcMain.on("get-version", () => { sendVersionsInfo() });
 
 // prints out version info for the CLI
 ipcMain.on("version-cli", () => {
@@ -194,7 +207,7 @@ ipcMain.on("getmods", () => {
 
 // allows renderer to set a new renderer
 ipcMain.on("newpath", (event, newpath) => {
-	if (newpath === false && ! win.isVisible()) {
+	if (newpath === false && !win.isVisible()) {
 		win.send("no-path-selected");
 	} else {
 		_sendVersionsInfo();
diff --git a/src/lang/en.json b/src/lang/en.json
index 34c4619..3ae6ff1 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -91,6 +91,7 @@
 	"gui.settings.title.ns": "Northstar",
 	"gui.settings.title.language": "Language",
 	"gui.settings.title.updates": "Updates",
+	"gui.settings.title.misc": "Miscellaneous",
 	"gui.settings.nsargs.title": "Launch options",
 	"gui.settings.nsargs.desc": "Here you can add launch options for Northstar/Titanfall.",
 	"gui.settings.autolang.title": "Auto-Detect Language",
@@ -103,6 +104,8 @@
 	"gui.settings.nsupdate.desc": "Viper will automatically keep Northstar up-to-date, however it can still manually be updated through the Northstar page.",
 	"gui.settings.excludes.title": "Retain files on update",
 	"gui.settings.excludes.desc": "When Northstar is updated, files specified here will not be overwritten by files from the new Northstar update, unless you know what you're changing, you should probably not change anything here. Each file is separated with a space.",
+	"gui.settings.originkill.title": "Automatically quit Origin",
+	"gui.settings.originkill.desc": "When Viper exits, automatically quit Origin client too.  Mirrors behavior of launching the game through Steam.",
 
 	"gui.update.downloading": "Downloading...",
 	"gui.update.extracting": "Extracting update...",
diff --git a/src/utils.js b/src/utils.js
index 061c3f1..2e81bdf 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -37,7 +37,9 @@ var settings = {
 	excludes: [
 		"ns_startup_args.txt",
 		"ns_startup_args_dedi.txt"
-	]
+	],
+
+	originkill: false
 }
 
 // Logs into the dev tools of the renderer
@@ -58,11 +60,11 @@ if (fs.existsSync("viper.json")) {
 	// Validates viper.json
 	try {
 		json = JSON.parse(conf);
-	}catch (e) {
+	} catch (e) {
 		invalidsettings = true;
 	}
 
-	settings = {...settings, ...json};
+	settings = { ...settings, ...json };
 	settings.zip = path.join(settings.gamepath + "/northstar.zip");
 
 	let args = path.join(settings.gamepath, "ns_startup_args.txt");
@@ -95,7 +97,7 @@ async function isGameRunning() {
 					break
 				}
 
-				if (i == procs.length - 1) {resolve(false)}
+				if (i == procs.length - 1) { resolve(false) }
 			}
 		});
 	});
@@ -103,44 +105,44 @@ async function isGameRunning() {
 
 //Check if origin client is running
 async function isOriginRunning() {
-    return new Promise(resolve => {
-	let procs = ["origin.exe"]; //check this, probably not right
-	let cmd = (() => {
-	    switch (process.platform) {
-	    case "linux": return "ps -A";
-	    case "win32": return "tasklist";
-	    }
-	})();
-
-	exec(cmd, (err, stdout) => {
-	    procs.forEach( proc => {
-		if (stdout.includes(proc)) {
-		    resolve(true);
-		    return;
-		}
-		resolve(false);
-	    });
+	return new Promise(resolve => {
+		let procs = ["Origin.exe", "OriginClientService.exe"];
+		let cmd = (() => {
+			switch (process.platform) {
+				case "linux": return "ps -A";
+				case "win32": return "tasklist";
+			}
+		})();
+
+		exec(cmd, (err, stdout) => {
+			procs.forEach(proc => {
+				if (stdout.includes(proc)) {
+					resolve(true);
+					return;
+				}
+				resolve(false);
+			});
+		});
 	});
-    });	    
 }
 
 //Kill origin client
 async function killOrigin() {
-    return Promise(resolve => {
-	let proc =  "origin.exe" ; //need to match above
-	let cmd = (() => {
-	    switch (process.platform) {
-	    case "linux": return "killall " + proc;
-	    case "win32": return "taskkill /IM " + proc + " /F";
-	    }
-	})();
-
-	exec(cmd, (err, stdout) => {
-	    //do some checking here maybe? idk we're going to be exiting so maybe we should
-	    //just try and fail silently if we don't find shit
-	    resolve(true);
+	return new Promise(resolve => {
+		let proc = "Origin.exe"; //I'm pretty sure we only have to kill this one
+		let cmd = (() => {
+			switch (process.platform) {
+				case "linux": return "killall " + proc;
+				case "win32": return "taskkill /IM " + proc + " /F";
+			}
+		})();
+
+		exec(cmd, (err, stdout) => {
+			//do some checking here maybe? idk we're going to be exiting so maybe we should
+			//just try and fail silently if we don't find shit
+			resolve(true);
+		});
 	});
-    });
 }
 
 // Handles auto updating Northstar.
@@ -148,7 +150,7 @@ async function killOrigin() {
 // It uses isGameRunning() to ensure it doesn't run while the game is
 // running, as that may have all kinds of issues.
 function handleNorthstarUpdating() {
-	if (! settings.nsupdate || ! fs.existsSync("viper.json") || settings.gamepath.length === 0) {
+	if (!settings.nsupdate || !fs.existsSync("viper.json") || settings.gamepath.length === 0) {
 		return;
 	}
 
@@ -163,7 +165,7 @@ function handleNorthstarUpdating() {
 			if (await isGameRunning()) {
 				console.log(lang("cli.autoupdates.gamerunning"));
 				new Notification({
-					title: lang("gui.nsupdate.gaming.title"), 
+					title: lang("gui.nsupdate.gaming.title"),
 					body: lang("gui.nsupdate.gaming.body")
 				}).show();
 			} else {
@@ -175,7 +177,7 @@ function handleNorthstarUpdating() {
 		}
 
 		setTimeout(
-			_checkForUpdates, 
+			_checkForUpdates,
 			15 * 60 * 1000
 			// interval in between each update check
 			// by default 15 minutes.
@@ -201,10 +203,10 @@ async function setpath(win, forcedialog) {
 		modpath = path.join(settings.gamepath, "R2Northstar/mods");
 	}
 
-	if (! win) { // CLI
+	if (!win) { // CLI
 		setGamepath(cli.param("setpath"));
 	} else { // GUI
-		if (! forcedialog) {
+		if (!forcedialog) {
 			function setGamepath(folder, forcedialog) {
 				settings.gamepath = folder;
 				settings.zip = path.join(settings.gamepath + "/northstar.zip");
@@ -223,12 +225,12 @@ async function setpath(win, forcedialog) {
 		}
 
 		// Fallback to manual selection
-		dialog.showOpenDialog({properties: ["openDirectory"]}).then(res => {
+		dialog.showOpenDialog({ properties: ["openDirectory"] }).then(res => {
 			if (res.canceled) {
 				ipcMain.emit("newpath", null, false);
 				return;
 			}
-			if (! fs.existsSync(path.join(res.filePaths[0], "Titanfall2.exe"))) {
+			if (!fs.existsSync(path.join(res.filePaths[0], "Titanfall2.exe"))) {
 				ipcMain.emit("wrong-path");
 				return;
 			}
@@ -237,7 +239,7 @@ async function setpath(win, forcedialog) {
 
 			cli.exit();
 			return;
-		}).catch(err => {console.error(err)})
+		}).catch(err => { console.error(err) })
 	}
 }
 
@@ -248,15 +250,15 @@ async function setpath(win, forcedialog) {
 // You can also pass a settings object to the function and it'll try and
 // merge it together with the already existing settings
 function saveSettings(obj = {}) {
-	if (invalidsettings) {return false}
+	if (invalidsettings) { return false }
 
-	settings = {...settings, ...obj};
+	settings = { ...settings, ...obj };
 
 	if (fs.existsSync(settings.gamepath)) {
 		fs.writeFileSync(path.join(settings.gamepath, "ns_startup_args.txt"), settings.nsargs);
 	}
 
-	fs.writeFileSync(app.getPath("appData") + "/viper.json", JSON.stringify({...settings, ...obj}));
+	fs.writeFileSync(app.getPath("appData") + "/viper.json", JSON.stringify({ ...settings, ...obj }));
 }
 
 // Returns the current Northstar version
@@ -313,7 +315,7 @@ restoreExcludedFiles();
 // <file>.excluded, then rename them back after the extraction. The
 // unzip module does not support excluding files directly.
 async function update() {
-	if (! gamepathExists()) {return}
+	if (!gamepathExists()) { return }
 
 	ipcMain.emit("ns-update-event", "cli.update.checking");
 	console.log(lang("cli.update.checking"));
@@ -332,7 +334,7 @@ async function update() {
 	} else {
 		if (version != "unknown") {
 			console.log(lang("cli.update.current"), version);
-		}; 
+		};
 		console.log(lang("cli.update.downloading") + ":", latestAvailableVersion);
 		ipcMain.emit("ns-update-event", "cli.update.downloading");
 	}
@@ -365,19 +367,19 @@ async function update() {
 			console.log(lang("cli.update.downloaddone"));
 			// Extracts the zip, this is the part where we're actually
 			// installing Northstar.
-			fs.createReadStream(settings.zip).pipe(unzip.Extract({path: settings.gamepath}))
-			.on("finish", () => {
-				fs.writeFileSync(path.join(settings.gamepath, "ns_version.txt"), latestAvailableVersion);
-				ipcMain.emit("get-version");
-
-				restoreExcludedFiles();
-
-				ipcMain.emit("gui-getmods");
-				ipcMain.emit("ns-update-event", "cli.update.uptodate.short");
-				winLog(lang("gui.update.finished"));
-				console.log(lang("cli.update.finished"));
-				cli.exit();
-			})
+			fs.createReadStream(settings.zip).pipe(unzip.Extract({ path: settings.gamepath }))
+				.on("finish", () => {
+					fs.writeFileSync(path.join(settings.gamepath, "ns_version.txt"), latestAvailableVersion);
+					ipcMain.emit("get-version");
+
+					restoreExcludedFiles();
+
+					ipcMain.emit("gui-getmods");
+					ipcMain.emit("ns-update-event", "cli.update.uptodate.short");
+					winLog(lang("gui.update.finished"));
+					console.log(lang("cli.update.finished"));
+					cli.exit();
+				})
 		})
 	})
 }
@@ -390,7 +392,7 @@ async function update() {
 function updatevp(autoinstall) {
 	const { autoUpdater } = require("electron-updater");
 
-	if (! autoUpdater.isUpdaterActive()) {
+	if (!autoUpdater.isUpdaterActive()) {
 		if (settings.nsupdate) {
 			handleNorthstarUpdating();
 		}
@@ -403,7 +405,7 @@ function updatevp(autoinstall) {
 		});
 	}
 
-	autoUpdater.on("error", (info) => {cli.exit(1)});
+	autoUpdater.on("error", (info) => { cli.exit(1) });
 	autoUpdater.on("update-not-available", (info) => {
 		// only check for NS updates if Viper itself has no updates and
 		// if NS auto updates is enabled.
@@ -429,7 +431,7 @@ function launch(version) {
 	}
 
 	process.chdir(settings.gamepath);
-	switch(version) {
+	switch (version) {
 		case "vanilla":
 			console.log(lang("general.launching"), "Vanilla...");
 			run(path.join(settings.gamepath + "/Titanfall2.exe"));
@@ -471,8 +473,8 @@ const mods = {
 		let enabled = [];
 		let disabled = [];
 
-		if (! fs.existsSync(modpath)) {
-			fs.mkdirSync(path.join(modpath), {recursive: true});
+		if (!fs.existsSync(modpath)) {
+			fs.mkdirSync(path.join(modpath), { recursive: true });
 			return {
 				enabled: [],
 				disabled: [],
@@ -491,9 +493,10 @@ const mods = {
 						Version: "unknown",
 						Name: "unknown",
 						FolderName: file,
-					...mod}
+						...mod
+					}
 
-					obj.Disabled = ! mods.modfile().get(obj.Name);
+					obj.Disabled = !mods.modfile().get(obj.Name);
 
 					let manifestfile = path.join(modpath, file, "manifest.json");
 					if (fs.existsSync(manifestfile)) {
@@ -542,7 +545,7 @@ const mods = {
 		for (let i = 0; i < list.length; i++) {
 			if (list[i].Name == mod) {
 				return list[i];
-			} else {continue}
+			} else { continue }
 		}
 
 		return false;
@@ -556,11 +559,11 @@ const mods = {
 		let modpath = path.join(settings.gamepath, "R2Northstar/mods");
 		let file = path.join(modpath, "..", "enabledmods.json");
 
-		if (! fs.existsSync(modpath)) {
-			fs.mkdirSync(path.join(modpath), {recursive: true});
+		if (!fs.existsSync(modpath)) {
+			fs.mkdirSync(path.join(modpath), { recursive: true });
 		}
 
-		if (! fs.existsSync(file)) {
+		if (!fs.existsSync(file)) {
 			fs.writeFileSync(file, "{}");
 		}
 
@@ -587,7 +590,7 @@ const mods = {
 			toggle: (mod) => {
 				let data = JSON.parse(repair(fs.readFileSync(file, "utf8")));
 				if (data[mod] != undefined) {
-					data[mod] = ! data[mod];
+					data[mod] = !data[mod];
 				} else {
 					data[mod] = false;
 				}
@@ -653,19 +656,19 @@ const mods = {
 			return true;
 		}
 
-		if (! fs.existsSync(mod)) {return notamod()}
+		if (!fs.existsSync(mod)) { return notamod() }
 
 		if (fs.statSync(mod).isDirectory()) {
 			winLog(lang("gui.mods.installing"));
 			files = fs.readdirSync(mod);
-			if (fs.existsSync(path.join(mod, "mod.json")) && 
+			if (fs.existsSync(path.join(mod, "mod.json")) &&
 				fs.statSync(path.join(mod, "mod.json")).isFile()) {
 
 				if (fs.existsSync(path.join(modpath, modname))) {
-					fs.rmSync(path.join(modpath, modname), {recursive: true});
+					fs.rmSync(path.join(modpath, modname), { recursive: true });
 				}
 				let copydest = path.join(modpath, modname);
-				if (typeof destname == "string") {copydest = path.join(modpath, destname)}
+				if (typeof destname == "string") { copydest = path.join(modpath, destname) }
 				copy(mod, copydest);
 				copy(manifestfile, path.join(copydest, "manifest.json"));
 
@@ -679,7 +682,7 @@ const mods = {
 							fs.statSync(path.join(mod, files[i], "mod.json")).isFile()) {
 
 							mods.install(path.join(mod, files[i]));
-							if (mods.install(path.join(mod, files[i]))) {return true};
+							if (mods.install(path.join(mod, files[i]))) { return true };
 						}
 					}
 				}
@@ -692,52 +695,52 @@ const mods = {
 			winLog(lang("gui.mods.extracting"));
 			let cache = path.join(app.getPath("userData"), "Archives");
 			if (fs.existsSync(cache)) {
-				fs.rmSync(cache, {recursive: true});
-				fs.mkdirSync(path.join(cache, "mods"), {recursive: true});
+				fs.rmSync(cache, { recursive: true });
+				fs.mkdirSync(path.join(cache, "mods"), { recursive: true });
 			} else {
-				fs.mkdirSync(path.join(cache, "mods"), {recursive: true});
+				fs.mkdirSync(path.join(cache, "mods"), { recursive: true });
 			}
 
 			try {
 				if (mod.replace(/.*\./, "").toLowerCase() == "zip") {
-					fs.createReadStream(mod).pipe(unzip.Extract({path: cache}))
-					.on("finish", () => {
-						setTimeout(() => {
-							let manifest = path.join(cache, "manifest.json");
-							if (fs.existsSync(manifest)) {
-								files = fs.readdirSync(path.join(cache, "mods"));
-								if (fs.existsSync(path.join(cache, "mods/mod.json"))) {
-									if (mods.install(path.join(cache, "mods"), require(manifest).name, manifest, true)) {
-										return true;
-									}
-								} else {
-									for (let i = 0; i < files.length; i++) {
-										let mod = path.join(cache, "mods", files[i]);
-										if (fs.statSync(mod).isDirectory()) {
-											setTimeout(() => {
-												if (mods.install(mod, false, manifest)) {return true};
-											}, 1000)
+					fs.createReadStream(mod).pipe(unzip.Extract({ path: cache }))
+						.on("finish", () => {
+							setTimeout(() => {
+								let manifest = path.join(cache, "manifest.json");
+								if (fs.existsSync(manifest)) {
+									files = fs.readdirSync(path.join(cache, "mods"));
+									if (fs.existsSync(path.join(cache, "mods/mod.json"))) {
+										if (mods.install(path.join(cache, "mods"), require(manifest).name, manifest, true)) {
+											return true;
+										}
+									} else {
+										for (let i = 0; i < files.length; i++) {
+											let mod = path.join(cache, "mods", files[i]);
+											if (fs.statSync(mod).isDirectory()) {
+												setTimeout(() => {
+													if (mods.install(mod, false, manifest)) { return true };
+												}, 1000)
+											}
 										}
-									}
 
-									if (files.length == 0) {
-										ipcMain.emit("failed-mod");
-										return notamod();
+										if (files.length == 0) {
+											ipcMain.emit("failed-mod");
+											return notamod();
+										}
 									}
-								}
 
-								return notamod();
-							}
+									return notamod();
+								}
 
-							if (mods.install(cache)) {
-								installed();
-							} else {return notamod()}
-						}, 1000)
-					});
+								if (mods.install(cache)) {
+									installed();
+								} else { return notamod() }
+							}, 1000)
+						});
 				} else {
 					return notamod();
 				}
-			}catch(err) {return notamod()}
+			} catch (err) { return notamod() }
 		}
 	},
 
@@ -751,7 +754,7 @@ const mods = {
 			let modlocation = path.join(tmp, "/mod.zip");
 
 			if (fs.existsSync(tmp)) {
-				if (! fs.statSync(tmp).isDirectory()) {
+				if (!fs.statSync(tmp).isDirectory()) {
 					fs.rmSync(tmp);
 				}
 			} else {
@@ -794,12 +797,12 @@ const mods = {
 		}
 
 		let disabled = path.join(modpath, "disabled");
-		if (! fs.existsSync(disabled)) {
+		if (!fs.existsSync(disabled)) {
 			fs.mkdirSync(disabled);
 		}
 
 		let modName = mods.get(mod).FolderName;
-		if (! modName) {
+		if (!modName) {
 			console.log("error: " + lang("cli.mods.cantfind"));
 			cli.exit(1);
 			return;
@@ -817,7 +820,7 @@ const mods = {
 				manifestname = require(path.join(modPath, "manifest.json")).name;
 			}
 
-			fs.rmSync(modPath, {recursive: true});
+			fs.rmSync(modPath, { recursive: true });
 			console.log(lang("cli.mods.removed"));
 			cli.exit();
 			ipcMain.emit("gui-getmods");
@@ -856,7 +859,7 @@ const mods = {
 		}
 
 		mods.modfile().toggle(mod);
-		if (! fork) {
+		if (!fork) {
 			console.log(lang("cli.mods.toggled"));
 			cli.exit();
 		}
@@ -889,6 +892,8 @@ module.exports = {
 	getNSVersion,
 	getTF2Version,
 	isGameRunning,
+	isOriginRunning,
+	killOrigin,
 	gamepathExists,
 	handleNorthstarUpdating,
 	setlang: (lang) => {
-- 
cgit v1.2.3


From 59aa33289cebd63432904ac69fa7d9f4f2bc1b9c Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Tue, 7 Jun 2022 17:23:33 +0200
Subject: minor changes

Mostly syntax, but also a few fixes with how the settings system work,
and also a change in localization strings.
---
 .gitignore       |  3 ++-
 src/app/main.js  |  1 +
 src/index.js     |  7 +++----
 src/lang/en.json |  2 +-
 src/utils.js     | 31 ++++++++++++++++++-------------
 5 files changed, 25 insertions(+), 19 deletions(-)

(limited to 'src/lang')

diff --git a/.gitignore b/.gitignore
index ec12b74..32e527a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.vscode/
+
 dist/
 node_modules/
-.vscode/
\ No newline at end of file
diff --git a/src/app/main.js b/src/app/main.js
index 647e5cd..9fb3191 100644
--- a/src/app/main.js
+++ b/src/app/main.js
@@ -14,6 +14,7 @@ var settings = {
 	autolang: true,
 	forcedlang: "en",
 	autoupdate: true,
+	originkill: false,
 	zip: "/northstar.zip",
 	lang: navigator.language,
 	excludes: [
diff --git a/src/index.js b/src/index.js
index a566b57..2c03529 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,7 +6,6 @@ const { app, ipcMain, BrowserWindow, dialog } = require("electron");
 const utils = require("./utils");
 const cli = require("./cli");
 const requests = require("./extras/requests");
-const { settings } = require("./utils");
 
 var log = console.log;
 
@@ -48,7 +47,7 @@ function start() {
 	}; send = win.send;
 
 	ipcMain.on("exit", () => {
-		if (settings.originkill) {
+		if (utils.settings.originkill) {
 			utils.isOriginRunning().then((running) => {
 				if (running) {
 					utils.killOrigin().then(process.exit(0))
@@ -60,8 +59,8 @@ function start() {
 			process.exit(0)
 		}
 	});
-	ipcMain.on("minimize", () => { win.minimize() });
-	ipcMain.on("relaunch", () => { app.relaunch(); app.exit() });
+	ipcMain.on("minimize", () => {win.minimize()});
+	ipcMain.on("relaunch", () => {app.relaunch(); app.exit()});
 
 	// passthrough to renderer from main
 	ipcMain.on("win-log", (event, ...args) => {send("log", ...args)});
diff --git a/src/lang/en.json b/src/lang/en.json
index 3ae6ff1..72711b8 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -105,7 +105,7 @@
 	"gui.settings.excludes.title": "Retain files on update",
 	"gui.settings.excludes.desc": "When Northstar is updated, files specified here will not be overwritten by files from the new Northstar update, unless you know what you're changing, you should probably not change anything here. Each file is separated with a space.",
 	"gui.settings.originkill.title": "Automatically quit Origin",
-	"gui.settings.originkill.desc": "When Viper exits, automatically quit Origin client too.  Mirrors behavior of launching the game through Steam.",
+	"gui.settings.originkill.desc": "When Viper exits, automatically quit Origin client too.",
 
 	"gui.update.downloading": "Downloading...",
 	"gui.update.extracting": "Extracting update...",
diff --git a/src/utils.js b/src/utils.js
index 2fea3ea..6114ef1 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -29,6 +29,7 @@ var settings = {
 	autolang: true,
 	forcedlang: "en",
 	autoupdate: true,
+	originkill: false,
 	nsargs: "-multiple",
 	zip: "/northstar.zip",
 
@@ -37,9 +38,7 @@ var settings = {
 	excludes: [
 		"ns_startup_args.txt",
 		"ns_startup_args_dedi.txt"
-	],
-
-	originkill: false
+	]
 }
 
 // Logs into the dev tools of the renderer
@@ -103,7 +102,7 @@ async function isGameRunning() {
 	});
 }
 
-//Check if origin client is running
+// checks if any origin processes are running
 async function isOriginRunning() {
 	return new Promise(resolve => {
 		let procs = ["Origin.exe", "OriginClientService.exe"];
@@ -126,7 +125,7 @@ async function isOriginRunning() {
 	});
 }
 
-//Kill origin client
+// kill origin processes
 async function killOrigin() {
 	return new Promise(resolve => {
 		let proc = "Origin.exe"; //I'm pretty sure we only have to kill this one
@@ -138,7 +137,7 @@ async function killOrigin() {
 		})();
 
 		exec(cmd, (err, stdout) => {
-			//just try and fail silently if we don't find it w/e
+			// just try and fail silently if we don't find it w/e
 			resolve(true);
 		});
 	});
@@ -879,21 +878,27 @@ setInterval(() => {
 
 module.exports = {
 	mods,
-	lang,
 	winLog,
-	launch,
+
 	update,
-	setpath,
 	updatevp,
-	settings,
-	saveSettings,
 	getNSVersion,
 	getTF2Version,
+	handleNorthstarUpdating,
+
+	launch,
+	killOrigin,
 	isGameRunning,
 	isOriginRunning,
-	killOrigin,
+
+
+	settings,
+	saveSettings,
+
+	setpath,
 	gamepathExists,
-	handleNorthstarUpdating,
+
+	lang,
 	setlang: (lang) => {
 		settings.lang = lang;
 		saveSettings();
-- 
cgit v1.2.3


From 0e2ae4648f5a53e7a5597c04d0829b6d870abaca Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Tue, 7 Jun 2022 17:28:16 +0200
Subject: very very minor change in localization string

---
 src/lang/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lang')

diff --git a/src/lang/en.json b/src/lang/en.json
index 72711b8..8cece10 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -105,7 +105,7 @@
 	"gui.settings.excludes.title": "Retain files on update",
 	"gui.settings.excludes.desc": "When Northstar is updated, files specified here will not be overwritten by files from the new Northstar update, unless you know what you're changing, you should probably not change anything here. Each file is separated with a space.",
 	"gui.settings.originkill.title": "Automatically quit Origin",
-	"gui.settings.originkill.desc": "When Viper exits, automatically quit Origin client too.",
+	"gui.settings.originkill.desc": "When Viper exits, automatically quit Origin as well.",
 
 	"gui.update.downloading": "Downloading...",
 	"gui.update.extracting": "Extracting update...",
-- 
cgit v1.2.3


From 320e7bd9f14becd6655623e3dfa9d7cd75422869 Mon Sep 17 00:00:00 2001
From: Remy Raes <raes.remy@gmail.com>
Date: Thu, 9 Jun 2022 22:26:00 +0000
Subject: [feat] add missing french translations

---
 src/lang/fr.json | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/lang')

diff --git a/src/lang/fr.json b/src/lang/fr.json
index 3fba39f..1fde982 100644
--- a/src/lang/fr.json
+++ b/src/lang/fr.json
@@ -91,6 +91,7 @@
 	"gui.settings.title.ns": "Northstar",
 	"gui.settings.title.language": "Langue",
 	"gui.settings.title.updates": "Mises à jour",
+	"gui.settings.title.misc": "Divers",
 	"gui.settings.nsargs.title": "Options de lancement",
 	"gui.settings.nsargs.desc": "Vous pouvez ajouter ici des options de démarrage pour Northstar/Titanfall.",
 	"gui.settings.autolang.title": "Auto-détection de la langue",
@@ -103,6 +104,8 @@
 	"gui.settings.nsupdate.desc": "Viper tient automatiquement Northstar à jour (n'empêche pas de le mettre à jour manuellement via sa page dédiée).",
 	"gui.settings.excludes.title": "Fichiers à conserver",
 	"gui.settings.excludes.desc": "Lorsque Northstar est mis à jour, ces fichiers ne seront pas écrasés par ceux provenant de la mise à jour; les noms de fichiers sont séparés par un espace.",
+	"gui.settings.originkill.title": "Quitter automatiquement Origin",
+	"gui.settings.originkill.desc": "Lorsque Viper est fermé, Origin sera également automatiquement fermé.",
 
 	"gui.update.downloading": "Téléchargement de la mise à jour...",
 	"gui.update.extracting": "Extraction des fichiers...",
-- 
cgit v1.2.3


From 0d81e16ccee3ca8afe5a0310fdbe6d708a1424ce Mon Sep 17 00:00:00 2001
From: Delta <31860825+AA-Delta@users.noreply.github.com>
Date: Sun, 12 Jun 2022 18:22:31 +0200
Subject: spanish originkill localizations

---
 src/lang/es.json | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/lang')

diff --git a/src/lang/es.json b/src/lang/es.json
index 4efa765..c341143 100644
--- a/src/lang/es.json
+++ b/src/lang/es.json
@@ -90,6 +90,7 @@
 	"gui.settings.discard": "Descartar",
 	"gui.settings.title.ns": "Northstar",
 	"gui.settings.title.updates": "Actualizaciones",
+	"gui.settings.title.misc": "Misceláneos",
 	"gui.settings.nsargs.title": "Opciones de lanzamiento",
 	"gui.settings.nsargs.desc": "Aqui puedes añadir opciones de lanzamiento para Northstar/Titanfall.",
 	"gui.settings.autoupdate.title": "Actualizaciones automáticas de Viper",
@@ -98,6 +99,8 @@
 	"gui.settings.nsupdate.desc": "Viper mantendrá Northstar actualizado automáticamente, sin embargo, todavía se puede actualizar manualmente a través de la sección de Northstar.",
 	"gui.settings.excludes.title": "Conservar archivos en la actualización",
 	"gui.settings.excludes.desc": "Cuando se actualice Northstar, los archivos especificados aquí no se sobrescribirán con archivos de la nueva actualización de Northstar. A menos que sepa lo que está cambiando, probablemente no debería cambiar nada aquí. Cada archivo se debe separar con un espacio.",
+	"gui.settings.originkill.title": "Cerrar Origin automáticamente",
+	"gui.settings.originkill.desc": "Cuando Viper se cierra, cerrar automáticamente Origin también.",
 	"gui.settings.title.language": "Idioma",
 	"gui.settings.autolang.title": "Detectar automáticamente el idioma",
 	"gui.settings.autolang.desc": "Cuando está habilitado, Viper intenta detectar automáticamente el idioma de su sistema, cuando está deshabilitado, puede cambiar manualmente el idioma a continuación.",
-- 
cgit v1.2.3


From 7220772713f90a9e6137bf07e6bf9dbe7c51d27b Mon Sep 17 00:00:00 2001
From: DxsSucuk <dxssucuk@hotmail.com>
Date: Sat, 2 Jul 2022 19:58:23 +0200
Subject: German translation.

---
 src/lang/de.json          | 160 ++++++++++++++++++++++++++++++++++++++++++++++
 src/lang/maintainers.json |   5 ++
 2 files changed, 165 insertions(+)
 create mode 100644 src/lang/de.json

(limited to 'src/lang')

diff --git a/src/lang/de.json b/src/lang/de.json
new file mode 100644
index 0000000..c3e7921
--- /dev/null
+++ b/src/lang/de.json
@@ -0,0 +1,160 @@
+{
+	"lang.title": "German",
+
+	"cli.help.help": "Zeigt die Hilfe Nachricht an.",
+	"cli.help.debug": "öffnet Entwickler/Debug Werkzeuge.",
+	"cli.help.version": "Gibt die Versions Informationen aus.",
+	"cli.help.cli": "zwingt die CLI Einstellung auf an.",
+	"cli.help.update": "Aktualisiert den Installationspfad von Northstar, durch den gegeben Installationspfad von Titanfall 2.",
+	"cli.help.setpath": "Setzt den Installationspfad von Titanfall 2.",
+	"cli.help.updatevp": "Aktualisiert Viper, falls dies unterstützt wird.",
+	"cli.help.novpupdates": "Überschreibt die viper.json und deaktiviert das aktualisieren von Viper.",
+	"cli.help.installmod": "Installiert eine Mod, ZIP Datei oder einen Ordner.",
+	"cli.help.removemod": "Entfernt einen Mod.",
+	"cli.help.togglemod": "Aktiviert/Deaktiviert einen Mod.",
+
+	"cli.setpath.noarg": "Keine Argument für --setpath wurden angegeben!",
+
+	"cli.update.current": "Jetzige Version:",
+	"cli.update.downloading": "Wird heruntergeladen...",
+	"cli.update.checking": "Überprüfe auf updates...",
+	"cli.update.downloaddone": "Herunterladen abgeschlossen! Extrahiere...",
+	"cli.update.finished": "Installation/Aktualisierung abeschlossen!",
+	"cli.update.uptodate": "Installation ist bereits auf dem neusten stand(%s), überspringe das aktualisieren.",
+	"cli.update.uptodate.short": "Auf dem neusten stand",
+
+	"cli.autoupdates.checking": "Überprüfe Northstar auf Updates...",
+	"cli.autoupdates.available": "Ein update für Northstar wurde gefunden!",
+	"cli.autoupdates.gamerunning": "Spiel wird ausgeführt, Northstar wird nicht aktualisiert.",
+	"cli.autoupdates.updatingns": "Aktualisierung im gange...",
+	"cli.autoupdates.noupdate": "Kein Uupdate für Northstar vorhanden.",
+
+	"cli.launch.linuxerror": "Das starten vom Spiel ist zurzeit nicht unterstütz für Linux Geräte.",
+
+	"cli.gamepath.lost": "Installationspfad wurde nicht gefunden, bitte sicher stellen das diese angegeben ist!",
+
+	"cli.mods.failed": "Mod konnte nicht installiert werden!",
+	"cli.mods.removed": "Mod wurde erfolgreich entfernt!",
+	"cli.mods.toggled": "Mod wurde erfolgreich aktiviert/deaktiviert!",
+	"cli.mods.installed": "Mod wurde erfolgreich installiert!",
+	"cli.mods.cantfind": "Ein Mod mit diesem Namen konnte nicht gefunden werden!",
+	"cli.mods.notamod": "Die angegebene Datei/der angegebene Ordner ist kein Mod!",
+	"cli.mods.toggledall": "Alle Mods wurde erfolgreich aktiviert/deaktiviert!",
+	"cli.mods.improperjson": "Die mod.json vom Mod %s ist fehlerhaft!",
+
+	"gui.welcome": "Willkommen zu Viper!",
+	"gui.versions.viper": "Viper version",
+	"gui.versions.northstar": "Northstar version",
+	"gui.exit": "Schließen",
+	"gui.update": "Aktualisieren",
+	"gui.setpath": "Installationspfad aktualisieren.",
+
+	"gui.update.check": "Auf update überprüfen",
+	"gui.mods": "Mods",
+	"gui.mods.count": "Installierte Mods:",
+	"gui.mods.disabledtag": "Deaktiviert",
+	"gui.mods.install": "Installiere den Mod",
+	"gui.mods.find": "Suche nach Mods",
+	"gui.mods.toggle": "Aktiviere/Deaktiviere den Mod",
+	"gui.mods.toggleall": "Aktiviere/Deaktiviere alle Mods",
+	"gui.mods.remove": "Entferne den Mod",
+	"gui.mods.removeall": "Entferne alle Mods",
+	"gui.mods.nothingselected": "Es wurde kein Mod ausgewählt.",
+	"gui.mods.toggleall.confirm": "Das deaktivieren aller Mods kann zum deaktiveren von Northstar nötigen Mods führen, bist du dir sicher das du diese Aktion durchführen willst?",
+	"gui.mods.removeall.confirm": "Das entfernen aller Mods führt meist oft zu eine nötigen neu installation von Northstar, bist du dir sicher das du diese Aktion durchführen willst?",
+	"gui.mods.required.confirm": "Du hast einen Norsthar nötigen Mod ausgewählt, bist du dir sicher das du diese Aktion durchführen willst",
+	"gui.mods.notamod": "Kein Mod!",
+	"gui.mods.extracting": "Extrahiere den Mod...",
+	"gui.mods.installing": "Installiere den Mod...",
+	"gui.mods.installedmod": "Mod installiert!",
+	"gui.mods.dragdrop": "Drag and drop um den Mod zu installieren!",
+	"gui.mods.confirmdependencies": "Dieser Mod benötigt weitere Mods, diese werden unter dieser Nachricht angezeigt. Beim dürcken auf \"Ok\" stimmst du zu da diese Installiert werden.\n\n",
+
+	"gui.browser.info": "Info",
+	"gui.browser.view": "Anschauen",
+	"gui.browser.madeby": "von",
+	"gui.browser.search": "Suchen...",
+	"gui.browser.update": "Aktualisieren",
+	"gui.browser.install": "Installieren",
+	"gui.browser.reinstall": "Neuinstallieren",
+	"gui.browser.loading": "Lade Mods...",
+	"gui.browser.loadmore": "Lade mehr...",
+	"gui.browser.endoflist": "Alle Packete wurden geladen.",
+	"gui.browser.noresults": "Keine Ergebnisse...",
+	"gui.browser.filter.mods": "Mods",
+	"gui.browser.filter.skins": "Skins",
+	"gui.browser.filter.client": "Client-seitig",
+	"gui.browser.filter.server": "Server-seitig",
+
+	"gui.settings.save": "Speichern",
+	"gui.settings.discard": "Verwerfen",
+	"gui.settings.title.ns": "Northstar",
+	"gui.settings.title.language": "Sprache",
+	"gui.settings.title.updates": "Updates",
+	"gui.settings.title.misc": "Sonstiges",
+	"gui.settings.nsargs.title": "Startoptionen",
+	"gui.settings.nsargs.desc": "Hier kannst du startoptionen für Northstar/Titanfall setzen.",
+	"gui.settings.autolang.title": "Automatische Spracherkennung",
+	"gui.settings.autolang.desc": "Beim aktiveren versucht Viper die richtige Sprache durch deine Systemsprache zu erkennen, durch das deaktivieren ist die manuelle auswahlt aktiviert.",
+	"gui.settings.forcedlang.title": "Sprache",
+	"gui.settings.forcedlang.desc": "Wenn \"Automatische Spracherkennung\" deaktiviert ist, wird diese Option genutzt um die Sprachen zu ändern. Oft ist ein Neustart nötig!",
+	"gui.settings.autoupdate.title": "Viper Auto-Updates",
+	"gui.settings.autoupdate.desc": "Viper wird sich automatisch selbst aktualisieren!",
+	"gui.settings.nsupdate.title": "Northstar Auto-Updates",
+	"gui.settings.nsupdate.desc": "Viper wird Northstar automatisch aktualisieren, eine manuelle aktualisierung ist trotzdem möglich.",
+	"gui.settings.excludes.title": "Behalte Datein beim aktualisieren.",
+	"gui.settings.excludes.desc": "Beim aktualisieren von Northstar werden diese Datein nicht überschrieben. Solang du nicht weißt was du verändert solltest du diese Datein auch nicht berabeiten. Dateinamen sollte durch eine Lücke getrennt werden.",
+	"gui.settings.originkill.title": "Automatisch Origin schließen",
+	"gui.settings.originkill.desc": "When Viper sich schließt soll Origin sich auch schließen.",
+
+	"gui.update.downloading": "Herunterladen...",
+	"gui.update.extracting": "Extrahiere update...",
+	"gui.update.finished": "Fertig! Spielbereit!",
+	"gui.update.uptodate": "Bereits auf dem neusten Stand!",
+	"gui.update.available": "Ein neues update für Viper ist verfügbar willst du Viper neustarten und diese installieren?",
+
+	"gui.nsupdate.gaming.title": "Northstar update verfübar!",
+	"gui.nsupdate.gaming.body": "Ein update für Northstar ist verfügbar! Du kannst die aktualisierung erzwingen nach dem schließen!",
+	"gui.server.player": "Spieler",
+	"gui.server.players": "Spieler",
+	"gui.server.servers": "Server",
+	"gui.server.offline": "Masterserver ist offline",
+
+	"gui.launch": "Starten",
+	"gui.launchvanilla": "Vanilla",
+	"gui.launchnorthstar": "Northstar",
+	"gui.installnorthstar": "Installieren",
+
+	"gui.selectpath": "Bitte wähle einen Installationspfad!",
+	"gui.gamepath.must": "Der Installationspfad muss gesetzt worden sein um Viper zu nutzen.",
+	"gui.gamepath.wrong": "Der angegebene Installationspfad ist nicht gültig!",	
+	"gui.gamepath.lost": "Der angegeben Installationspfad ist nicht mehr gültig!\n\nBitte stelle sicher das die Festplatte mounted ist oder falls der Installationspfad sich geändert hat das du diesen auch in Viper aktualisierst!\n\nViper wird möglicherweiße bis zum nächsten Neustart nicht funktionieren!",
+
+	"gui.toast.title.installed": "Mod installiert!",
+	"gui.toast.title.failed": "Fehler beim installierenb des Mods!",
+	"gui.toast.title.malformed": "Fehlerhafte Ordner struktur!",
+	"gui.toast.desc.installed": "wurde installiert!",
+	"gui.toast.desc.malformed": "hat eine felherhafte Ordner struktur, falls du der Entwickler bist solltest du dies beheben.",
+	"gui.toast.desc.failed": "Ein unbekannter Fehler ist aufgetaucht beim installieren, die Schuld kann beim Autor liegen oder bei Viper selbst!",
+
+	"viper.menu.main": "Viper",
+	"viper.menu.release": "Release Notes",
+	"viper.menu.info": "Extras",
+	"viper.menu.info.links": "Links",
+	"viper.menu.info.credits": "Credits",
+
+	"viper.info.discord": "Tritt dem Discord bei:",
+	"viper.info.issues": "Report ein Problem mit Viper:",
+
+	"ns.menu.main": "Northstar Launcher",
+	"ns.menu.mods": "Mods",
+	"ns.menu.release": "Release Notes",
+
+	"general.mods.enabled": "Aktivierte mods:",
+	"general.mods.disabled": "Deaktivierte mods:",
+	"general.mods.installed": "Installierte mods:",
+	"general.missingpath": "Installationspfad konnte nicht automatisch gefunden werden, bitte setze diesen manuell!",
+	"general.notinstalled": "Northstar ist nicht installiert!",
+	"general.launching": "Starte!",
+	"general.invalidconfig": "Deine Konfigurationsdatei ist nicht richtig formatiert, falls diese manuell verändert wurde bitte stelle sicher das alles korrekt ist.\n\nFalls du diese nicht manuell verändert hast ist es empfohlen diese zurückzusetzen!\n\nUm diese zurückzusetzen drücke einfach nur auf \"Ok\".\n\nWeitere Informationen:\n"
+}
diff --git a/src/lang/maintainers.json b/src/lang/maintainers.json
index 96ad685..41ab968 100644
--- a/src/lang/maintainers.json
+++ b/src/lang/maintainers.json
@@ -10,6 +10,11 @@
 
 		"fr": [
 			"https://github.com/Alystrasz"
+		],
+
+		"de": [
+			"https://github.com/DxsSucuk",
+			"https://twitter.com/memerinoto"
 		]
 	}
 }
-- 
cgit v1.2.3


From c1c9f167e9e17b9634be94f21073a96109503519 Mon Sep 17 00:00:00 2001
From: DxsSucuk <dxssucuk@hotmail.com>
Date: Sat, 2 Jul 2022 21:18:41 +0200
Subject: Update. Added German translation of the word German to title.

---
 src/lang/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lang')

diff --git a/src/lang/de.json b/src/lang/de.json
index c3e7921..a8c6592 100644
--- a/src/lang/de.json
+++ b/src/lang/de.json
@@ -1,5 +1,5 @@
 {
-	"lang.title": "German",
+	"lang.title": "German - Deutsch",
 
 	"cli.help.help": "Zeigt die Hilfe Nachricht an.",
 	"cli.help.debug": "öffnet Entwickler/Debug Werkzeuge.",
-- 
cgit v1.2.3


From a769a8099929483fd0edec561d654002954c2543 Mon Sep 17 00:00:00 2001
From: DxsSucuk <dxssucuk@hotmail.com>
Date: Sat, 2 Jul 2022 21:19:35 +0200
Subject: Fixed Typo

---
 src/lang/de.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lang')

diff --git a/src/lang/de.json b/src/lang/de.json
index a8c6592..378bb2e 100644
--- a/src/lang/de.json
+++ b/src/lang/de.json
@@ -2,9 +2,9 @@
 	"lang.title": "German - Deutsch",
 
 	"cli.help.help": "Zeigt die Hilfe Nachricht an.",
-	"cli.help.debug": "öffnet Entwickler/Debug Werkzeuge.",
+	"cli.help.debug": "Öffnet Entwickler/Debug Werkzeuge.",
 	"cli.help.version": "Gibt die Versions Informationen aus.",
-	"cli.help.cli": "zwingt die CLI Einstellung auf an.",
+	"cli.help.cli": "Zwingt die CLI Einstellung auf an.",
 	"cli.help.update": "Aktualisiert den Installationspfad von Northstar, durch den gegeben Installationspfad von Titanfall 2.",
 	"cli.help.setpath": "Setzt den Installationspfad von Titanfall 2.",
 	"cli.help.updatevp": "Aktualisiert Viper, falls dies unterstützt wird.",
-- 
cgit v1.2.3


From f87f76139f81aa751a1dd611db78c771c14ef534 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Mon, 4 Jul 2022 23:30:17 +0200
Subject: Improve German translation

Fixed various typos, mistranslations, and grammatical errors
---
 src/lang/de.json | 66 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'src/lang')

diff --git a/src/lang/de.json b/src/lang/de.json
index 378bb2e..2657d67 100644
--- a/src/lang/de.json
+++ b/src/lang/de.json
@@ -4,12 +4,12 @@
 	"cli.help.help": "Zeigt die Hilfe Nachricht an.",
 	"cli.help.debug": "Öffnet Entwickler/Debug Werkzeuge.",
 	"cli.help.version": "Gibt die Versions Informationen aus.",
-	"cli.help.cli": "Zwingt die CLI Einstellung auf an.",
+	"cli.help.cli": "Zwingt die CLI Einstellung auf \"an\".",
 	"cli.help.update": "Aktualisiert den Installationspfad von Northstar, durch den gegeben Installationspfad von Titanfall 2.",
 	"cli.help.setpath": "Setzt den Installationspfad von Titanfall 2.",
 	"cli.help.updatevp": "Aktualisiert Viper, falls dies unterstützt wird.",
-	"cli.help.novpupdates": "Überschreibt die viper.json und deaktiviert das aktualisieren von Viper.",
-	"cli.help.installmod": "Installiert eine Mod, ZIP Datei oder einen Ordner.",
+	"cli.help.novpupdates": "Überschreibt viper.json und deaktiviert das Aktualisieren von Viper.",
+	"cli.help.installmod": "Installiert einen Mod, eine ZIP-Datei oder einen Ordner.",
 	"cli.help.removemod": "Entfernt einen Mod.",
 	"cli.help.togglemod": "Aktiviert/Deaktiviert einen Mod.",
 
@@ -17,21 +17,21 @@
 
 	"cli.update.current": "Jetzige Version:",
 	"cli.update.downloading": "Wird heruntergeladen...",
-	"cli.update.checking": "Überprüfe auf updates...",
+	"cli.update.checking": "Überprüfe auf Updates...",
 	"cli.update.downloaddone": "Herunterladen abgeschlossen! Extrahiere...",
 	"cli.update.finished": "Installation/Aktualisierung abeschlossen!",
-	"cli.update.uptodate": "Installation ist bereits auf dem neusten stand(%s), überspringe das aktualisieren.",
+	"cli.update.uptodate": "Installation ist bereits auf dem neusten Stand (%s), aktualisieren wird übersprungen.",
 	"cli.update.uptodate.short": "Auf dem neusten stand",
 
 	"cli.autoupdates.checking": "Überprüfe Northstar auf Updates...",
-	"cli.autoupdates.available": "Ein update für Northstar wurde gefunden!",
+	"cli.autoupdates.available": "Ein Update für Northstar wurde gefunden!",
 	"cli.autoupdates.gamerunning": "Spiel wird ausgeführt, Northstar wird nicht aktualisiert.",
-	"cli.autoupdates.updatingns": "Aktualisierung im gange...",
-	"cli.autoupdates.noupdate": "Kein Uupdate für Northstar vorhanden.",
+	"cli.autoupdates.updatingns": "Updateprozess wird gestartet...",
+	"cli.autoupdates.noupdate": "Kein Update für Northstar vorhanden.",
 
-	"cli.launch.linuxerror": "Das starten vom Spiel ist zurzeit nicht unterstütz für Linux Geräte.",
+	"cli.launch.linuxerror": "Das Spiel starten ist derzeit nicht auf Linux unterstützt",
 
-	"cli.gamepath.lost": "Installationspfad wurde nicht gefunden, bitte sicher stellen das diese angegeben ist!",
+	"cli.gamepath.lost": "Installationspfad wurde nicht gefunden, bitte stelle sicher das er gemountet ist!",
 
 	"cli.mods.failed": "Mod konnte nicht installiert werden!",
 	"cli.mods.removed": "Mod wurde erfolgreich entfernt!",
@@ -43,13 +43,13 @@
 	"cli.mods.improperjson": "Die mod.json vom Mod %s ist fehlerhaft!",
 
 	"gui.welcome": "Willkommen zu Viper!",
-	"gui.versions.viper": "Viper version",
-	"gui.versions.northstar": "Northstar version",
+	"gui.versions.viper": "Viper Version",
+	"gui.versions.northstar": "Northstar Version",
 	"gui.exit": "Schließen",
 	"gui.update": "Aktualisieren",
 	"gui.setpath": "Installationspfad aktualisieren.",
 
-	"gui.update.check": "Auf update überprüfen",
+	"gui.update.check": "Auf Update überprüfen",
 	"gui.mods": "Mods",
 	"gui.mods.count": "Installierte Mods:",
 	"gui.mods.disabledtag": "Deaktiviert",
@@ -60,15 +60,15 @@
 	"gui.mods.remove": "Entferne den Mod",
 	"gui.mods.removeall": "Entferne alle Mods",
 	"gui.mods.nothingselected": "Es wurde kein Mod ausgewählt.",
-	"gui.mods.toggleall.confirm": "Das deaktivieren aller Mods kann zum deaktiveren von Northstar nötigen Mods führen, bist du dir sicher das du diese Aktion durchführen willst?",
-	"gui.mods.removeall.confirm": "Das entfernen aller Mods führt meist oft zu eine nötigen neu installation von Northstar, bist du dir sicher das du diese Aktion durchführen willst?",
-	"gui.mods.required.confirm": "Du hast einen Norsthar nötigen Mod ausgewählt, bist du dir sicher das du diese Aktion durchführen willst",
+	"gui.mods.toggleall.confirm": "Das Deaktivieren aller Mods kann zum Deaktiveren von Mods führen die von Northstar benötigt werden. Bist du dir sicher das du diese Aktion durchführen willst?",
+	"gui.mods.removeall.confirm": "Das Entfernen aller Mods führt meist dazu das eine Neuinstallation von Northstar nötig ist. Bist du dir sicher das du diese Aktion durchführen willst?",
+	"gui.mods.required.confirm": "Du hast einen von Northstar benötigten Mod ausgewählt, bist du dir sicher das du diese Aktion durchführen willst",
 	"gui.mods.notamod": "Kein Mod!",
 	"gui.mods.extracting": "Extrahiere den Mod...",
 	"gui.mods.installing": "Installiere den Mod...",
 	"gui.mods.installedmod": "Mod installiert!",
-	"gui.mods.dragdrop": "Drag and drop um den Mod zu installieren!",
-	"gui.mods.confirmdependencies": "Dieser Mod benötigt weitere Mods, diese werden unter dieser Nachricht angezeigt. Beim dürcken auf \"Ok\" stimmst du zu da diese Installiert werden.\n\n",
+	"gui.mods.dragdrop": "Drag and drop den Mod um ihn zu installieren!",
+	"gui.mods.confirmdependencies": "Dieser Mod benötigt weitere Mods, diese werden unter dieser Nachricht angezeigt. Beim drücken auf \"Ok\" stimmst du zu da diese Installiert werden.\n\n",
 
 	"gui.browser.info": "Info",
 	"gui.browser.view": "Anschauen",
@@ -93,17 +93,17 @@
 	"gui.settings.title.updates": "Updates",
 	"gui.settings.title.misc": "Sonstiges",
 	"gui.settings.nsargs.title": "Startoptionen",
-	"gui.settings.nsargs.desc": "Hier kannst du startoptionen für Northstar/Titanfall setzen.",
+	"gui.settings.nsargs.desc": "Hier kannst du Startoptionen für Northstar/Titanfall setzen.",
 	"gui.settings.autolang.title": "Automatische Spracherkennung",
-	"gui.settings.autolang.desc": "Beim aktiveren versucht Viper die richtige Sprache durch deine Systemsprache zu erkennen, durch das deaktivieren ist die manuelle auswahlt aktiviert.",
+	"gui.settings.autolang.desc": "Beim Aktiveren versucht Viper die richtige Sprache durch deine Systemsprache zu erkennen, durch das deaktivieren ist die manuelle Auswahl aktiviert.",
 	"gui.settings.forcedlang.title": "Sprache",
 	"gui.settings.forcedlang.desc": "Wenn \"Automatische Spracherkennung\" deaktiviert ist, wird diese Option genutzt um die Sprachen zu ändern. Oft ist ein Neustart nötig!",
 	"gui.settings.autoupdate.title": "Viper Auto-Updates",
 	"gui.settings.autoupdate.desc": "Viper wird sich automatisch selbst aktualisieren!",
 	"gui.settings.nsupdate.title": "Northstar Auto-Updates",
-	"gui.settings.nsupdate.desc": "Viper wird Northstar automatisch aktualisieren, eine manuelle aktualisierung ist trotzdem möglich.",
+	"gui.settings.nsupdate.desc": "Viper wird Northstar automatisch aktualisieren, eine manuelle Aktualisierung ist trotzdem möglich.",
 	"gui.settings.excludes.title": "Behalte Datein beim aktualisieren.",
-	"gui.settings.excludes.desc": "Beim aktualisieren von Northstar werden diese Datein nicht überschrieben. Solang du nicht weißt was du verändert solltest du diese Datein auch nicht berabeiten. Dateinamen sollte durch eine Lücke getrennt werden.",
+	"gui.settings.excludes.desc": "Beim Aktualisieren von Northstar werden diese Datein nicht überschrieben. Solang du nicht weißt was du verändert solltest du diese Datein auch nicht berabeiten. Dateinamen sollte durch eine Lücke getrennt werden.",
 	"gui.settings.originkill.title": "Automatisch Origin schließen",
 	"gui.settings.originkill.desc": "When Viper sich schließt soll Origin sich auch schließen.",
 
@@ -113,8 +113,8 @@
 	"gui.update.uptodate": "Bereits auf dem neusten Stand!",
 	"gui.update.available": "Ein neues update für Viper ist verfügbar willst du Viper neustarten und diese installieren?",
 
-	"gui.nsupdate.gaming.title": "Northstar update verfübar!",
-	"gui.nsupdate.gaming.body": "Ein update für Northstar ist verfügbar! Du kannst die aktualisierung erzwingen nach dem schließen!",
+	"gui.nsupdate.gaming.title": "Northstar Update verfübar!",
+	"gui.nsupdate.gaming.body": "Ein Update für Northstar ist verfügbar! Du kannst die Aktualisierung nach dem schließen erzwingen!",
 	"gui.server.player": "Spieler",
 	"gui.server.players": "Spieler",
 	"gui.server.servers": "Server",
@@ -128,14 +128,14 @@
 	"gui.selectpath": "Bitte wähle einen Installationspfad!",
 	"gui.gamepath.must": "Der Installationspfad muss gesetzt worden sein um Viper zu nutzen.",
 	"gui.gamepath.wrong": "Der angegebene Installationspfad ist nicht gültig!",	
-	"gui.gamepath.lost": "Der angegeben Installationspfad ist nicht mehr gültig!\n\nBitte stelle sicher das die Festplatte mounted ist oder falls der Installationspfad sich geändert hat das du diesen auch in Viper aktualisierst!\n\nViper wird möglicherweiße bis zum nächsten Neustart nicht funktionieren!",
+	"gui.gamepath.lost": "Der angegeben Installationspfad ist nicht mehr gültig!\n\nBitte stelle sicher das die Festplatte mounted ist, oder falls sich der Installationspfad geändert hat, das du diesen auch in Viper aktualisierst!\n\nViper wird möglicherweiße bis zum nächsten Neustart nicht funktionieren!",
 
 	"gui.toast.title.installed": "Mod installiert!",
-	"gui.toast.title.failed": "Fehler beim installierenb des Mods!",
-	"gui.toast.title.malformed": "Fehlerhafte Ordner struktur!",
+	"gui.toast.title.failed": "Fehler beim Installieren des Mods!",
+	"gui.toast.title.malformed": "Fehlerhafte Ordnerstruktur!",
 	"gui.toast.desc.installed": "wurde installiert!",
-	"gui.toast.desc.malformed": "hat eine felherhafte Ordner struktur, falls du der Entwickler bist solltest du dies beheben.",
-	"gui.toast.desc.failed": "Ein unbekannter Fehler ist aufgetaucht beim installieren, die Schuld kann beim Autor liegen oder bei Viper selbst!",
+	"gui.toast.desc.malformed": "hat eine fehlerhafte Ordnerstruktur, falls du der Entwickler bist, solltest du dies beheben.",
+	"gui.toast.desc.failed": "Ein unbekannter Fehler ist aufgetaucht beim Installieren, die Schuld kann beim Autor liegen oder bei Viper selbst!",
 
 	"viper.menu.main": "Viper",
 	"viper.menu.release": "Release Notes",
@@ -150,11 +150,11 @@
 	"ns.menu.mods": "Mods",
 	"ns.menu.release": "Release Notes",
 
-	"general.mods.enabled": "Aktivierte mods:",
-	"general.mods.disabled": "Deaktivierte mods:",
-	"general.mods.installed": "Installierte mods:",
+	"general.mods.enabled": "Aktivierte Mods:",
+	"general.mods.disabled": "Deaktivierte Mods:",
+	"general.mods.installed": "Installierte Mods:",
 	"general.missingpath": "Installationspfad konnte nicht automatisch gefunden werden, bitte setze diesen manuell!",
 	"general.notinstalled": "Northstar ist nicht installiert!",
 	"general.launching": "Starte!",
-	"general.invalidconfig": "Deine Konfigurationsdatei ist nicht richtig formatiert, falls diese manuell verändert wurde bitte stelle sicher das alles korrekt ist.\n\nFalls du diese nicht manuell verändert hast ist es empfohlen diese zurückzusetzen!\n\nUm diese zurückzusetzen drücke einfach nur auf \"Ok\".\n\nWeitere Informationen:\n"
+	"general.invalidconfig": "Deine Konfigurationsdatei ist nicht richtig formatiert, falls diese manuell verändert wurde bitte stelle sicher das alles korrekt ist.\n\nFalls du diese nicht manuell verändert hast, ist es empfohlen diese zurückzusetzen!\n\nUm sie zurückzusetzen drücke einfach auf \"Ok\".\n\nWeitere Informationen:\n"
 }
-- 
cgit v1.2.3


From 64fb444ad72bdba342a7345644a5b55d94c7f696 Mon Sep 17 00:00:00 2001
From: Alystrasz <contact@remyraes.com>
Date: Sat, 6 Aug 2022 22:47:27 +0200
Subject: feat: prevent Northstar update and update download link text if no
 Internet

---
 src/app/main.js  | 1 +
 src/lang/en.json | 1 +
 src/lang/fr.json | 1 +
 src/utils.js     | 5 +++++
 4 files changed, 8 insertions(+)

(limited to 'src/lang')

diff --git a/src/app/main.js b/src/app/main.js
index 9fb3191..4288d1d 100644
--- a/src/app/main.js
+++ b/src/app/main.js
@@ -122,6 +122,7 @@ ipcRenderer.on("ns-update-event", (event, key) => {
 	console.log(lang(key));
 	switch(key) {
 		case "cli.update.uptodate.short":
+		case "cli.update.noInternet":
 			setButtons(true);
 			playNsBtn.innerText = lang("gui.launch");
 			break;
diff --git a/src/lang/en.json b/src/lang/en.json
index 8cece10..9817a70 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -22,6 +22,7 @@
 	"cli.update.finished": "Installation/Update finished!",
 	"cli.update.uptodate": "Latest version (%s) is already installed, skipping update.",
 	"cli.update.uptodate.short": "Up-to-date",
+	"cli.update.noInternet": "No Internet connection",
 
 	"cli.autoupdates.checking": "Checking for Northstar updates...",
 	"cli.autoupdates.available": "Northstar update available!",
diff --git a/src/lang/fr.json b/src/lang/fr.json
index 1fde982..9d45e1a 100644
--- a/src/lang/fr.json
+++ b/src/lang/fr.json
@@ -22,6 +22,7 @@
 	"cli.update.finished": "Mise à jour terminée !",
 	"cli.update.uptodate": "La dernière version (%s) est déjà installée.",
 	"cli.update.uptodate.short": "Votre client est à jour",
+	"cli.update.noInternet": "Pas de connexion Internet",
 
 	"cli.autoupdates.checking": "Vérifications des mises à jour de Northstar...",
 	"cli.autoupdates.available": "Une mise à jour de Northstar est disponible !",
diff --git a/src/utils.js b/src/utils.js
index e8d14cc..b5978b6 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -155,6 +155,7 @@ function handleNorthstarUpdating() {
 	async function _checkForUpdates() {
 		let localVersion = getNSVersion();
 		let distantVersion = await requests.getLatestNsVersion();
+		if (distantVersion == false) return;
 		console.log(lang("cli.autoupdates.checking"));
 
 		// Checks if NS is outdated
@@ -361,6 +362,10 @@ async function update() {
 
 	const latestAvailableVersion = await requests.getLatestNsVersion();
 	console.log(latestAvailableVersion)
+	if (latestAvailableVersion == false) {
+		ipcMain.emit("ns-update-event", "cli.update.noInternet");
+		return;
+	}
 
 	// Makes sure it is not already the latest version
 	if (version === latestAvailableVersion) {
-- 
cgit v1.2.3


From 26034ec3475a61682a17c95cb2bffdbc9e52af54 Mon Sep 17 00:00:00 2001
From: Alystrasz <contact@remyraes.com>
Date: Sat, 6 Aug 2022 23:13:24 +0200
Subject: feat: display a toast message if no Internet at launch

---
 src/app/browser.js | 11 +++++++++++
 src/app/main.js    |  7 ++++++-
 src/index.js       |  1 +
 src/lang/en.json   |  3 +++
 src/lang/fr.json   |  3 +++
 5 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'src/lang')

diff --git a/src/app/browser.js b/src/app/browser.js
index 4b9f2e3..b1576a9 100644
--- a/src/app/browser.js
+++ b/src/app/browser.js
@@ -391,6 +391,17 @@ ipcRenderer.on("failed-mod", (event, modname) => {
 	})
 })
 
+ipcRenderer.on("no-internet", (event, modname) => {
+	console.log('yo')
+	setButtons(true);
+	new Toast({
+		timeout: 10000,
+		scheme: "error",
+		title: lang("gui.toast.noInternet.title"),
+		description: lang("gui.toast.noInternet.desc")
+	})
+})
+
 ipcRenderer.on("installed-mod", (event, mod) => {
 	setButtons(true);
 	Browser.setbutton(mod.name, lang("gui.browser.reinstall"));
diff --git a/src/app/main.js b/src/app/main.js
index 4288d1d..163c63d 100644
--- a/src/app/main.js
+++ b/src/app/main.js
@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { ipcRenderer, shell } = require("electron");
+const { ipcRenderer, shell, ipcMain } = require("electron");
 
 const lang = require("../lang");
 var modsobj = {};
@@ -62,6 +62,11 @@ if (fs.existsSync("viper.json")) {
 	setpath();
 }
 
+
+// Show a toast message if no Internet connection has been detected.
+if (!navigator.onLine) 
+	ipcRenderer.send("no-internet");
+
 function exit() {ipcRenderer.send("exit")}
 function update() {ipcRenderer.send("update")}
 
diff --git a/src/index.js b/src/index.js
index 148e30a..e01a635 100644
--- a/src/index.js
+++ b/src/index.js
@@ -71,6 +71,7 @@ function start() {
 	ipcMain.on("removed-mod", (event, modname) => {send("removed-mod", modname)});
 	ipcMain.on("gui-getmods", (event, ...args) => {send("mods", utils.mods.list())});
 	ipcMain.on("installed-mod", (event, modname) => {send("installed-mod", modname)});
+	ipcMain.on("no-internet", () => {send("no-internet")});
 
 	// install calls
 	ipcMain.on("install-from-path", (event, path) => {utils.mods.install(path)});
diff --git a/src/lang/en.json b/src/lang/en.json
index 9817a70..d48b3b6 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -139,6 +139,9 @@
 	"gui.toast.desc.malformed": "has an incorrect folder structure, if you're the developer, you should fix this.",
 	"gui.toast.desc.failed": "An unknown error occurred while trying to install the mod. This may be the author's fault, and it may also be Viper's fault.",
 
+	"gui.toast.noInternet.title": "No Internet",
+	"gui.toast.noInternet.desc": "Viper may not work properly.",
+
 	"viper.menu.main": "Viper",
 	"viper.menu.release": "Release Notes",
 	"viper.menu.info": "Extras",
diff --git a/src/lang/fr.json b/src/lang/fr.json
index 9d45e1a..cd4e4dc 100644
--- a/src/lang/fr.json
+++ b/src/lang/fr.json
@@ -139,6 +139,9 @@
 	"gui.toast.desc.malformed": "a une structure de dossier incorrecte ; si vous êtes son développeur, vous devriez réparer ça.",
 	"gui.toast.desc.failed": "Une erreur inconnue est survenue lors de l'installation du mod. Cela peut être du ressort de l'auteur du mod ou de Viper.",
 
+	"gui.toast.noInternet.title": "Pas de connexion Internet",
+	"gui.toast.noInternet.desc": "Viper ne fonctionnera pas correctement tant que la connexion n'est pas rétablie.",
+
 	"viper.menu.main": "Viper",
 	"viper.menu.release": "Notes de mises à jour",
 	"viper.menu.info": "Informations",
-- 
cgit v1.2.3


From 77f7e6fe85c243371c676ec4d4f60de8920d938d Mon Sep 17 00:00:00 2001
From: Alystrasz <contact@remyraes.com>
Date: Sat, 6 Aug 2022 23:26:46 +0200
Subject: feat: translate "impossible to fetch release notes" messages

---
 src/extras/requests.js | 5 +++--
 src/lang/en.json       | 5 ++++-
 src/lang/fr.json       | 5 ++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/lang')

diff --git a/src/extras/requests.js b/src/extras/requests.js
index 6066e90..7509e9e 100644
--- a/src/extras/requests.js
+++ b/src/extras/requests.js
@@ -2,6 +2,7 @@ const { app } = require("electron");
 const path = require("path");
 const fs = require("fs");
 const { https } = require("follow-redirects");
+const lang = require("../lang");
 
 
 // all requests results are stored in this file
@@ -120,7 +121,7 @@ async function getNsReleaseNotes() {
                     resolve( cache[NORTHSTAR_RELEASE_NOTES_KEY]["body"] );
                 } else {
                     console.error("Couldn't fetch Northstar release notes, cache is empty.");
-                    resolve( ["Couldn't fetch Northstar release notes.\nTry again later!"] );
+                    resolve( [lang("request.northstar.noReleaseNotes")] );
                 }
             });
         }
@@ -171,7 +172,7 @@ async function getVpReleaseNotes() {
                     resolve( cache[VIPER_RELEASE_NOTES_KEY]["body"] );
                 } else {
                     console.error("Couldn't fetch Viper release notes, cache is empty.");
-                    resolve( ["Couldn't fetch Viper release notes.\nTry again later!"] );
+                    resolve( [lang("request.viper.noReleaseNotes")] );
                 }
             });
         }
diff --git a/src/lang/en.json b/src/lang/en.json
index d48b3b6..51093fa 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -161,5 +161,8 @@
 	"general.missingpath": "Game location could not be found automatically! Please select it manually!",
 	"general.notinstalled": "Northstar is not installed!",
 	"general.launching": "Launching",
-	"general.invalidconfig": "Your config file is improperly formatted, if it's been manually edited, please validate that everything is typed correctly.\n\nIf you did not manually edit the config file, it is recommended to simply reset the config.\n\nTo reset your config file simply click \"Ok\" below.\n\nMore details:\n"
+	"general.invalidconfig": "Your config file is improperly formatted, if it's been manually edited, please validate that everything is typed correctly.\n\nIf you did not manually edit the config file, it is recommended to simply reset the config.\n\nTo reset your config file simply click \"Ok\" below.\n\nMore details:\n",
+
+	"request.viper.noReleaseNotes": "Couldn't fetch Viper release notes.\nTry again later!",
+	"request.northstar.noReleaseNotes": "Couldn't fetch Northstar release notes.\nTry again later!"
 }
diff --git a/src/lang/fr.json b/src/lang/fr.json
index cd4e4dc..4f819b4 100644
--- a/src/lang/fr.json
+++ b/src/lang/fr.json
@@ -161,5 +161,8 @@
 	"general.missingpath": "Le chemin du client n'a pu être trouvé automatiquement, merci de le sélectionner manuellement.",
 	"general.notinstalled": "Northstar n'est pas installé !",
 	"general.launching": "Lancement",
-	"general.invalidconfig": "Votre fichier de configuration n'est pas formaté correctement ; si vous l'avez manuellement édité, veuillez vérifier son contenu.\n\nSinon, il est recommandé de remettre la configuration à zéro.\n\nPour cela, cliquez sur le bouton \"Ok\" en-dessous de ce message.\n\nPlus d'informations :\n"
+	"general.invalidconfig": "Votre fichier de configuration n'est pas formaté correctement ; si vous l'avez manuellement édité, veuillez vérifier son contenu.\n\nSinon, il est recommandé de remettre la configuration à zéro.\n\nPour cela, cliquez sur le bouton \"Ok\" en-dessous de ce message.\n\nPlus d'informations :\n",
+
+	"request.viper.noReleaseNotes": "Impossible de récupérer les notes de mises à jour de Viper.\nVeuillez réessayer plus tard.",
+	"request.northstar.noReleaseNotes": "Impossible de récupérer les notes de mises à jour de Northstar.\nVeuillez réessayer plus tard."
 }
-- 
cgit v1.2.3


From 3a8875a24cf66ff4fd6b39cfb9ce2314191f34f4 Mon Sep 17 00:00:00 2001
From: Alystrasz <contact@remyraes.com>
Date: Sun, 7 Aug 2022 11:22:21 +0200
Subject: feat: add German translation

Co-authored-by: GeckoEidechse <gecko.eidechse+git@pm.me>
---
 src/lang/de.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/lang')

diff --git a/src/lang/de.json b/src/lang/de.json
index 2657d67..f8f2d63 100644
--- a/src/lang/de.json
+++ b/src/lang/de.json
@@ -22,6 +22,7 @@
 	"cli.update.finished": "Installation/Aktualisierung abeschlossen!",
 	"cli.update.uptodate": "Installation ist bereits auf dem neusten Stand (%s), aktualisieren wird übersprungen.",
 	"cli.update.uptodate.short": "Auf dem neusten stand",
+	"cli.update.noInternet": "Keine Internetverbindung",
 
 	"cli.autoupdates.checking": "Überprüfe Northstar auf Updates...",
 	"cli.autoupdates.available": "Ein Update für Northstar wurde gefunden!",
@@ -137,6 +138,9 @@
 	"gui.toast.desc.malformed": "hat eine fehlerhafte Ordnerstruktur, falls du der Entwickler bist, solltest du dies beheben.",
 	"gui.toast.desc.failed": "Ein unbekannter Fehler ist aufgetaucht beim Installieren, die Schuld kann beim Autor liegen oder bei Viper selbst!",
 
+	"gui.toast.noInternet.title": "Kein Internet",
+	"gui.toast.noInternet.desc": "Viper funktioniert möglicherweise nicht korrekt",
+
 	"viper.menu.main": "Viper",
 	"viper.menu.release": "Release Notes",
 	"viper.menu.info": "Extras",
@@ -156,5 +160,8 @@
 	"general.missingpath": "Installationspfad konnte nicht automatisch gefunden werden, bitte setze diesen manuell!",
 	"general.notinstalled": "Northstar ist nicht installiert!",
 	"general.launching": "Starte!",
-	"general.invalidconfig": "Deine Konfigurationsdatei ist nicht richtig formatiert, falls diese manuell verändert wurde bitte stelle sicher das alles korrekt ist.\n\nFalls du diese nicht manuell verändert hast, ist es empfohlen diese zurückzusetzen!\n\nUm sie zurückzusetzen drücke einfach auf \"Ok\".\n\nWeitere Informationen:\n"
+	"general.invalidconfig": "Deine Konfigurationsdatei ist nicht richtig formatiert, falls diese manuell verändert wurde bitte stelle sicher das alles korrekt ist.\n\nFalls du diese nicht manuell verändert hast, ist es empfohlen diese zurückzusetzen!\n\nUm sie zurückzusetzen drücke einfach auf \"Ok\".\n\nWeitere Informationen:\n",
+
+	"request.viper.noReleaseNotes": "Viper Release Notes konnten nicht geladen werden.\nVersuche es erneut später!",
+	"request.northstar.noReleaseNotes": "Northstar Release Notes konnten nicht geladen werden.\nVersuche es erneut später!"
 }
-- 
cgit v1.2.3


From 7d84141d4cf91b02d5219a3e0f34b55e9d9f6247 Mon Sep 17 00:00:00 2001
From: Alystrasz <contact@remyraes.com>
Date: Mon, 8 Aug 2022 22:49:02 +0200
Subject: feat: add Spanish translation

Co-authored-by: Delta <31860825+AA-Delta@users.noreply.github.com>
---
 src/lang/es.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/lang')

diff --git a/src/lang/es.json b/src/lang/es.json
index c341143..2625ffb 100644
--- a/src/lang/es.json
+++ b/src/lang/es.json
@@ -24,6 +24,7 @@
 	"cli.update.finished": "Instalación/Actualización completada!",
 	"cli.update.uptodate": "La ultima versión (%s) ya está instalada, omitiendo actualización.",
 	"cli.update.uptodate.short": "Está actualizado",
+	"cli.update.noInternet": "Sin conexión a internet",
 
 	"cli.autoupdates.checking": "Buscando actualizaciones de Northstar...",
 	"cli.autoupdates.available": "¡Actualización de Northsar disponible!",
@@ -137,6 +138,9 @@
 	"gui.server.players": "jugadores",
 	"gui.server.servers": "servidores",
 	"gui.server.offline": "El servidor Master está desconectado",
+
+	"gui.toast.noInternet.title": "Sin Internet",
+	"gui.toast.noInternet.desc": "Viper puede funcionar de forma incorrecta.",
 	
 	"viper.menu.main": "Viper",
 	"viper.menu.release": "Notas de la versión",
@@ -157,5 +161,8 @@
 	"general.missingpath": "¡La ruta del jueno no se ha podido encontrar automaticamente! ¡Por favor, elige la ruta manualmente!",
 	"general.notinstalled": "¡Northstar no se ha instalado!",
 	"general.launching": "Ejecutando",
-	"general.invalidconfig": "Su archivo de configuración está formateado de forma incorrecta, si ha sido editado manualmente, por favor valide que ha sido escrito correctamente. \n\nSi no ha editado manualmente el archivo de configuración, es recomendado que simplemente restaure la configuración. \n\nPara restaurar tu configuración simplemente de click en \"OK\" a continuación. \n\nMas detalles:\n"
+	"general.invalidconfig": "Su archivo de configuración está formateado de forma incorrecta, si ha sido editado manualmente, por favor valide que ha sido escrito correctamente. \n\nSi no ha editado manualmente el archivo de configuración, es recomendado que simplemente restaure la configuración. \n\nPara restaurar tu configuración simplemente de click en \"OK\" a continuación. \n\nMas detalles:\n",
+
+	"request.viper.noReleaseNotes": "No se pudo encontrar las notas de lanzamiento de Viper.\n¡Intenta mas tarde!",
+	"request.northstar.noReleaseNotes": "No se pudo encontrar las notas de lanzamiento de Northstar.\n¡Intenta mas tarde!"
 }
-- 
cgit v1.2.3