github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-13 03:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
drmDev 2016-04-09 04:23:04 -04:00
commit 214453ee58
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/mage/utils/MageVersion.java
View file

@ -41,7 +41,7 @@ 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 = 10;
public final static String MAGE_VERSION_MINOR_PATCH = "v0";
public final static String MAGE_VERSION_MINOR_PATCH = "v1";
public final static String MAGE_VERSION_INFO = "";
private final int major;

2
Mage/src/main/java/mage/cards/repository/CardRepository.java
View file

@ -63,7 +63,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 43;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 51;
private static final long CARD_CONTENT_VERSION = 52;
private final Random random = new Random();
private Dao<CardInfo, Object> cardDao;

4
Utils/release/getting_implemented_cards.txt
View file

@ -75,6 +75,10 @@ git log ce54eaadfea7d42d20e43079bbfec4022f2211e3..head --diff-filter=A --name-st
since 1.4.10v0
git log 993b167648f80591a6e02426d303c82b15dbb088..head --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
since 1.4.10v1
git log cb4f94fe67ece625d3fb0e35a38cf7901fd8be5c..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