diff --git a/app/app.ejs b/app/app.ejs index e829fa14..a530b7f5 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -1,7 +1,7 @@ - Helios Launcher + MineCharity Launcher @@ -40,8 +40,8 @@
- - + +
diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 8b239311..b9a1102e 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -119,8 +119,10 @@ body, button { -webkit-app-region: no-drag !important; position: relative; top: -2px; - right: -2px; + right: -900px; height: 22px; + display: flex; + justify-content: flex-end; } #frameButtonDockWin > .frameButton:not(:first-child) { margin-left: -4px; diff --git a/app/assets/images/IconLogo.ico b/app/assets/images/IconLogo.ico new file mode 100644 index 00000000..74b2d454 Binary files /dev/null and b/app/assets/images/IconLogo.ico differ diff --git a/app/assets/images/LoadingSeal.png b/app/assets/images/LoadingSeal.png deleted file mode 100644 index afe2c4d4..00000000 Binary files a/app/assets/images/LoadingSeal.png and /dev/null differ diff --git a/app/assets/images/LoadingText.png b/app/assets/images/LoadingText.png deleted file mode 100644 index 5e55b332..00000000 Binary files a/app/assets/images/LoadingText.png and /dev/null differ diff --git a/app/assets/images/MineCharityLogo.png b/app/assets/images/MineCharityLogo.png new file mode 100644 index 00000000..abc1b418 Binary files /dev/null and b/app/assets/images/MineCharityLogo.png differ diff --git a/app/assets/images/SealCircle.ico b/app/assets/images/SealCircle.ico deleted file mode 100644 index e37b95df..00000000 Binary files a/app/assets/images/SealCircle.ico and /dev/null differ diff --git a/app/assets/images/SealCircle.png b/app/assets/images/SealCircle.png deleted file mode 100644 index 9e21d08b..00000000 Binary files a/app/assets/images/SealCircle.png and /dev/null differ diff --git a/app/assets/images/backgrounds/0.jpg b/app/assets/images/backgrounds/0.jpg index 66a2c12a..1182a5b3 100644 Binary files a/app/assets/images/backgrounds/0.jpg and b/app/assets/images/backgrounds/0.jpg differ diff --git a/app/assets/images/backgrounds/1.jpg b/app/assets/images/backgrounds/1.jpg index e343cbe2..1182a5b3 100644 Binary files a/app/assets/images/backgrounds/1.jpg and b/app/assets/images/backgrounds/1.jpg differ diff --git a/app/assets/images/backgrounds/2.jpg b/app/assets/images/backgrounds/2.jpg index 7a13e771..1182a5b3 100644 Binary files a/app/assets/images/backgrounds/2.jpg and b/app/assets/images/backgrounds/2.jpg differ diff --git a/app/assets/images/backgrounds/3.jpg b/app/assets/images/backgrounds/3.jpg index 5c7be569..1182a5b3 100644 Binary files a/app/assets/images/backgrounds/3.jpg and b/app/assets/images/backgrounds/3.jpg differ diff --git a/app/assets/images/backgrounds/4.jpg b/app/assets/images/backgrounds/4.jpg index 1db7800e..1182a5b3 100644 Binary files a/app/assets/images/backgrounds/4.jpg and b/app/assets/images/backgrounds/4.jpg differ diff --git a/app/assets/images/backgrounds/5.jpg b/app/assets/images/backgrounds/5.jpg index beb4b148..1182a5b3 100644 Binary files a/app/assets/images/backgrounds/5.jpg and b/app/assets/images/backgrounds/5.jpg differ diff --git a/app/assets/images/backgrounds/6.jpg b/app/assets/images/backgrounds/6.jpg index acdaa73a..1182a5b3 100644 Binary files a/app/assets/images/backgrounds/6.jpg and b/app/assets/images/backgrounds/6.jpg differ diff --git a/app/assets/images/backgrounds/7.jpg b/app/assets/images/backgrounds/7.jpg index cc48f72f..1182a5b3 100644 Binary files a/app/assets/images/backgrounds/7.jpg and b/app/assets/images/backgrounds/7.jpg differ diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 38f864fe..2fbbe49d 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -7,7 +7,7 @@ const logger = LoggerUtil.getLogger('ConfigManager') const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME) -const dataPath = path.join(sysRoot, '.helioslauncher') +const dataPath = path.join(sysRoot, '.minecharity-launcher') const launcherDir = require('@electron/remote').app.getPath('userData') diff --git a/app/assets/js/preloader.js b/app/assets/js/preloader.js index ae01bb83..4779402a 100644 --- a/app/assets/js/preloader.js +++ b/app/assets/js/preloader.js @@ -23,7 +23,7 @@ DistroAPI['commonDir'] = ConfigManager.getCommonDirectory() DistroAPI['instanceDir'] = ConfigManager.getInstanceDirectory() // Load Strings -LangLoader.loadLanguage('en_US') +LangLoader.loadLanguage('fr_FR') /** * diff --git a/app/assets/lang/fr_FR.json b/app/assets/lang/fr_FR.json new file mode 100644 index 00000000..76c6f6ad --- /dev/null +++ b/app/assets/lang/fr_FR.json @@ -0,0 +1,49 @@ +{ + "html": { + "avatarOverlay": "Éditer" + }, + "js": { + "login": { + "error": { + "invalidValue": "* Valeur invalide", + "requiredValue": "* Requis", + "userMigrated": { + "title": "Erreur pendant la connexion :
Identifiants invalides", + "desc": "Vous avez tenté de vous connecter avec un compte migré. Essayez à nouveau en utilisant l'email du compte comme nom d'utilisateur." + }, + "invalidCredentials": { + "title": "Erreur pendant la connexion :
Identifiants invalides", + "desc": "L'email ou le mot de passe que vous avez saisi est incorrect. Veuillez réessayer." + }, + "rateLimit": { + "title": "Erreur pendant la connexion :
Trop de tentatives", + "desc": "Il y a eu trop de tentatives de connexion avec ce compte récemment. Veuillez réessayer plus tard." + }, + "noInternet": { + "title": "Erreur pendant la connexion :
Pas de connexion Internet", + "desc": "Vous devez être connecté à Internet pour vous connecter. Veuillez vous connecter et réessayer." + }, + "authDown": { + "title": "Erreur pendant la connexion :
Serveur d'authentification hors ligne", + "desc": "Le serveur d'authentification de Mojang est actuellement hors ligne ou injoignable. Veuillez attendre un moment et réessayer. Vous pouvez vérifier l'état du serveur sur le portail d'aide de Mojang." + }, + "notPaid": { + "title": "Erreur pendant la connexion :
Jeu non acheté", + "desc": "Le compte avec lequel vous essayez de vous connecter n'a pas acheté une copie de Minecraft.
Vous pouvez acheter une copie sur Minecraft.net" + }, + "unknown": { + "title": "Erreur pendant la connexion :
Erreur inconnue" + } + }, + "login": "CONNEXION", + "loggingIn": "CONNEXION EN COURS", + "success": "SUCCÈS", + "tryAgain": "Essayer à nouveau" + }, + "landing": { + "launch": { + "pleaseWait": "Veuillez patienter.." + } + } + } +} diff --git a/app/frame.ejs b/app/frame.ejs index c2aaf337..d6c6563a 100644 --- a/app/frame.ejs +++ b/app/frame.ejs @@ -4,24 +4,17 @@
<%if (process.platform === 'darwin') { %>
-
+
-
<% } else{ %>
-
- Helios Launcher -
-
+
- diff --git a/app/landing.ejs b/app/landing.ejs index 7e747818..071b5c4b 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -2,7 +2,7 @@
- +
Update Available
diff --git a/app/login.ejs b/app/login.ejs index 7ecc4a6c..e7eda1ff 100644 --- a/app/login.ejs +++ b/app/login.ejs @@ -7,7 +7,7 @@
- + MINECRAFT LOGIN
diff --git a/app/loginOptions.ejs b/app/loginOptions.ejs index 36af37e0..d616d258 100644 --- a/app/loginOptions.ejs +++ b/app/loginOptions.ejs @@ -1,34 +1,29 @@