Compare commits
No commits in common. "c1d8dbed471019589c07e381128efd7a01076d3f" and "34bdf62bbd78679758fd5a5c5a543b1f96e12888" have entirely different histories.
c1d8dbed47
...
34bdf62bbd
@ -6,8 +6,8 @@ const ConfigManager = require('./configmanager')
|
||||
// exports.REMOTE_DISTRO_URL = 'http://mc.westeroscraft.com/WesterosCraftLauncher/distribution.json'
|
||||
// exports.REMOTE_DISTRO_URL = 'https://skirda-minecraft-distribution.brzezinski.ru/distribution.json'
|
||||
// exports.REMOTE_DISTRO_URL = 'https://helios-files.geekcorner.eu.org/distribution.json'
|
||||
exports.REMOTE_DISTRO_URL = 'http://192.168.88.10:8081/distribution/manifest'
|
||||
// exports.REMOTE_DISTRO_URL = 'http://skirda-nebula.brzezinski.ru/distribution/manifest'
|
||||
// exports.REMOTE_DISTRO_URL = 'http://192.168.88.10:8080/distribution/manifest'
|
||||
exports.REMOTE_DISTRO_URL = 'http://skirda-nebula.brzezinski.ru/distribution/manifest'
|
||||
// exports.REMOTE_DISTRO_URL = 'http://gregbrzezinski:8080/distribution/manifest'
|
||||
// exports.REMOTE_DISTRO_URL = 'http://localhost:8080/distribution/files/files/distribution.json'
|
||||
|
||||
|
@ -350,10 +350,6 @@ class ProcessBuilder {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Construct the argument array that will be passed to the JVM process.
|
||||
* This function is for 1.12 and below.
|
||||
@ -363,7 +359,9 @@ class ProcessBuilder {
|
||||
* @returns {Array.<string>} An array containing the full JVM arguments for this process.
|
||||
*/
|
||||
_constructJVMArguments112(mods, tempNativePath){
|
||||
|
||||
let args = []
|
||||
|
||||
// Classpath Argument
|
||||
args.push('-cp')
|
||||
args.push(this.classpathArg(mods, tempNativePath).join(ProcessBuilder.getClasspathSeparator()))
|
||||
@ -406,10 +404,6 @@ class ProcessBuilder {
|
||||
|
||||
// Debug securejarhandler
|
||||
// args.push('-Dbsl.debug=true')
|
||||
args.push('-Dminecraft.api.auth.host=http://localhost:8083/yggdrasil/auth')
|
||||
args.push('-Dminecraft.api.account.host=http://localhost:8083/yggdrasil/account')
|
||||
args.push('-Dminecraft.api.session.host=http://localhost:8083/yggdrasil')
|
||||
args.push('-Dminecraft.api.services.host=http://localhost:8083/yggdrasil/services')
|
||||
|
||||
if(this.modManifest.arguments.jvm != null) {
|
||||
for(const argStr of this.modManifest.arguments.jvm) {
|
||||
|
@ -127,10 +127,9 @@ loginSkirdaDiscordButton.addEventListener('click', async () =>{
|
||||
|
||||
AuthManager.addSkirdaAccount(yggAuthRes.profile.id, yggAuthRes.accessToken, skirdaAuth.skirdaUserId, yggAuthRes.profile.name, skirdaAuth.token)
|
||||
|
||||
// AuthManager.addSkirdaAccount(account.uuid, account.token, account.username, account.displayName)
|
||||
AuthManager.addSkirdaAccount(account.uuid, account.token, account.username, account.displayName)
|
||||
|
||||
setTimeout(() => {
|
||||
switchView(VIEWS.loginSkirdaDiscord, VIEWS.landing, 500, 500)
|
||||
}, 1000)
|
||||
})
|
||||
|
||||
|
8
package-lock.json
generated
8
package-lock.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "skirdalauncher",
|
||||
"version": "2.1.1-skirda",
|
||||
"name": "helioslauncher",
|
||||
"version": "2.1.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "skirdalauncher",
|
||||
"version": "2.1.1-skirda",
|
||||
"name": "helioslauncher",
|
||||
"version": "2.1.1",
|
||||
"license": "UNLICENSED",
|
||||
"dependencies": {
|
||||
"@electron/remote": "^2.1.0",
|
||||
|
Loading…
Reference in New Issue
Block a user