diff --git a/app/assets/images/Icon.ico b/app/assets/images/Icon.ico index 5660b655..cea6c9e3 100644 Binary files a/app/assets/images/Icon.ico and b/app/assets/images/Icon.ico differ diff --git a/app/assets/images/Icon.png b/app/assets/images/Icon.png index 5ab97839..07f1ad68 100644 Binary files a/app/assets/images/Icon.png and b/app/assets/images/Icon.png differ diff --git a/app/assets/images/backgrounds/0.png b/app/assets/images/backgrounds/0.png index 1e6c9927..94364eb8 100644 Binary files a/app/assets/images/backgrounds/0.png and b/app/assets/images/backgrounds/0.png differ diff --git a/app/assets/images/backgrounds/1.png b/app/assets/images/backgrounds/1.png deleted file mode 100644 index 738df506..00000000 Binary files a/app/assets/images/backgrounds/1.png and /dev/null differ diff --git a/app/assets/images/backgrounds/2.png b/app/assets/images/backgrounds/2.png deleted file mode 100644 index 93a98f61..00000000 Binary files a/app/assets/images/backgrounds/2.png and /dev/null differ diff --git a/app/assets/images/backgrounds/3.png b/app/assets/images/backgrounds/3.png deleted file mode 100644 index d1992698..00000000 Binary files a/app/assets/images/backgrounds/3.png and /dev/null differ diff --git a/app/assets/images/backgrounds/4.png b/app/assets/images/backgrounds/4.png deleted file mode 100644 index f7ca7c86..00000000 Binary files a/app/assets/images/backgrounds/4.png and /dev/null differ diff --git a/app/assets/images/backgrounds/5.png b/app/assets/images/backgrounds/5.png deleted file mode 100644 index 3c80a290..00000000 Binary files a/app/assets/images/backgrounds/5.png and /dev/null differ diff --git a/app/assets/images/backgrounds/6.png b/app/assets/images/backgrounds/6.png deleted file mode 100644 index 04292974..00000000 Binary files a/app/assets/images/backgrounds/6.png and /dev/null differ diff --git a/app/assets/images/backgrounds/7.png b/app/assets/images/backgrounds/7.png deleted file mode 100644 index 5608a77f..00000000 Binary files a/app/assets/images/backgrounds/7.png and /dev/null differ diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index ea66fb3b..2acfba14 100644 --- a/app/assets/js/distromanager.js +++ b/app/assets/js/distromanager.js @@ -4,7 +4,7 @@ const ConfigManager = require('./configmanager') // Old WesterosCraft url. // exports.REMOTE_DISTRO_URL = 'http://mc.westeroscraft.com/WesterosCraftLauncher/distribution.json' -exports.REMOTE_DISTRO_URL = 'https://cdn.mysticred.space/launcher/distribution.json' +exports.REMOTE_DISTRO_URL = 'http://59.26.10.62:8080/distribution.json' const api = new DistributionAPI( ConfigManager.getLauncherDirectory(), diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 387a1216..116a9f19 100644 --- a/app/assets/js/processbuilder.js +++ b/app/assets/js/processbuilder.js @@ -368,7 +368,7 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=MRSLauncher') + args.push('-Xdock:name=RolliPartyLauncher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.rawServer.id)) @@ -419,7 +419,7 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=HeliosLauncher') + args.push('-Xdock:name=RolliPartyLauncher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.rawServer.id)) @@ -521,7 +521,7 @@ class ProcessBuilder { val = args[i].replace(argDiscovery, tempNativePath) break case 'launcher_name': - val = args[i].replace(argDiscovery, 'MRS-Launcher') + val = args[i].replace(argDiscovery, 'Rolli-Party-Launcher') break case 'launcher_version': val = args[i].replace(argDiscovery, this.launcherVersion) diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js index b6709388..c749a660 100644 --- a/app/assets/js/scripts/settings.js +++ b/app/assets/js/scripts/settings.js @@ -1453,7 +1453,7 @@ function populateAboutVersionInformation(){ */ function populateReleaseNotes(){ $.ajax({ - url: 'https://github.com/peunsu/MRSLauncher/releases.atom', + url: '', success: (data) => { const version = 'v' + remote.app.getVersion() const entries = $(data).find('entry') diff --git a/app/assets/js/scripts/uicore.js b/app/assets/js/scripts/uicore.js index 8fb14f82..be0aff06 100644 --- a/app/assets/js/scripts/uicore.js +++ b/app/assets/js/scripts/uicore.js @@ -49,7 +49,7 @@ if(!isDev){ loggerAutoUpdater.info('New update available', info.version) if(process.platform === 'darwin'){ - info.darwindownload = `https://github.com/peunsu/MRSLauncher/releases/download/v${info.version}/MRS-Launcher-setup-${info.version}${process.arch === 'arm64' ? '-arm64' : '-x64'}.dmg` + info.darwindownload = `http://59.26.10.62:9090/Rolli-Party-Launcher-setup-${info.version}${process.arch === 'arm64' ? '-arm64' : '-x64'}.dmg` showUpdateUI(info) } diff --git a/app/assets/lang/_custom.toml b/app/assets/lang/_custom.toml index df0c867c..d6adc521 100644 --- a/app/assets/lang/_custom.toml +++ b/app/assets/lang/_custom.toml @@ -1,21 +1,21 @@ # Custom Language File for Launcher Customizer [ejs.app] -title = "MRS Launcher" +title = "Rolli Party Launcher" [ejs.landing] -mediaLinkURL = "https://mysticred.space" -mediaGitHubURL = "https://github.com/peunsu/MRSLauncher" +mediaLinkURL = "https://ch.sooplive.co.kr/rolli826" +mediaGitHubURL = "#" mediaTwitterURL = "#" mediaInstagramURL = "#" mediaYouTubeURL = "#" -mediaDiscordURL = "https://discord.gg/Z8j6ahF4MJ" +mediaDiscordURL = "https://discord.gg/EbsBXSgxT4" [ejs.settings] sourceGithubLink = "https://github.com/peunsu/MRSLauncher" supportLink = "https://github.com/peunsu/MRSLauncher/issues" [ejs.welcome] -welcomeHeader = "Mystic Red Space" -welcomeDescription = "2017년, 작은 모드팩 서버로 시작한 Mystic Red Space는 오랜 시간동안 모드팩 유저의 사랑을 받으면서 현재까지 수십 개 이상의 모드팩 서버를 제공하였습니다. 이제 MRS는 단순한 마인크래프트 모드팩 서버를 넘어서, 더 많은 사람들이 마인크래프트 모드 정보를 쉽게 접하고 모드팩에 대한 관심을 키울 수 있는 모드 커뮤니티로 한 걸음 나아가고 있습니다." -welcomeDescCTA = "모드팩을 사랑하는 당신을 위한 최고의 선물이 되겠습니다." +welcomeHeader = "롤리 파티 런처에 어서오세요." +welcomeDescription = "다양한 즐길거리와 미니게임" +welcomeDescCTA = "" diff --git a/build/icon.png b/build/icon.png index 5ab97839..07f1ad68 100644 Binary files a/build/icon.png and b/build/icon.png differ diff --git a/dev-app-update.yml b/dev-app-update.yml deleted file mode 100644 index 3c2924fd..00000000 --- a/dev-app-update.yml +++ /dev/null @@ -1,3 +0,0 @@ -owner: peunsu -repo: MRSLauncher -provider: github diff --git a/electron-builder.yml b/electron-builder.yml index 41ebee38..1dd38de9 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,8 +1,8 @@ -appId: 'mrslauncher' -productName: 'MRS Launcher' -artifactName: 'MRS-Launcher-setup-${version}.${ext}' +appId: 'rollipartylauncher' +productName: 'Rolli Party Launcher' +artifactName: 'Rolli-Party-Launcher-setup-${version}.${ext}' -copyright: 'Copyright © 2018-2024 Daniel Scalzi, Copyright © 2024 peunsu' +copyright: 'Copyright © 2018-2024 Daniel Scalzi, Copyright © 2024 peunsu, Copyright © 2024 Irgis' asar: true compression: 'maximum' @@ -13,6 +13,10 @@ files: extraResources: - 'libraries' +publish: + provider: 'generic' + url: 'http://59.26.10.62:9090/' + # Windows Configuration win: target: @@ -33,14 +37,14 @@ mac: arch: - 'x64' - 'arm64' - artifactName: 'MRS-Launcher-setup-${version}-${arch}.${ext}' + artifactName: 'Rolli-Party-Launcher-setup-${version}-${arch}.${ext}' category: 'public.app-category.games' # Linux Configuration linux: target: 'AppImage' - maintainer: 'Daniel Scalzi, peunsu' - vendor: 'Daniel Scalzi, peunsu' + maintainer: 'Daniel Scalzi, peunsu, Irgis' + vendor: 'Daniel Scalzi, peunsu, Irgis' synopsis: 'Modded Minecraft Launcher' description: 'Custom launcher which allows users to join modded servers. All mods, configurations, and updates are handled automatically.' category: 'Game' diff --git a/index.js b/index.js index a7414495..5637e05b 100644 --- a/index.js +++ b/index.js @@ -28,7 +28,7 @@ function initAutoUpdater(event, data) { if(isDev){ autoUpdater.autoInstallOnAppQuit = false - autoUpdater.updateConfigPath = path.join(__dirname, 'dev-app-update.yml') + //autoUpdater.updateConfigPath = path.join(__dirname, 'dev-app-update.yml') } if(process.platform === 'darwin'){ autoUpdater.autoDownload = false diff --git a/package-lock.json b/package-lock.json index 7b06d212..cbe109b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "mrslauncher", - "version": "3.0.3", + "name": "rollipartylauncher", + "version": "1.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "mrslauncher", - "version": "3.0.3", + "name": "rollipartylauncher", + "version": "1.0.4", "license": "UNLICENSED", "dependencies": { "@electron/remote": "^2.1.2", diff --git a/package.json b/package.json index ca6561d0..3292e658 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "mrslauncher", - "version": "3.0.3", - "productName": "MRS Launcher", + "name": "rollipartylauncher", + "version": "1.0.4", + "productName": "Rolli Party Launcher", "description": "Modded Minecraft Launcher", - "author": "Daniel Scalzi (https://github.com/dscalzi/), peunsu (https://github.com/peunsu)", + "author": "Daniel Scalzi (https://github.com/dscalzi/), peunsu (https://github.com/peunsu), Irgis", "license": "UNLICENSED", - "homepage": "https://github.com/peunsu/MRSLauncher", + "homepage": "", "bugs": { - "url": "https://github.com/peunsu/MRSLauncher/issues" + "url": "" }, "private": true, "main": "index.js", @@ -46,6 +46,6 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/peunsu/MRSLauncher.git" + "url": "" } }