external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 01:38:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Preparing Forge for Android release 1.6.43.001 [incremental]

See merge request core-developers/forge!5065
This commit is contained in:
Michael Kamensky
2021-07-19 04:57:07 +00:00
parent 959ed6ed23 9eaa836e7d
commit c7bad2bbd8
12 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-ai</artifactId> <artifactId>forge-ai</artifactId>

2
forge-core/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-core</artifactId> <artifactId>forge-core</artifactId>

2
forge-game/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-game</artifactId> <artifactId>forge-game</artifactId>

4
forge-gui-android/pom.xml
View File

@@ -6,7 +6,7 @@
<packaging.type>jar</packaging.type> <packaging.type>jar</packaging.type>
<build.min.memory>-Xms1024m</build.min.memory> <build.min.memory>-Xms1024m</build.min.memory>
<build.max.memory>-Xmx1536m</build.max.memory> <build.max.memory>-Xmx1536m</build.max.memory>
<alpha-version>1.6.42.001</alpha-version> <alpha-version>1.6.43.001</alpha-version>
<sign.keystore>keystore</sign.keystore> <sign.keystore>keystore</sign.keystore>
<sign.alias>alias</sign.alias> <sign.alias>alias</sign.alias>
<sign.storepass>storepass</sign.storepass> <sign.storepass>storepass</sign.storepass>
@@ -19,7 +19,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-gui-android</artifactId> <artifactId>forge-gui-android</artifactId>

2
forge-gui-desktop/pom.xml
View File

@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-gui-desktop</artifactId> <artifactId>forge-gui-desktop</artifactId>

4
forge-gui-ios/pom.xml
View File

@@ -6,13 +6,13 @@
<packaging.type>jar</packaging.type> <packaging.type>jar</packaging.type>
<build.min.memory>-Xms128m</build.min.memory> <build.min.memory>-Xms128m</build.min.memory>
<build.max.memory>-Xmx2048m</build.max.memory> <build.max.memory>-Xmx2048m</build.max.memory>
<alpha-version>1.6.42.001</alpha-version> <alpha-version>1.6.43.001</alpha-version>
</properties> </properties>
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-gui-ios</artifactId> <artifactId>forge-gui-ios</artifactId>

2
forge-gui-mobile-dev/pom.xml
View File

@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-gui-mobile-dev</artifactId> <artifactId>forge-gui-mobile-dev</artifactId>

2
forge-gui-mobile/pom.xml
View File

@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-gui-mobile</artifactId> <artifactId>forge-gui-mobile</artifactId>

2
forge-gui-mobile/src/forge/Forge.java
View File

@@ -46,7 +46,7 @@ import forge.util.Localizer;
import forge.util.Utils; import forge.util.Utils;
public class Forge implements ApplicationListener { public class Forge implements ApplicationListener {
public static final String CURRENT_VERSION = "1.6.42.001"; public static final String CURRENT_VERSION = "1.6.43.001";
private static final ApplicationListener app = new Forge(); private static final ApplicationListener app = new Forge();
private static Clipboard clipboard; private static Clipboard clipboard;

2
forge-gui/pom.xml
View File

@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-gui</artifactId> <artifactId>forge-gui</artifactId>

2
forge-lda/pom.xml
View File

@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-lda</artifactId> <artifactId>forge-lda</artifactId>

2
pom.xml
View File

@@ -5,7 +5,7 @@
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Forge Parent</name> <name>Forge Parent</name>
<version>1.6.43-SNAPSHOT</version> <version>1.6.44-SNAPSHOT</version>
<description> <description>
Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules. Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules.