From 74a9500161cfee6d45a4dafce031ceab36366d26 Mon Sep 17 00:00:00 2001
From: Tim Conkling <tconkling@gmail.com>
Date: Sat, 25 Apr 2015 18:30:40 -0700
Subject: [PATCH] Bump our version to 1.4; depend on Starling 1.6

---
 CHANGELOG.md             | 16 ++++++++++++++++
 demo/pom.xml             |  4 ++--
 exporter/etc/airdesc.xml |  2 +-
 exporter/pom.xml         |  4 ++--
 runtime/pom.xml          |  4 ++--
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83d8a7c..7293e3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 Flump: Changelog
 ================
 
+version 1.4 - 2015-04-25
+------------------------
+
+Runtime:
+- License changed to ever-so-slightly more permissive MIT (from BSD)
+
+Exporter:
+- added: "Combine" project option. This lets you combine a project's output into a single texture atlas/JSON combo, which is especially useful for mobile games, where avoiding GPU state changes can result in much better performance. (Thanks, Nathan Curtis.)
+
+* added: Mac command line exporting. There's a bash script in the Exporter's rsrc/ directory that launches Flump and exports the given .flump project, so Flump can be part of your automated build process. (Thanks, Nathan Curtis.)
+
+* added: The "additionalScaleFactors" project setting is replaced with "scaleFactors." This allows you to, e.g., just export @2X textures without getting 1X textures as well. (Thanks, Nathan Curtis.)
+
+* updated: Use the MaxRect algorithm for texture packing. This speeds up the export process a bit. (Thanks, matyasatfp.)
+
+
 version 1.3 - 2014-02-08
 ------------------------
 
diff --git a/demo/pom.xml b/demo/pom.xml
index 41b6121..de45cfe 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -4,13 +4,13 @@
   <groupId>com.threerings.flump</groupId>
   <artifactId>flump-demo</artifactId>
   <packaging>swf</packaging>
-  <version>1.4-SNAPSHOT</version>
+  <version>1.4</version>
   <repositories/>
   <dependencies>
     <dependency>
       <groupId>com.threerings.flump</groupId>
       <artifactId>flump-runtime</artifactId>
-      <version>1.4-SNAPSHOT</version>
+      <version>1.4</version>
       <type>swc</type>
     </dependency>
   </dependencies>
diff --git a/exporter/etc/airdesc.xml b/exporter/etc/airdesc.xml
index 0d2594a..657e1df 100644
--- a/exporter/etc/airdesc.xml
+++ b/exporter/etc/airdesc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application xmlns="http://ns.adobe.com/air/application/3.9">
   <id>flump</id>
-  <versionNumber>1.3</versionNumber>
+  <versionNumber>1.4</versionNumber>
   <filename>Flump</filename>
   <initialWindow>
     <renderMode>direct</renderMode>
diff --git a/exporter/pom.xml b/exporter/pom.xml
index a043f8e..1abb45e 100644
--- a/exporter/pom.xml
+++ b/exporter/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.threerings.flump</groupId>
   <artifactId>flump-exporter</artifactId>
   <packaging>swc</packaging>
-  <version>1.4-SNAPSHOT</version>
+  <version>1.4</version>
   <repositories>
     <repository>
       <id>tconkling</id>
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>com.threerings.flump</groupId>
       <artifactId>flump-runtime</artifactId>
-      <version>1.4-SNAPSHOT</version>
+      <version>1.4</version>
       <type>swc</type>
     </dependency>
     <dependency>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 1ba383b..4cc7098 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.threerings.flump</groupId>
   <artifactId>flump-runtime</artifactId>
   <packaging>swc</packaging>
-  <version>1.4-SNAPSHOT</version>
+  <version>1.4</version>
   <repositories>
     <repository>
       <id>tconkling</id>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.gamua</groupId>
       <artifactId>starling-framework</artifactId>
-      <version>1.4.1</version>
+      <version>1.6</version>
       <type>swc</type>
     </dependency>
     <dependency>