Merge branch 'release/3648' into develop

FAForever · Aug 13, 2015 · 8a68af2 · 8a68af2
2 parents d437545 + c543369
commit 8a68af2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,17 @@
+Patch 3648 (August 13, 2015)
+===========================
+
+Bugs
+----
+
+- ASF no longer have issues gaining targets when just given move orders
+- Satelite works with 'no-air' restriction again
+
+Enhancements
+------------
+
+- Remove 'no sc1 units' restriction that would make the game unplayable
+
 Patch 3646 (August 11, 2015)
 ===========================
 

diff --git a/lua/version.lua b/lua/version.lua
@@ -1,3 +1,3 @@
 function GetVersion()
-    return "3646"
+    return "3648"
 end
diff --git a/mod_info.lua b/mod_info.lua
@@ -3,7 +3,7 @@
 -- Documentation for the extended FAF mod_info.lua format can be found here:
 -- https://github.com/FAForever/fa/wiki/mod_info.lua-documentation
 name = "Forged Alliance Forever"
-version = 3646
+version = 3648
 _faf_modname='faf'
 copyright = "Forged Alliance Forever Community"
 description = "Forged Alliance Forever extends Forged Alliance, bringing new patches, game modes, units, ladder, and much more!"

diff --git a/readme.md b/readme.md
@@ -4,7 +4,7 @@ master|develop
  ------------ | -------------
 [![Build Status](https://travis-ci.org/FAForever/fa.svg?branch=master)](https://travis-ci.org/FAForever/fa) | [![Build Status](https://travis-ci.org/FAForever/fa.svg?branch=develop)](https://travis-ci.org/FAForever/fa)
 
-Current patch is: 3645
+Current patch is: 3648
 
 Changelog can be found [here](changelog.md).