Compare commits
No commits in common. "54f10a0c7471d1150fd7248380035f28a9cf748d" and "291a571b228871bb971e4385944d028f8cc36c6d" have entirely different histories.
54f10a0c74
...
291a571b22
@ -103,7 +103,23 @@ loginSkirdaDiscordButton.addEventListener('click', async () =>{
|
|||||||
AuthManager.addSkirdaAccount(account.uuid, account.token, account.username, account.displayName)
|
AuthManager.addSkirdaAccount(account.uuid, account.token, account.username, account.displayName)
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
switchView(VIEWS.loginSkirdaDiscord, VIEWS.landing, 500, 500)
|
switchView(VIEWS.landing, VIEWS.landing, 500, 500, async () => {
|
||||||
|
console.log('kek')
|
||||||
|
// // Temporary workaround
|
||||||
|
// if(loginViewOnSuccess === VIEWS.settings){
|
||||||
|
// await prepareSettings()
|
||||||
|
// }
|
||||||
|
// // loginViewOnSuccess = VIEWS.landing // Reset this for good measure.
|
||||||
|
// // loginCancelEnabled(false) // Reset this for good measure.
|
||||||
|
// // loginViewCancelHandler = null // Reset this for good measure.
|
||||||
|
// // loginUsername.value = ''
|
||||||
|
// // loginPassword.value = ''
|
||||||
|
// $('.circle-loader').toggleClass('load-complete')
|
||||||
|
// $('.checkmark').toggle()
|
||||||
|
// loginLoading(false)
|
||||||
|
// loginButton.innerHTML = loginButton.innerHTML.replace(Lang.queryJS('login.success'), Lang.queryJS('login.login'))
|
||||||
|
// formDisabled(false)
|
||||||
|
})
|
||||||
}, 1000)
|
}, 1000)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -1501,7 +1501,7 @@ function populateAboutVersionInformation(){
|
|||||||
*/
|
*/
|
||||||
function populateReleaseNotes(){
|
function populateReleaseNotes(){
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'https://git.brzezinski.ru/Skirda/SkirdaElectronLauncher/releases.atom',
|
url: 'https://github.com/dscalzi/HeliosLauncher/releases.atom',
|
||||||
success: (data) => {
|
success: (data) => {
|
||||||
const version = 'v' + remote.app.getVersion()
|
const version = 'v' + remote.app.getVersion()
|
||||||
const entries = $(data).find('entry')
|
const entries = $(data).find('entry')
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Custom Language File for Launcher Customizer
|
# Custom Language File for Launcher Customizer
|
||||||
|
|
||||||
[ejs.app]
|
[ejs.app]
|
||||||
title = "Skirda Launcher"
|
title = "Helios Launcher"
|
||||||
|
|
||||||
[ejs.landing]
|
[ejs.landing]
|
||||||
mediaGitHubURL = "https://github.com/dscalzi/HeliosLauncher"
|
mediaGitHubURL = "https://github.com/dscalzi/HeliosLauncher"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
appId: 'skirdalauncher'
|
appId: 'helioslauncher'
|
||||||
productName: 'Skirda Launcher'
|
productName: 'Helios Launcher'
|
||||||
artifactName: '${productName}-setup-${version}.${ext}'
|
artifactName: '${productName}-setup-${version}.${ext}'
|
||||||
|
|
||||||
copyright: 'Copyright © 2018-2022 Daniel Scalzi'
|
copyright: 'Copyright © 2018-2022 Daniel Scalzi'
|
||||||
@ -39,9 +39,9 @@ mac:
|
|||||||
# Linux Configuration
|
# Linux Configuration
|
||||||
linux:
|
linux:
|
||||||
target: 'AppImage'
|
target: 'AppImage'
|
||||||
maintainer: 'Greg Brzezinski'
|
maintainer: 'Daniel Scalzi'
|
||||||
vendor: 'Greg Brzezinski'
|
vendor: 'Daniel Scalzi'
|
||||||
synopsis: 'Minecraft Launcher for Skirda Servers'
|
synopsis: 'Modded Minecraft Launcher'
|
||||||
description: 'Custom launcher which allows users to join modded servers. All mods, configurations, and updates are handled automatically.'
|
description: 'Custom launcher which allows users to join modded servers. All mods, configurations, and updates are handled automatically.'
|
||||||
category: 'Game'
|
category: 'Game'
|
||||||
|
|
||||||
|
36
package-lock.json
generated
36
package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "helioslauncher",
|
"name": "helioslauncher",
|
||||||
"version": "2.1.1",
|
"version": "2.1.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "helioslauncher",
|
"name": "helioslauncher",
|
||||||
"version": "2.1.1",
|
"version": "2.1.0",
|
||||||
"license": "UNLICENSED",
|
"license": "UNLICENSED",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@electron/remote": "^2.1.0",
|
"@electron/remote": "^2.1.0",
|
||||||
@ -18,7 +18,7 @@
|
|||||||
"fs-extra": "^11.1.1",
|
"fs-extra": "^11.1.1",
|
||||||
"github-syntax-dark": "^0.5.0",
|
"github-syntax-dark": "^0.5.0",
|
||||||
"got": "^11.8.5",
|
"got": "^11.8.5",
|
||||||
"helios-core": "~2.1.1",
|
"helios-core": "~2.1.0",
|
||||||
"helios-distribution-types": "^1.3.0",
|
"helios-distribution-types": "^1.3.0",
|
||||||
"jquery": "^3.7.1",
|
"jquery": "^3.7.1",
|
||||||
"lodash.merge": "^4.6.2",
|
"lodash.merge": "^4.6.2",
|
||||||
@ -29,7 +29,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^27.1.3",
|
"electron": "^27.1.3",
|
||||||
"electron-builder": "^24.9.1",
|
"electron-builder": "^24.9.1",
|
||||||
"eslint": "^8.56.0"
|
"eslint": "^8.55.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "18.x.x"
|
"node": "18.x.x"
|
||||||
@ -384,9 +384,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/js": {
|
"node_modules/@eslint/js": {
|
||||||
"version": "8.56.0",
|
"version": "8.55.0",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
|
||||||
"integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
|
"integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
|
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
|
||||||
@ -1731,15 +1731,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint": {
|
"node_modules/eslint": {
|
||||||
"version": "8.56.0",
|
"version": "8.55.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
|
||||||
"integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
|
"integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint-community/eslint-utils": "^4.2.0",
|
"@eslint-community/eslint-utils": "^4.2.0",
|
||||||
"@eslint-community/regexpp": "^4.6.1",
|
"@eslint-community/regexpp": "^4.6.1",
|
||||||
"@eslint/eslintrc": "^2.1.4",
|
"@eslint/eslintrc": "^2.1.4",
|
||||||
"@eslint/js": "8.56.0",
|
"@eslint/js": "8.55.0",
|
||||||
"@humanwhocodes/config-array": "^0.11.13",
|
"@humanwhocodes/config-array": "^0.11.13",
|
||||||
"@humanwhocodes/module-importer": "^1.0.1",
|
"@humanwhocodes/module-importer": "^1.0.1",
|
||||||
"@nodelib/fs.walk": "^1.2.8",
|
"@nodelib/fs.walk": "^1.2.8",
|
||||||
@ -1947,9 +1947,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/fastq": {
|
"node_modules/fastq": {
|
||||||
"version": "1.16.0",
|
"version": "1.15.0",
|
||||||
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
|
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
|
||||||
"integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
|
"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"reusify": "^1.0.4"
|
"reusify": "^1.0.4"
|
||||||
}
|
}
|
||||||
@ -2342,11 +2342,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/helios-core": {
|
"node_modules/helios-core": {
|
||||||
"version": "2.1.1",
|
"version": "2.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.1.0.tgz",
|
||||||
"integrity": "sha512-un9QtEofI3jR8I1aoXodJhwoQyjUvJ34/Rc8PFsvNgMyWv25F4/i4AWgRX/pZKHpy8rtyS2SwgoBSKHV1WA1DA==",
|
"integrity": "sha512-3RvGMJ0RDzgdZF3e0o2VtBz/NCeucDVIopz9p3GA9tjy2cl7ll8HVHSXiLG5YE1JiINU5Akacv5L6MT1g6xZuA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fastq": "^1.16.0",
|
"fastq": "^1.15.0",
|
||||||
"fs-extra": "^11.2.0",
|
"fs-extra": "^11.2.0",
|
||||||
"got": "^11.8.6",
|
"got": "^11.8.6",
|
||||||
"luxon": "^3.4.4",
|
"luxon": "^3.4.4",
|
||||||
|
12
package.json
12
package.json
@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"name": "skirdalauncher",
|
"name": "helioslauncher",
|
||||||
"version": "2.1.1-skirda",
|
"version": "2.1.0",
|
||||||
"productName": "Skirda Launcher",
|
"productName": "Helios Launcher",
|
||||||
"description": "Launcher for Skirda Minecraft servers",
|
"description": "Modded Minecraft Launcher",
|
||||||
"author": "Daniel Scalzi (https://github.com/dscalzi/)",
|
"author": "Daniel Scalzi (https://github.com/dscalzi/)",
|
||||||
"license": "UNLICENSED",
|
"license": "UNLICENSED",
|
||||||
"homepage": "https://github.com/dscalzi/HeliosLauncher",
|
"homepage": "https://github.com/dscalzi/HeliosLauncher",
|
||||||
@ -32,7 +32,7 @@
|
|||||||
"fs-extra": "^11.1.1",
|
"fs-extra": "^11.1.1",
|
||||||
"github-syntax-dark": "^0.5.0",
|
"github-syntax-dark": "^0.5.0",
|
||||||
"got": "^11.8.5",
|
"got": "^11.8.5",
|
||||||
"helios-core": "~2.1.1",
|
"helios-core": "~2.1.0",
|
||||||
"helios-distribution-types": "^1.3.0",
|
"helios-distribution-types": "^1.3.0",
|
||||||
"jquery": "^3.7.1",
|
"jquery": "^3.7.1",
|
||||||
"lodash.merge": "^4.6.2",
|
"lodash.merge": "^4.6.2",
|
||||||
@ -43,7 +43,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^27.1.3",
|
"electron": "^27.1.3",
|
||||||
"electron-builder": "^24.9.1",
|
"electron-builder": "^24.9.1",
|
||||||
"eslint": "^8.56.0"
|
"eslint": "^8.55.0"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
Loading…
Reference in New Issue
Block a user