Commit 481daf32 authored by superblaubeere27's avatar superblaubeere27

Commit to Merge

parent 2f05ed23
......@@ -6,7 +6,7 @@
<groupId>net.ccbluex</groupId>
<artifactId>LiquidLauncher</artifactId>
<version>1.25</version>
<version>1.3</version>
<build>
<plugins>
<plugin>
......@@ -88,7 +88,7 @@
<txtProductVersion>1.0.0.0</txtProductVersion>
<productName>${project.name}</productName>
<internalName>AppName</internalName>
<originalFilename>CameraControl.exe</originalFilename>
<originalFilename>LiquidLauncher.exe</originalFilename>
</versionInfo>
</configuration>
</execution>
......
......@@ -46,7 +46,7 @@ public class LiquidLauncher {
public static final boolean DEVEL_VERSION = true;
public static final Logger LOGGER = Logger.getLogger(LAUNCHER_NAME);
public static final String LAUNCHER_OPENSOURCE_PROJECT = "https://git.liquidbounce.net/CCBlueX/LiquidLauncherV2";
public static final double LAUNCHER_VERSION = 1.25;
public static final double LAUNCHER_VERSION = 1.3;
public static final String LAUNCHER_VERSION_STRING = "v" + LAUNCHER_VERSION + "-SNAPSHOT";
private static final String LIQUIDLAUNCHER_DOWNLOAD = "https://ci.liquidbounce.net/job/LiquidLauncher/";
public static LiquidLauncher liquidLauncher;
......@@ -127,6 +127,10 @@ public class LiquidLauncher {
JOptionPane.showMessageDialog(menuInterface, e.toString(), "ERROR", JOptionPane.ERROR_MESSAGE);
}
public static void info(String s) {
JOptionPane.showMessageDialog(menuInterface, s, "Info", JOptionPane.INFORMATION_MESSAGE);
}
public void start() {
liquidLauncher = this;
LOGGER.info("Starting LiquidLauncher...");
......@@ -479,7 +483,7 @@ public class LiquidLauncher {
}
}
});
JOptionPane.showMessageDialog(menuInterface, label, "Release notes", JOptionPane.PLAIN_MESSAGE);
JOptionPane.showMessageDialog(menuInterface, label, "Release notes", JOptionPane.INFORMATION_MESSAGE);
} catch (Exception e) {
report(e);
}
......
......@@ -159,7 +159,7 @@ public class ExportDialog extends JDialog {
ByteStreams.copy(new ByteArrayInputStream(String.format("TIME: %s LAUNCHER_VERSION: %s", new Date().toString(), LiquidLauncher.LAUNCHER_VERSION_STRING).getBytes()), outStream);
outStream.closeEntry();
outStream.close();
JOptionPane.showMessageDialog(LiquidLauncher.menuInterface, "The LiquidBounce settings were successfully exported to\n" + output.getAbsolutePath(), "Success", JOptionPane.PLAIN_MESSAGE);
JOptionPane.showMessageDialog(LiquidLauncher.menuInterface, "The LiquidBounce settings were successfully exported to\n" + output.getAbsolutePath(), "Success", JOptionPane.INFORMATION_MESSAGE);
} catch (Exception e) {
JOptionPane.showMessageDialog(LiquidLauncher.menuInterface, e.toString(), "Error", JOptionPane.ERROR_MESSAGE);
return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment