Merge branch 'master' into 'master'

Preparing Forge for Android publish 1.6.19.002 [hotfix].

See merge request core-developers/forge!1200
This commit is contained in:
Michael Kamensky
2018-12-09 14:19:30 +00:00
3 changed files with 3 additions and 3 deletions

View File

@@ -6,7 +6,7 @@
<packaging.type>jar</packaging.type>
<build.min.memory>-Xms1024m</build.min.memory>
<build.max.memory>-Xmx1536m</build.max.memory>
<alpha-version>1.6.19.001</alpha-version>
<alpha-version>1.6.19.002</alpha-version>
<sign.keystore>keystore</sign.keystore>
<sign.alias>alias</sign.alias>
<sign.storepass>storepass</sign.storepass>

View File

@@ -6,7 +6,7 @@
<packaging.type>jar</packaging.type>
<build.min.memory>-Xms128m</build.min.memory>
<build.max.memory>-Xmx2048m</build.max.memory>
<alpha-version>1.6.19.001</alpha-version>
<alpha-version>1.6.19.002</alpha-version>
</properties>
<parent>

View File

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