diff --git a/build.gradle b/build.gradle index 49eea452c..680cf4d7b 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ subprojects { apply plugin: 'java' group = 'com.skcraft' - version = '4.6-SNAPSHOT' + version = '1.02' java { toolchain { diff --git a/launcher-fancy/src/main/resources/com/skcraft/launcher/launcher_bg.jpg b/launcher-fancy/src/main/resources/com/skcraft/launcher/launcher_bg.jpg index 25cf94736..ef7b99284 100644 Binary files a/launcher-fancy/src/main/resources/com/skcraft/launcher/launcher_bg.jpg and b/launcher-fancy/src/main/resources/com/skcraft/launcher/launcher_bg.jpg differ diff --git a/launcher-fancy/src/main/resources/com/skcraft/launcher/skin/graphite.colorschemes b/launcher-fancy/src/main/resources/com/skcraft/launcher/skin/graphite.colorschemes index 2c05502c6..1957bc6cd 100644 --- a/launcher-fancy/src/main/resources/com/skcraft/launcher/skin/graphite.colorschemes +++ b/launcher-fancy/src/main/resources/com/skcraft/launcher/skin/graphite.colorschemes @@ -26,7 +26,7 @@ Graphite Background { colorExtraLight=#444444 colorLight=#333333 colorMid=#222222 - colorDark=#111111 + colorDark=#000000 colorUltraDark=#000000 colorForeground=#B4B4B4 } diff --git a/launcher/src/main/java/com/skcraft/launcher/Launcher.java b/launcher/src/main/java/com/skcraft/launcher/Launcher.java index 962f64f8a..3c4207446 100644 --- a/launcher/src/main/java/com/skcraft/launcher/Launcher.java +++ b/launcher/src/main/java/com/skcraft/launcher/Launcher.java @@ -113,16 +113,16 @@ public void run() { */ public void setDefaultConfig() { double configMax = config.getMaxMemory() / 1024.0; - double suggestedMax = 2; + double suggestedMax = 8; double available = Double.MAX_VALUE; try { OperatingSystemMXBean bean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); available = bean.getTotalPhysicalMemorySize() / 1024.0 / 1024.0 / 1024.0; - if (available <= 6) { - suggestedMax = available * 0.48; + if (available <= 8) { + suggestedMax = available * 0.75; } else { - suggestedMax = 4; + suggestedMax = 8; } } catch (Exception ignored) { } diff --git a/launcher/src/main/resources/com/skcraft/launcher/icon.png b/launcher/src/main/resources/com/skcraft/launcher/icon.png index 8c74095f1..88546a17b 100644 Binary files a/launcher/src/main/resources/com/skcraft/launcher/icon.png and b/launcher/src/main/resources/com/skcraft/launcher/icon.png differ diff --git a/launcher/src/main/resources/com/skcraft/launcher/instance_icon.png b/launcher/src/main/resources/com/skcraft/launcher/instance_icon.png index 8c74095f1..493cb77bd 100644 Binary files a/launcher/src/main/resources/com/skcraft/launcher/instance_icon.png and b/launcher/src/main/resources/com/skcraft/launcher/instance_icon.png differ diff --git a/launcher/src/main/resources/com/skcraft/launcher/lang/Launcher.properties b/launcher/src/main/resources/com/skcraft/launcher/lang/Launcher.properties index ef48f3c4b..e24c7205b 100644 --- a/launcher/src/main/resources/com/skcraft/launcher/lang/Launcher.properties +++ b/launcher/src/main/resources/com/skcraft/launcher/lang/Launcher.properties @@ -75,8 +75,8 @@ launcher.checkForUpdates=Check for updates launcher.options=Options... launcher.updateLauncher=Update launcher... launcher.downloadUpdates=Download modpack updates -launcher.title=SKCraft Launcher (v{0}) -launcher.appTitle=SKCraft Launcher +launcher.title=Automation Inc Launcher (v{0}) +launcher.appTitle=Automation Inc Launcher launcher.refreshList=Refresh list launcher.checkingTitle=Getting available modpacks... launcher.checkingStatus=Getting available modpacks... Please wait. diff --git a/launcher/src/main/resources/com/skcraft/launcher/launcher.properties b/launcher/src/main/resources/com/skcraft/launcher/launcher.properties index 1ff0c13cd..40f0c2978 100644 --- a/launcher/src/main/resources/com/skcraft/launcher/launcher.properties +++ b/launcher/src/main/resources/com/skcraft/launcher/launcher.properties @@ -9,7 +9,7 @@ version=${project.version} # These can be left as-is or changed to your liking -launcherShortname=SKCLauncher +launcherShortname=Automation Inc Launcher offlinePlayerName=Player # Only change these if you know what you're doing. @@ -21,6 +21,6 @@ microsoftClientId=d18bb4d8-a27f-4451-a87f-fe6de4436813 resetPasswordUrl=https://minecraft.net/resetpassword # You MUST change these from the defaults. These URLs are provides as examples only. -newsUrl=https://update.skcraft.com/template/news.html?version=%s -packageListUrl=https://update.skcraft.com/template/packages.json?key=%s -selfUpdateUrl=https://update.skcraft.com/template/launcher/latest.json +newsUrl=http://aiminecraft.com/Launcher/news.html +packageListUrl=http://aiminecraft.com/Launcher/packages.json +selfUpdateUrl=