mirror of
https://github.com/correl/mage.git
synced 2024-11-15 19:19:33 +00:00
merge
This commit is contained in:
commit
9cb05e88b9
3 changed files with 3 additions and 3 deletions
|
@ -109,7 +109,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
|
|||
private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
|
||||
private JLabel title;
|
||||
private Rectangle titleRectangle;
|
||||
private final static MageVersion version = new MageVersion(0, 7, 4, "beta-2");
|
||||
private final static MageVersion version = new MageVersion(0, 7, 4, "");
|
||||
private UUID clientId;
|
||||
private static MagePane activeFrame;
|
||||
private static boolean liteMode = false;
|
||||
|
|
|
@ -53,7 +53,7 @@ public class ConsoleFrame extends javax.swing.JFrame {
|
|||
private static Session session;
|
||||
private ConnectDialog connectDialog;
|
||||
private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class);
|
||||
private final static MageVersion version = new MageVersion(0, 7, 4, "beta-2");
|
||||
private final static MageVersion version = new MageVersion(0, 7, 4, "");
|
||||
|
||||
/**
|
||||
* @return the session
|
||||
|
|
|
@ -61,7 +61,7 @@ public class Main {
|
|||
private final static String testModeArg = "-testMode=";
|
||||
private final static String adminPasswordArg = "-adminPassword=";
|
||||
private final static String pluginFolder = "plugins";
|
||||
private static MageVersion version = new MageVersion(0, 7, 4, "beta-2");
|
||||
private static MageVersion version = new MageVersion(0, 7, 4, "");
|
||||
|
||||
public static PluginClassLoader classLoader = new PluginClassLoader();
|
||||
public static ServerImpl server;
|
||||
|
|
Loading…
Reference in a new issue