Prepare new release

amcomeau · Nov 10, 2020 · ea46afb · ea46afb
1 parent 19887b1
commit ea46afb
Show file tree

Hide file tree

Showing 41 changed files with 47 additions and 47 deletions.
diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-client</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-common</artifactId>

diff --git a/Mage.Common/src/main/java/mage/utils/MageVersion.java b/Mage.Common/src/main/java/mage/utils/MageVersion.java
@@ -11,9 +11,9 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
 
     public static final int MAGE_VERSION_MAJOR = 1;
     public static final int MAGE_VERSION_MINOR = 4;
-    public static final int MAGE_VERSION_PATCH = 45;
+    public static final int MAGE_VERSION_PATCH = 46;
     public static final String MAGE_EDITION_INFO = ""; // set "-beta2" for 1.4.32V1-beta2
-    public static final String MAGE_VERSION_MINOR_PATCH = "V1"; // default
+    public static final String MAGE_VERSION_MINOR_PATCH = "V0"; // default
     // strict mode
     private static final boolean MAGE_VERSION_MINOR_PATCH_MUST_BE_SAME = true; // set true on uncompatible github changes, set false after new major release (after MAGE_VERSION_PATCH changes)
 
@@ -23,7 +23,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
     private final int patch;
     private final String minorPatch; // doesn't matter for compatibility
     private final String buildTime;
-    private String editionInfo;
+    private final String editionInfo;
 
     public MageVersion(Class sourceClass) {
         this(MAGE_VERSION_MAJOR, MAGE_VERSION_MINOR, MAGE_VERSION_PATCH, MAGE_VERSION_MINOR_PATCH, MAGE_EDITION_INFO, sourceClass);

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-counter-plugin</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-plugins</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage.server.console</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-deck-constructed</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-deck-limited</artifactId>

diff --git a/Mage.Server.Plugins/Mage.Game.BrawlDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.BrawlDuel/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-brawlduel</artifactId>

diff --git a/Mage.Server.Plugins/Mage.Game.BrawlFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.BrawlFreeForAll/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.mage</groupId>
     <artifactId>mage-server-plugins</artifactId>
-    <version>1.4.45</version>
+    <version>1.4.46</version>
   </parent>
 
     <artifactId>mage-game-brawlfreeforall</artifactId>

diff --git a/Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-canadianhighlanderduel</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-commanderduel</artifactId>

diff --git 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.45</version>
+    <version>1.4.46</version>
   </parent>
 
     <artifactId>mage-game-commanderfreeforall</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-freeforall</artifactId>

diff --git a/Mage.Server.Plugins/Mage.Game.FreeformCommanderDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeformCommanderDuel/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-freeformcommanderduel</artifactId>

diff --git a/Mage.Server.Plugins/Mage.Game.FreeformCommanderFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeformCommanderFreeForAll/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.mage</groupId>
     <artifactId>mage-server-plugins</artifactId>
-    <version>1.4.45</version>
+    <version>1.4.46</version>
   </parent>
 
     <artifactId>mage-game-freeformcommanderfreeforall</artifactId>

diff --git a/Mage.Server.Plugins/Mage.Game.FreeformUnlimitedCommander/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeformUnlimitedCommander/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-freeformunlimitedcommander</artifactId>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.mage</groupId>
             <artifactId>mage-game-freeformcommanderfreeforall</artifactId>
-            <version>1.4.45</version>
+            <version>1.4.46</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-momirduel</artifactId>

diff --git a/Mage.Server.Plugins/Mage.Game.MomirGame/pom.xml b/Mage.Server.Plugins/Mage.Game.MomirGame/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-momirfreeforall</artifactId>

diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-oathbreakerduel</artifactId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.mage</groupId>
             <artifactId>mage-game-oathbreakerfreeforall</artifactId>
-            <version>1.4.45</version>
+            <version>1.4.46</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-server-plugins</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-oathbreakerfreeforall</artifactId>

diff --git a/Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.mage</groupId>
     <artifactId>mage-server-plugins</artifactId>
-    <version>1.4.45</version>
+    <version>1.4.46</version>
   </parent>
 
     <artifactId>mage-game-pennydreadfulcommanderfreeforall</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-tinyleadersduel</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-game-twoplayerduel</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-player-ai-draftbot</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-player-ai-ma</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-player-ai</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-player-ai-mcts</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-player-aiminimax</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-player-human</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-tournament-boosterdraft</artifactId>

diff --git 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.45</version>
+    <version>1.4.46</version>
   </parent>
 
   <artifactId>mage-tournament-constructed</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-tournament-sealed</artifactId>

diff --git a/Mage.Server.Plugins/pom.xml b/Mage.Server.Plugins/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-server-plugins</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-server</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-sets</artifactId>

diff --git 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.45</version>
+        <version>1.4.46</version>
     </parent> 
 
     <artifactId>mage-tests</artifactId>

diff --git a/Mage.Verify/pom.xml b/Mage.Verify/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage-verify</artifactId>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.mage</groupId>
             <artifactId>mage-client</artifactId>
-            <version>1.4.45</version>
+            <version>1.4.46</version>
         </dependency>
 
     </dependencies>

diff --git a/Mage/pom.xml b/Mage/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
-        <version>1.4.45</version>
+        <version>1.4.46</version>
     </parent>
 
     <artifactId>mage</artifactId>

diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java
@@ -36,7 +36,7 @@ public enum CardRepository {
     // raise this if db structure was changed
     private static final long CARD_DB_VERSION = 53;
     // raise this if new cards were added to the server
-    private static final long CARD_CONTENT_VERSION = 233;
+    private static final long CARD_CONTENT_VERSION = 234;
     private Dao<CardInfo, Object> cardDao;
     private Set<String> classNames;
     private final RepositoryEventSource eventSource = new RepositoryEventSource();