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

Merge branch 'master' into 'master'

Browse Source 
Preparing Forge for Android publish 1.6.28.001.

See merge request core-developers/forge!2093
This commit is contained in:
Michael Kamensky
2019-09-06 05:13:14 +00:00
parent 632c4c2503 21af87b906
commit 2049da3fc1
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-ai/src/main/java/forge/ai/ability/AttachAi.java
View File

@@ -1212,10 +1212,10 @@ public class AttachAi extends SpellAbilityAi {
if (isUsefulAttachKeyword(keyword, c, sa, pow)) { if (isUsefulAttachKeyword(keyword, c, sa, pow)) {
return true; return true;
} }
if (c.hasKeyword(Keyword.INFECT) && pow >= 2) { }
// consider +2 power a significant bonus on Infect creatures if (c.hasKeyword(Keyword.INFECT) && pow >= 2) {
return true; // consider +2 power a significant bonus on Infect creatures
} return true;
} }
return false; return false;
} }

2
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.27.001</alpha-version> <alpha-version>1.6.28.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>

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

@@ -6,7 +6,7 @@
<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.27.001</alpha-version> <alpha-version>1.6.28.001</alpha-version>
</properties> </properties>
<parent> <parent>

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

@@ -34,7 +34,7 @@ import java.util.List;
import java.util.Stack; import java.util.Stack;
public class Forge implements ApplicationListener { public class Forge implements ApplicationListener {
public static final String CURRENT_VERSION = "1.6.27.001"; public static final String CURRENT_VERSION = "1.6.28.001";
private static final ApplicationListener app = new Forge(); private static final ApplicationListener app = new Forge();
private static Clipboard clipboard; private static Clipboard clipboard;