Update to release 1.4.1.

2025-03-30 17:00:10 -09:00 · 2015-06-14 02:43:16 +02:00 · 2015-06-14 02:43:16 +02:00 · 060a468d4b
commit 060a468d4b
parent 6420666668
39 changed files with 55 additions and 52 deletions
--- a/Mage.Client/pom.xml
+++ b/Mage.Client/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-root</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <groupId>org.mage</groupId>
--- a/Mage.Client/release/readme.txt
+++ b/Mage.Client/release/readme.txt
@ -11,7 +11,7 @@ You can download this from:  http://java.com/
 Installing and running XMage

 You will need to download both the client and the server applications.  These can be
-obtained from HTTP://XMage.info.
+obtained from HTTP://XMage.de.
 Extact the client and the server to separate folders.

 To play a game you can either connect to a server or start your own server.  To
--- a/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.form
+++ b/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.form
@ -52,9 +52,9 @@
              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="jLabel3" min="-2" pref="21" max="-2" attributes="0"/>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
              <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="62" max="32767" attributes="0"/>
+              <EmptySpace pref="71" max="32767" attributes="0"/>
              <Component id="btnOk" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
          </Group>
@ -82,17 +82,17 @@
    </Component>
    <Component class="javax.swing.JLabel" name="jLabel2">
      <Properties>
-        <Property name="text" type="java.lang.String" value="Courtesy: BetaSteward@googlemail.com. Site: http://XMage.info/"/>
+        <Property name="text" type="java.lang.String" value="Courtesy: BetaSteward@googlemail.com. Site: http://XMage.de/"/>
      </Properties>
    </Component>
    <Component class="javax.swing.JLabel" name="jLabel3">
      <Properties>
-        <Property name="text" type="java.lang.String" value="Devs: BetaSteward, Noxx, Eugen.Rivniy, North, LevelX2, Jeff, Plopman, dustinconrad, emerald000. "/>
+        <Property name="text" type="java.lang.String" value="Devs: BetaSteward, Noxx, Eugen.Rivniy, North, LevelX2, Jeff, Plopman, dustinconrad, emerald000.,"/>
      </Properties>
    </Component>
    <Component class="javax.swing.JLabel" name="jLabel4">
      <Properties>
-        <Property name="text" type="java.lang.String" value="Thanks: maurer.it, Rafbill, Alvin, cbt33, Quercitron."/>
+        <Property name="text" type="java.lang.String" value="fireshoes, lunaskyrise, mnapoleon, jgod, LoneFox."/>
      </Properties>
    </Component>
  </SubComponents>
--- a/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
@ -88,11 +88,11 @@ public class AboutDialog extends MageDialog {

        lblVersion.setText("0.0.0");

-        jLabel2.setText("Courtesy: BetaSteward@googlemail.com. Site: http://XMage.info/");
+        jLabel2.setText("Courtesy: BetaSteward@googlemail.com. Site: http://XMage.de/");

-        jLabel3.setText("Devs: BetaSteward, Noxx, Eugen.Rivniy, North, LevelX2, Jeff, Plopman, dustinconrad, emerald000. ");
+        jLabel3.setText("Devs: BetaSteward, Noxx, Eugen.Rivniy, North, LevelX2, Jeff, Plopman, dustinconrad, emerald000.,");

-        jLabel4.setText("Thanks: maurer.it, Rafbill, Alvin, cbt33, Quercitron.");
+        jLabel4.setText("fireshoes, lunaskyrise, mnapoleon, jgod, LoneFox.");

        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
        getContentPane().setLayout(layout);
@ -122,9 +122,9 @@ public class AboutDialog extends MageDialog {
                .addComponent(jLabel2)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 21, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(jLabel4)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 62, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 71, Short.MAX_VALUE)
                .addComponent(btnOk)
                .addContainerGap())
        );
--- a/Mage.Common/pom.xml
+++ b/Mage.Common/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-root</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-common</artifactId>
--- a/Mage.Common/src/mage/utils/MageVersion.java
+++ b/Mage.Common/src/mage/utils/MageVersion.java
@ -41,8 +41,8 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
     */
    public final static int MAGE_VERSION_MAJOR = 1;
    public final static int MAGE_VERSION_MINOR = 4;
-    public final static int MAGE_VERSION_PATCH = 0;
-    public final static String MAGE_VERSION_MINOR_PATCH = "v2";
+    public final static int MAGE_VERSION_PATCH = 1;
+    public final static String MAGE_VERSION_MINOR_PATCH = "v0";
    public final static String MAGE_VERSION_INFO = "";
    
    private final int major;
--- a/Mage.Plugins/Mage.Counter.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Counter.Plugin/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-counter-plugin</artifactId>
--- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-theme-plugin</artifactId>
@ -29,7 +29,7 @@
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>mage-client</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
        </dependency>
    </dependencies>

--- a/Mage.Plugins/pom.xml
+++ b/Mage.Plugins/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-root</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-plugins</artifactId>
--- a/Mage.Server.Console/pom.xml
+++ b/Mage.Server.Console/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-root</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <groupId>org.mage</groupId>
--- a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
+++ b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-deck-constructed</artifactId>
--- a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
+++ b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-deck-limited</artifactId>
--- a/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-game-commanderduel</artifactId>
--- a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml
@ -6,7 +6,7 @@
  <parent>
    <groupId>org.mage</groupId>
    <artifactId>mage-server-plugins</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
  </parent>

    <artifactId>mage-game-commanderfreeforall</artifactId>
--- a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-game-freeforall</artifactId>
--- a/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>
    
    <artifactId>mage-game-tinyleadersduel</artifactId>
--- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-game-twoplayerduel</artifactId>
--- a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-player-ai-draftbot</artifactId>
--- a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-player-ai-ma</artifactId>
--- a/Mage.Server.Plugins/Mage.Player.AI/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AI/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-player-ai</artifactId>
--- a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-player-ai-mcts</artifactId>
--- a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-player-aiminimax</artifactId>
--- a/Mage.Server.Plugins/Mage.Player.Human/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.Human/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-player-human</artifactId>
--- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml
+++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-tournament-boosterdraft</artifactId>
--- a/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml
+++ b/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml
@ -7,7 +7,7 @@
  <parent>
    <groupId>org.mage</groupId>
    <artifactId>mage-server-plugins</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
  </parent>

  <artifactId>mage-tournament-constructed</artifactId>
--- a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml
+++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-tournament-sealed</artifactId>
--- a/Mage.Server.Plugins/pom.xml
+++ b/Mage.Server.Plugins/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-root</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-server-plugins</artifactId>
--- a/Mage.Server/pom.xml
+++ b/Mage.Server/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-root</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage-server</artifactId>
--- a/Mage.Server/release/server.msg.txt
+++ b/Mage.Server/release/server.msg.txt
@ -1,4 +1,4 @@
-Welcome! You are playing XMage version 1.3.0
+Welcome! You are playing XMage version 1.4.1
 Find what was changed since previous versions on project Wiki https://github.com/magefree/mage/wiki
 Contact us on the XMAGE board of http://www.slightlymagic.net/forum/viewforum.php?f=70 for bug reports or enhancement requests.
-Download newest version from http://XMage.info.
+Download newest version from http://XMage.de
--- a/Mage.Server/server.msg.txt
+++ b/Mage.Server/server.msg.txt
@ -2,5 +2,5 @@ HotKeys: Alt+E - Enlarge card image
 Wheel zoom in/out - Enlarge card image
 F4 - end current turn, response to stack
 F9 - skip all opponents' turns, no response to stack
-Welcome! You are playing Mage version 1.4.0
+Welcome! You are playing Mage version 1.4.1
 Contact us on www.slightlymagic.net
--- a/Mage.Sets/pom.xml
+++ b/Mage.Sets/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-root</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <groupId>org.mage</groupId>
--- a/Mage.Stats/pom.xml
+++ b/Mage.Stats/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-root</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <groupId>org.mage</groupId>
--- a/Mage.Tests/pom.xml
+++ b/Mage.Tests/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-root</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent> 

    <artifactId>mage-tests</artifactId>
--- a/Mage.Updater/pom.xml
+++ b/Mage.Updater/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>mage-root</artifactId>
        <groupId>org.mage</groupId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/Mage/pom.xml
+++ b/Mage/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>org.mage</groupId>
        <artifactId>mage-root</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
    </parent>

    <artifactId>mage</artifactId>
--- a/Mage/src/mage/cards/repository/CardRepository.java
+++ b/Mage/src/mage/cards/repository/CardRepository.java
@ -58,9 +58,9 @@ public enum CardRepository {
    private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE";
    private static final String VERSION_ENTITY_NAME = "card";
    // raise this if db structure was changed
-    private static final long CARD_DB_VERSION = 38;
+    private static final long CARD_DB_VERSION = 39;
    // raise this if new cards were added to the server
-    private static final long CARD_CONTENT_VERSION = 17;
+    private static final long CARD_CONTENT_VERSION = 18;

    private final Random random = new Random();
    private Dao<CardInfo, Object> cardDao;
--- a/Mage/src/mage/cards/repository/ExpansionRepository.java
+++ b/Mage/src/mage/cards/repository/ExpansionRepository.java
@ -26,8 +26,8 @@ public enum ExpansionRepository {
    
    private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE";
    private static final String VERSION_ENTITY_NAME = "expansion";
-    private static final long EXPANSION_DB_VERSION = 4;
-    private static final long EXPANSION_CONTENT_VERSION = 7;
+    private static final long EXPANSION_DB_VERSION = 5;
+    private static final long EXPANSION_CONTENT_VERSION = 8;

    private Dao<ExpansionInfo, Object> expansionDao;

--- a/Utils/release/getting_implemented_cards.txt
+++ b/Utils/release/getting_implemented_cards.txt
@ -131,6 +131,9 @@ git log e8b2e01cd465f6a8ced2c83ec52a698ee093baa4..HEAD --diff-filter=A --name-st
 since 1.4.0.v2
 git log eb96b08dfac3de4f78403d6f23e41ce8d41ece6f..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt

+since 1.4.1.v0
+git log 7a54d5364c9789ce2c3ef2c3eb4df7e0e0cde0cf..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
+
 3. Copy added_cards.txt to trunk\Utils folder
 4. Run script:
 > perl extract_in_wiki_format.perl
--- a/pom.xml
+++ b/pom.xml
@ -6,7 +6,7 @@

    <groupId>org.mage</groupId>
    <artifactId>mage-root</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
    <packaging>pom</packaging>
    <name>Mage Root</name>
    <description>Mage Root POM</description>
@ -83,7 +83,7 @@
    </repositories>

    <properties>
-        <mage-version>1.4.0</mage-version>
+        <mage-version>1.4.1</mage-version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>