From b724d7fe136abbe09144eb2824739df3238061ee Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 31 Dec 2013 17:29:00 +0100 Subject: [PATCH] Mage 1.2.0 Release --- Mage.Client/src/main/java/mage/client/MageFrame.java | 2 +- .../src/test/java/mage/client/game/MultiConnectTest.java | 2 +- .../src/main/java/mage/server/console/ConsoleFrame.java | 2 +- Mage.Server/src/main/java/mage/server/Main.java | 2 +- Mage.Server/src/main/resources/log4j.properties | 1 + .../src/test/java/org/mage/test/load/SimpleMageClient.java | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 4458920bec..d2de8e0181 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -152,7 +152,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 static final MageVersion version = new MageVersion(1, 2, 0, "dev"); + private static final MageVersion version = new MageVersion(1, 2, 0, ""); private UUID clientId; private static MagePane activeFrame; private static boolean liteMode = false; diff --git a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java index 32551b8854..958cc88b47 100644 --- a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java +++ b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java @@ -30,7 +30,7 @@ public class MultiConnectTest { private static final CountDownLatch latch = new CountDownLatch(USER_CONNECT_COUNT); - private static final MageVersion version = new MageVersion(1, 2, 0, "dev"); + private static final MageVersion version = new MageVersion(1, 2, 0, ""); private static volatile int connected; diff --git a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java index 00979fbed3..5f67f188de 100644 --- a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java +++ b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java @@ -59,7 +59,7 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient { private static Session session; private ConnectDialog connectDialog; private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class); - private static final MageVersion version = new MageVersion(1, 2, 0, "dev"); + private static final MageVersion version = new MageVersion(1, 2, 0, ""); /** * @return the session diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java index 2e0e514637..7dae7a7e17 100644 --- a/Mage.Server/src/main/java/mage/server/Main.java +++ b/Mage.Server/src/main/java/mage/server/Main.java @@ -80,7 +80,7 @@ public class Main { private static final String testModeArg = "-testMode="; private static final String adminPasswordArg = "-adminPassword="; private static final String pluginFolder = "plugins"; - private static MageVersion version = new MageVersion(1, 2, 0, "dev"); + private static MageVersion version = new MageVersion(1, 2, 0, ""); public static PluginClassLoader classLoader = new PluginClassLoader(); public static TransporterServer server; diff --git a/Mage.Server/src/main/resources/log4j.properties b/Mage.Server/src/main/resources/log4j.properties index 0d434db2d8..218216521c 100644 --- a/Mage.Server/src/main/resources/log4j.properties +++ b/Mage.Server/src/main/resources/log4j.properties @@ -4,6 +4,7 @@ log4j.logger.com.j256.ormlite=warn #log4j.logger.mage.player.ai=TRACE #log4j.logger.mage.player.ai.ComputerPlayer6=debug #log4j.logger.mage.player.ai.ComputerPlayer7=debug +#log4j.logger.mage.player.ai.GameStateEvaluator2=debug #log4j.logger.mage.player.human=DEBUG, console, logfile #log4j.additivity.mage.player.human=false diff --git a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java index b8e7f3e295..bb945e468b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java +++ b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java @@ -16,7 +16,7 @@ import org.apache.log4j.Logger; public class SimpleMageClient implements MageClient { private UUID clientId; - private static final MageVersion version = new MageVersion(1, 2, 0, "dev"); + private static final MageVersion version = new MageVersion(1, 2, 0, ""); private static final transient Logger log = Logger.getLogger(SimpleMageClient.class);