Skip to content

Commit

Permalink
Prepare new release
Browse files Browse the repository at this point in the history
  • Loading branch information
@JayDi85
JayDi85 committed Jun 20, 2020
1 parent 1dde600 commit 3f2a5fc
Show file tree
Hide file tree
Showing 41 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion Mage.Client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-common</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions Mage.Common/src/main/java/mage/utils/MageVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ 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 = 42;
public static final int MAGE_VERSION_PATCH = 43;
public static final String MAGE_EDITION_INFO = ""; // set "-beta2" for 1.4.32V1-beta2
public static final String MAGE_VERSION_MINOR_PATCH = "V7"; // 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)
private static final boolean MAGE_VERSION_MINOR_PATCH_MUST_BE_SAME = false; // set true on uncompatible github changes, set false after new major release (after MAGE_VERSION_PATCH changes)

public static final boolean MAGE_VERSION_SHOW_BUILD_TIME = true;
private final int major;
Expand Down
2 changes: 1 addition & 1 deletion Mage.Plugins/Mage.Counter.Plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-counter-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-plugins</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Console/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage.server.console</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-deck-constructed</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-deck-limited</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.BrawlDuel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-brawlduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.BrawlFreeForAll/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-brawlfreeforall</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-canadianhighlanderduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-commanderduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-commanderfreeforall</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-freeforall</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.FreeformCommanderDuel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-freeformcommanderduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.FreeformCommanderFreeForAll/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-freeformcommanderfreeforall</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions Mage.Server.Plugins/Mage.Game.FreeformUnlimitedCommander/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-freeformunlimitedcommander</artifactId>
Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>org.mage</groupId>
<artifactId>mage-game-freeformcommanderfreeforall</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-momirduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.MomirGame/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-momirfreeforall</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-oathbreakerduel</artifactId>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.mage</groupId>
<artifactId>mage-game-oathbreakerfreeforall</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-oathbreakerfreeforall</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-pennydreadfulcommanderfreeforall</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-tinyleadersduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-game-twoplayerduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-player-ai-draftbot</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-player-ai-ma</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.AI/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-player-ai</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-player-ai-mcts</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-player-aiminimax</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.Human/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-player-human</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-tournament-boosterdraft</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-tournament-constructed</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-tournament-sealed</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-server-plugins</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Sets/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-sets</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-tests</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions Mage.Verify/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage-verify</artifactId>
Expand Down Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>org.mage</groupId>
<artifactId>mage-client</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion Mage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.42</version>
<version>1.4.43</version>
</parent>

<artifactId>mage</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage/src/main/java/mage/cards/repository/CardRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 52;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 229;
private static final long CARD_CONTENT_VERSION = 230;
private Dao<CardInfo, Object> cardDao;
private Set<String> classNames;
private RepositoryEventSource eventSource = new RepositoryEventSource();
Expand Down
Loading

0 comments on commit 3f2a5fc

Please sign in to comment.