Jonttu
/
HeliosLauncher
mirror of https://github.com/dscalzi/HeliosLauncher
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Small changes and cleanup to Java related UI. 

The manual installation overlay now links to the Java Management wiki article.
The Available Options for Java 8 href now links to the os-specific page (/windows for windows, /unix for macOS and Linux).
The default config now uses the same value as max ram for min ram.
pull/19/head
Daniel Scalzi 2018-08-20 04:02:27 -04:00
parent 58a8215b05
commit afe69a21c6
No known key found for this signature in database
GPG Key ID: 5CA2F145B63535F9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/js/configmanager.js
View File

@ -26,7 +26,7 @@ function resolveMaxRAM(){
}
function resolveMinRAM(){
return exports.getAbsoluteMinRAM() + 'G'
return resolveMaxRAM()
}
/**

4
app/assets/js/scripts/landing.js
View File

@ -298,8 +298,8 @@ function asyncSystemScan(launchAfter = true){
$('#overlayContent').fadeOut(250, () => {
//$('#overlayDismiss').toggle(false)
setOverlayContent(
'Don\'t Forget!<br>Java is Required',
'A valid x64 installation of Java 8 is required to launch. Downloads can be found on <a href="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html">Oracle\'s website</a>. Once installed, you will be able to connect to the server.<br><br>Please refer to our <a href="http://westeroscraft.wikia.com/wiki/Troubleshooting_Guide">Troubleshooting Guide</a> if you have any difficulty.',
'Java is Required<br>to Launch',
'A valid x64 installation of Java 8 is required to launch.<br><br>Please refer to our <a href="https://github.com/WesterosCraftCode/ElectronLauncher/wiki/Java-Management#manually-installing-a-valid-version-of-java">Java Management Guide</a> for instructions on how to manually install Java.',
'I Understand',
'Go Back'
)

2
app/settings.ejs
View File

@ -218,7 +218,7 @@
</div>
<input id="settingsJVMOptsVal" cValue="JVMOptions" type="text">
</div>
<div id="settingsJVMOptsDesc">Options to be provided to the JVM at runtime. <em>-Xms</em> and <em>-Xmx</em> should not be included.<br><a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/java.html">Available Options for Java 8</a>.</div>
<div id="settingsJVMOptsDesc">Options to be provided to the JVM at runtime. <em>-Xms</em> and <em>-Xmx</em> should not be included.<br><a href="https://docs.oracle.com/javase/8/docs/technotes/tools/<%= process.platform === 'win32' ? 'windows' : 'unix' %>/java.html">Available Options for Java 8</a>.</div>
</div>
</div>
<div id="settingsTabLauncher" class="settingsTab" style="display: none;">