Skip to content

Commit

Permalink
Xmage 1.4.25V0
Browse files Browse the repository at this point in the history
  • Loading branch information
LevelX2 committed Jul 29, 2017
1 parent 7ba0518 commit fe2ee5d
Show file tree
Hide file tree
Showing 34 changed files with 39 additions and 44 deletions.
2 changes: 1 addition & 1 deletion Mage.Client/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<groupId>org.mage</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Common/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-common</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions Mage.Common/src/main/java/mage/utils/MageVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,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 = 24;
public final static String MAGE_VERSION_MINOR_PATCH = "V3";
public final static int MAGE_VERSION_PATCH = 25;
public final static String MAGE_VERSION_MINOR_PATCH = "V0";
public final static String MAGE_VERSION_INFO = "";

private final int major;
Expand Down
2 changes: 1 addition & 1 deletion Mage.Plugins/Mage.Counter.Plugin/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-counter-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Plugins/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-plugins</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Console/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<groupId>org.mage</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-deck-constructed</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-deck-limited</artifactId>
Expand Down
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-game-canadianhighlanderduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-game-commanderduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-game-commanderfreeforall</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-game-freeforall</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-game-momirduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-game-tinyleadersduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-game-twoplayerduel</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml
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.24</version>
<version>1.4.25</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
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-player-ai-ma</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.AI/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-player-ai</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-player-ai-mcts</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-player-aiminimax</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Player.Human/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-player-human</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-tournament-boosterdraft</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-tournament-constructed</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-tournament-sealed</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server.Plugins/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-server-plugins</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Server/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Sets/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<groupId>org.mage</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Stats/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<groupId>org.mage</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Tests/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage.Updater/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>mage-root</artifactId>
<groupId>org.mage</groupId>
<version>1.4.24</version>
<version>1.4.25</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion Mage.Verify/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage-verify</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Mage/pom.xml
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.24</version>
<version>1.4.25</version>
</parent>

<artifactId>mage</artifactId>
Expand Down
13 changes: 4 additions & 9 deletions Mage/src/main/java/mage/cards/repository/CardRepository.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,15 @@
import com.j256.ormlite.support.ConnectionSource;
import com.j256.ormlite.support.DatabaseConnection;
import com.j256.ormlite.table.TableUtils;
import java.io.File;
import java.sql.SQLException;
import java.util.*;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SetType;
import mage.util.RandomUtil;
import org.apache.log4j.Logger;

import java.io.File;
import java.sql.SQLException;
import java.util.*;

/**
* @author North
*/
Expand All @@ -59,7 +58,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 51;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 85;
private static final long CARD_CONTENT_VERSION = 86;
private final TreeSet<String> landTypes = new TreeSet<>();
private Dao<CardInfo, Object> cardDao;
private Set<String> classNames;
Expand Down Expand Up @@ -274,10 +273,6 @@ public Set<String> getNonArtifactAndNonLandNames() {
return names;
}





public CardInfo findCard(String setCode, String cardNumber) {
try {
QueryBuilder<CardInfo, Object> queryBuilder = cardDao.queryBuilder();
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.24</version>
<version>1.4.25</version>
<packaging>pom</packaging>
<name>Mage Root</name>
<description>Mage Root POM</description>
Expand Down Expand Up @@ -84,7 +84,7 @@
</repositories>

<properties>
<mage-version>1.4.24</mage-version>
<mage-version>1.4.25</mage-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down

0 comments on commit fe2ee5d

Please sign in to comment.