diff --git a/README.md b/README.md index dd71983..2bcd42d 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -
+ -](https://travis-ci.org/WesterosCraftCode/ElectronLauncher) [](https://github.com/WesterosCraftCode/ElectronLauncher/releases)
+[](https://travis-ci.org/WesterosCraftCode/ElectronLauncher) [](https://github.com/WesterosCraftCode/ElectronLauncher/releases)
-Join WesterosCraft without worrying about installing Java, Forge, or other mods. We'll handle that for you.
+Join modded servers without worrying about installing Java, Forge, or other mods. We'll handle that for you.
![Screenshot 1](https://i.imgur.com/M8HVW9H.jpg) ![Screenshot 2](https://i.imgur.com/zDiSoq4.jpg) @@ -36,24 +36,24 @@ This is not an exhaustive list. Download and install the launcher to gauge all i ## Downloads -You can download from [GitHub Releases](https://github.com/WesterosCraftCode/ElectronLauncher/releases) or [WesterosCraft.com/launcher](https://westeroscraft.com/launcher) +You can download from [GitHub Releases](https://github.com/WesterosCraftCode/ElectronLauncher/releases) #### Latest Release -[![](https://img.shields.io/github/release/WesterosCraftCode/ElectronLauncher.svg?style=flat-square)](https://github.com/WesterosCraftCode/ElectronLauncher/releases/latest) +[![](https://img.shields.io/github/release/dscalzi/ElectronLauncher.svg?style=flat-square)](https://github.com/dscalzi/ElectronLauncher/releases/latest) #### Latest Pre-Release -[![](https://img.shields.io/github/release/WesterosCraftCode/ElectronLauncher/all.svg?style=flat-square)](https://github.com/WesterosCraftCode/ElectronLauncher/releases) +[![](https://img.shields.io/github/release/dscalzi/ElectronLauncher/all.svg?style=flat-square)](https://github.com/dscalzi/ElectronLauncher/releases) **Supported Platforms** -If you download from the [Releases](https://github.com/WesterosCraftCode/ElectronLauncher/releases) tab, select the installer for your system. +If you download from the [Releases](https://github.com/dscalzi/ElectronLauncher/releases) tab, select the installer for your system. | Platform | File | | -------- | ---- | -| Windows x64 | `westeroscraftlauncher-setup-VERSION.exe` | -| macOS | `westeroscraftlauncher-VERSION.dmg` | -| Linux x64 | `westeroscraftlauncher-VERSION-x86_64.AppImage` | +| Windows x64 | `electronlauncher-setup-VERSION.exe` | +| macOS | `electronlauncher-VERSION.dmg` | +| Linux x64 | `electronlauncher-VERSION-x86_64.AppImage` | ## Console @@ -85,7 +85,7 @@ If you want to export the console output, simply right click anywhere on the con **Clone and Install Dependencies** ```console -> git clone https://github.com/WesterosCraftCode/ElectronLauncher.git +> git clone https://github.com/dscalzi/ElectronLauncher.git > cd ElectronLauncher > npm install ``` @@ -190,13 +190,11 @@ We reserve the right to update these conditions at any time, please check back p ## Resources -* [WesterosCraft][westeroscraft] -* [Support Forum][supportforum] * [Wiki][wiki] The best way to contact the developers is on Discord. -[![discord](https://discordapp.com/api/guilds/98469309352775680/embed.png?style=banner2)][discord] +[![discord](https://discordapp.com/api/guilds/211524927831015424/embed.png?style=banner3)][discord] --- @@ -208,7 +206,5 @@ The best way to contact the developers is on Discord. [mainprocess]: https://electronjs.org/docs/tutorial/application-architecture#main-and-renderer-processes 'Main Process' [rendererprocess]: https://electronjs.org/docs/tutorial/application-architecture#main-and-renderer-processes 'Renderer Process' [chromedebugger]: https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome 'Debugger for Chrome' -[westeroscraft]: https://westeroscraft.com/ 'WesterosCraft.com' -[supportforum]: https://westeroscraft.com/forum/support.40/ 'Support Forum' -[discord]: https://discord.gg/hqdjs3m 'Discord' -[wiki]: https://github.com/WesterosCraftCode/ElectronLauncher/wiki 'wiki' +[discord]: https://discord.gg/zNWUXdt 'Discord' +[wiki]: https://github.com/dscalzi/ElectronLauncher/wiki 'wiki' diff --git a/app/assets/images/SealCircle.png b/app/assets/images/SealCircle.png new file mode 100644 index 0000000..9e21d08 Binary files /dev/null and b/app/assets/images/SealCircle.png differ diff --git a/app/assets/images/WesterosSealCircle.png b/app/assets/images/WesterosSealCircle.png deleted file mode 100644 index 8200a7a..0000000 Binary files a/app/assets/images/WesterosSealCircle.png and /dev/null differ diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 50242a9..f34cc25 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -5,6 +5,7 @@ const path = require('path') const logger = require('./loggerutil')('%c[ConfigManager]', 'color: #a02d2a; font-weight: bold') const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME) +// TODO change const dataPath = path.join(sysRoot, '.westeroscraft') // Forked processes do not have access to electron, so we have this workaround. diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 316b839..49c5009 100644 --- a/app/assets/js/processbuilder.js +++ b/app/assets/js/processbuilder.js @@ -298,7 +298,7 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=WesterosCraft') + args.push('-Xdock:name=ElectronLauncher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM()) @@ -336,7 +336,7 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=WesterosCraft') + args.push('-Xdock:name=ElectronLauncher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM()) @@ -438,7 +438,7 @@ class ProcessBuilder { val = args[i].replace(argDiscovery, tempNativePath) break case 'launcher_name': - val = args[i].replace(argDiscovery, 'WesterosCraft-Launcher') + val = args[i].replace(argDiscovery, 'Electron-Launcher') break case 'launcher_version': val = args[i].replace(argDiscovery, this.launcherVersion) diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index a4b9512..5affa8b 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -337,7 +337,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){ //$('#overlayDismiss').toggle(false) setOverlayContent( 'Java is Required