From 95bb20d3be6c74bbe143c26dd5d02bd472d6db55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1l=20P=C3=A9ter?= Date: Sun, 10 Mar 2019 11:01:45 +0100 Subject: [PATCH] =?UTF-8?q?Magyar=C3=ADt=C3=A1sok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.ejs | 2 +- app/assets/css/launcher.css | 11 ++++- app/assets/js/authmanager.js | 2 +- app/assets/js/processbuilder.js | 39 +++++++-------- app/assets/js/scripts/landing.js | 2 +- app/assets/js/scripts/settings.js | 34 ++++++------- app/login.ejs | 2 +- app/overlay.ejs | 12 ++--- app/settings.ejs | 80 +++++++++++++++---------------- 9 files changed, 96 insertions(+), 88 deletions(-) diff --git a/app/app.ejs b/app/app.ejs index df6c0fde8b..7aa1d72b4d 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -38,7 +38,7 @@
- +
diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index b9217347df..c4bd011e70 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -349,12 +349,14 @@ body, button { #welcomeButton:hover #welcomeSVG, #welcomeButton:focus #welcomeSVG { -webkit-filter: drop-shadow(0px 0px 2px #fff); + filter: drop-shadow(0px 0px 2px #fff); } #welcomeButton:active #welcomeSVG .arrowLine { stroke: #c7c7c7; } #welcomeButton:active #welcomeSVG { -webkit-filter: drop-shadow(0px 0px 2px #c7c7c7); + filter: drop-shadow(0px 0px 2px #c7c7c7); } #welcomeButton:disabled #welcomeSVG .arrowLine { stroke: rgba(255, 255, 255, 0.75); @@ -652,12 +654,14 @@ body, button { #loginButton:hover #loginSVG, #loginButton:focus #loginSVG { -webkit-filter: drop-shadow(0px 0px 2px #fff); + filter: drop-shadow(0px 0px 2px #fff); } #loginButton:active #loginSVG .arrowLine { stroke: #c7c7c7; } #loginButton:active #loginSVG { -webkit-filter: drop-shadow(0px 0px 2px #c7c7c7); + filter: drop-shadow(0px 0px 2px #c7c7c7); } #loginButton:disabled #loginSVG .arrowLine { stroke: rgba(255, 255, 255, 0.75); @@ -2315,7 +2319,6 @@ input:checked + .toggleSwitchSlider:before { width: 33%; display: inline-flex; justify-content: center; - le } #landingContainer > #lower > #left #content { position: relative; @@ -2600,6 +2603,7 @@ input:checked + .toggleSwitchSlider:before { #newsNavigateRight:hover #newsNavigationRightSVG, #newsNavigateRight:focus #newsNavigationRightSVG { -webkit-filter: drop-shadow(0px 0px 2px #fff); + filter: drop-shadow(0px 0px 2px #fff); } #newsNavigateLeft:active #newsNavigationLeftSVG .arrowLine, #newsNavigateRight:active #newsNavigationRightSVG .arrowLine { @@ -2608,6 +2612,7 @@ input:checked + .toggleSwitchSlider:before { #newsNavigateLeft:active #newsNavigationLeftSVG, #newsNavigateRight:active #newsNavigationRightSVG { -webkit-filter: drop-shadow(0px 0px 2px #c7c7c7); + filter: drop-shadow(0px 0px 2px #c7c7c7); } #newsNavigateLeft:disabled #newsNavigationLeftSVG .arrowLine, #newsNavigateRight:disabled #newsNavigationRightSVG .arrowLine { @@ -3167,12 +3172,14 @@ input:checked + .toggleSwitchSlider:before { #newsButton:hover #newsButtonSVG, #newsButton:focus #newsButtonSVG { -webkit-filter: drop-shadow(0px 0px 2px #fff); + filter: drop-shadow(0px 0px 2px #fff); } #newsButton:active #newsButtonSVG .arrowLine { stroke: #c7c7c7; } #newsButton:active #newsButtonSVG { -webkit-filter: drop-shadow(0px 0px 2px #c7c7c7); + filter: drop-shadow(0px 0px 2px #c7c7c7); } #newsButton:disabled #newsButtonSVG .arrowLine { stroke: rgba(255, 255, 255, 0.75); @@ -3573,7 +3580,7 @@ input:checked + .toggleSwitchSlider:before { /* Server listing image. */ .serverListingImg { margin: 0px 10px 0px 5px; - border: 1px solid #fff; + /*border: 1px solid #fff;*/ height: 50px; width: 50px; } diff --git a/app/assets/js/authmanager.js b/app/assets/js/authmanager.js index 4c052ed0a2..84252f1bc0 100644 --- a/app/assets/js/authmanager.js +++ b/app/assets/js/authmanager.js @@ -29,7 +29,7 @@ const loggerSuccess = LoggerUtil('%c[AuthManager]', 'color: #209b07; font-weight exports.addAccount = async function(username, password){ try { //const session = await Mojang.authenticate(username, "", ConfigManager.getClientToken()) - const ret = ConfigManager.addAuthAccount("", username, username, username) + const ret = ConfigManager.addAuthAccount(username, username, username, username) ConfigManager.save() return ret } catch (err){ diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 985024d6f9..d7e1052764 100644 --- a/app/assets/js/processbuilder.js +++ b/app/assets/js/processbuilder.js @@ -15,7 +15,7 @@ const logger = LoggerUtil('%c[ProcessBuilder]', 'color: #003996; font-weight: bo class ProcessBuilder { - constructor(distroServer, versionData, authUser){ + constructor(distroServer, versionData, authUser, launcherVersion){ this.gameDir = path.join(ConfigManager.getInstanceDirectory(), distroServer.getID()) this.commonDir = ConfigManager.getCommonDirectory() this.server = distroServer @@ -190,7 +190,7 @@ class ProcessBuilder { */ _requiresAbsolute(){ try { - const ver = this.forgeData.id.split('-')[2] + const ver = this.versionData.id.split('-')[2] const pts = ver.split('.') const min = [14, 23, 3, 2655] for(let i=0; i} mods An array of enabled mods which will be launched with this process. + * @param {string} tempNativePath The path to store the native libraries. + * @returns {Array.} An array containing the full JVM arguments for this process. + */ _constructJVMArguments112(mods, tempNativePath){ - let args = ['-Xmx' + ConfigManager.getMaxRAM(), - '-Xms' + ConfigManager.getMinRAM(), - '-Djava.library.path=' + tempNativePath, - '-cp', - this.classpathArg(mods, tempNativePath).join(process.platform === 'win32' ? ';' : ':'), - this.versionData.mainClass] + + let args = [] // Classpath Argument args.push('-cp') @@ -294,8 +298,8 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.unshift('-Xdock:name=NewHope') - args.unshift('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) + args.push('-Xdock:name=NewHope') + args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM()) args.push('-Xms' + ConfigManager.getMinRAM()) @@ -303,10 +307,10 @@ class ProcessBuilder { args.push('-Djava.library.path=' + tempNativePath) // Main Java Class - args.push(this.forgeData.mainClass) + args.push(this.versionData.mainClass) // Forge Arguments - args = args.concat(this._resolveForgeArgs()) + //args = args.concat(this._resolveForgeArgs()) return args } @@ -340,7 +344,7 @@ class ProcessBuilder { args = args.concat(ConfigManager.getJVMOptions()) // Main Java Class - args.push(this.forgeData.mainClass) + args.push(this.versionData.mainClass) // Vanilla Arguments args = args.concat(this.versionData.arguments.game) @@ -451,7 +455,7 @@ class ProcessBuilder { } // Forge Specific Arguments - args = args.concat(this.forgeData.arguments.game) + args = args.concat(this.versionData.arguments.game) // Filter null values args = args.filter(arg => { @@ -597,8 +601,7 @@ class ProcessBuilder { fs.ensureDirSync(tempNativePath) for(let i=0; i
-
Username
+
Felhasználónév
${acc.displayName}
- +
- +
@@ -862,7 +862,7 @@ function loadSelectedServerOnModsTab(){ - Main Server + Legfrisseb stabil verzió ` : ''} @@ -1117,12 +1117,12 @@ function populateJavaExecDetails(execPath){ jg._validateJavaBinary(execPath).then(v => { if(v.valid){ if(v.version.major < 9) { - settingsJavaExecDetails.innerHTML = `Selected: Java ${v.version.major} Update ${v.version.update} (x${v.arch})` + settingsJavaExecDetails.innerHTML = `Kiválasztva: Java ${v.version.major} Update ${v.version.update} (x${v.arch})` } else { - settingsJavaExecDetails.innerHTML = `Selected: Java ${v.version.major}.${v.version.minor}.${v.version.revision} (x${v.arch})` + settingsJavaExecDetails.innerHTML = `Kiválasztva: Java ${v.version.major}.${v.version.minor}.${v.version.revision} (x${v.arch})` } } else { - settingsJavaExecDetails.innerHTML = 'Invalid Selection' + settingsJavaExecDetails.innerHTML = 'Érvénytelen kiválasztás' } }) } @@ -1173,11 +1173,11 @@ function isPrerelease(version){ function populateVersionInformation(version, valueElement, titleElement, checkElement){ valueElement.innerHTML = version if(isPrerelease(version)){ - titleElement.innerHTML = 'Pre-release' + titleElement.innerHTML = 'Béta verzió' titleElement.style.color = '#ff886d' checkElement.style.background = '#ff886d' } else { - titleElement.innerHTML = 'Stable Release' + titleElement.innerHTML = 'Stabil kiadás' titleElement.style.color = null checkElement.style.background = null } @@ -1216,7 +1216,7 @@ function populateReleaseNotes(){ }, timeout: 2500 }).catch(err => { - settingsAboutChangelogText.innerHTML = 'Failed to load release notes.' + settingsAboutChangelogText.innerHTML = 'Nem sikerült betölteni a frissítési jegyzéket.' }) } @@ -1264,27 +1264,27 @@ function settingsUpdateButtonStatus(text, disabled = false, handler = null){ */ function populateSettingsUpdateInformation(data){ if(data != null){ - settingsUpdateTitle.innerHTML = `New ${isPrerelease(data.version) ? 'Pre-release' : 'Release'} Available` + settingsUpdateTitle.innerHTML = `Új ${isPrerelease(data.version) ? 'béta verzió' : 'kiadás'} érhető el` settingsUpdateChangelogCont.style.display = null settingsUpdateChangelogTitle.innerHTML = data.releaseName settingsUpdateChangelogText.innerHTML = data.releaseNotes populateVersionInformation(data.version, settingsUpdateVersionValue, settingsUpdateVersionTitle, settingsUpdateVersionCheck) if(process.platform === 'darwin'){ - settingsUpdateButtonStatus('Download from GitHubClose the launcher and run the dmg to update.', false, () => { + settingsUpdateButtonStatus('Letöltés GitHub-ról. Zárd be a launchert és futtasd a dmg fájlt, hogy frissíts!', false, () => { shell.openExternal(data.darwindownload) }) } else { - settingsUpdateButtonStatus('Downloading..', true) + settingsUpdateButtonStatus('Letöltés...', true) } } else { - settingsUpdateTitle.innerHTML = 'You Are Running the Latest Version' + settingsUpdateTitle.innerHTML = 'A legfrissebb verziót használod!' settingsUpdateChangelogCont.style.display = 'none' populateVersionInformation(remote.app.getVersion(), settingsUpdateVersionValue, settingsUpdateVersionTitle, settingsUpdateVersionCheck) - settingsUpdateButtonStatus('Check for Updates', false, () => { + settingsUpdateButtonStatus('Frissítések keresése', false, () => { if(!isDev){ ipcRenderer.send('autoUpdateAction', 'checkForUpdate') - settingsUpdateButtonStatus('Checking for Updates..', true) + settingsUpdateButtonStatus('Frissítések keresése...', true) } }) } diff --git a/app/login.ejs b/app/login.ejs index 1c058cc40a..30103a4441 100644 --- a/app/login.ejs +++ b/app/login.ejs @@ -2,7 +2,7 @@
diff --git a/app/overlay.ejs b/app/overlay.ejs index 0c18aef46f..aee88c91fe 100644 --- a/app/overlay.ejs +++ b/app/overlay.ejs @@ -1,29 +1,29 @@