From 947c7f0ae05a04f0ace884f5dcc55067fa913a97 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Tue, 3 Jan 2017 12:16:44 +0100
Subject: [PATCH] Bump to 1.4 & add changelog.

---
 CHANGELOG.md                                  | 33 +++++++++++++++++++
 build.gradle                                  |  2 +-
 .../com/raoulvdberge/refinedstorage/RS.java   |  2 +-
 src/main/resources/mcmod.info                 |  2 +-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f30807de..6b4e7871c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Refined Storage Changelog
 
+### 1.4
+- Added Security Manager (raoulvdberge)
+- Added Security Card (raoulvdberge)
+- Added Wireless Fluid Grid (raoulvdberge)
+- Added craft-only toggle to Exporter (raoulvdberge)
+- Added blocking mode to patterns in autocrafting (InusualZ)
+- Added Grid size toggle (stretched, small, medium, large) (raoulvdberge)
+- Added dismantling mode to the Wrench (raoulvdberge)
+- Autocrafting bugfixes (way2muchnoise)
+- Fixed Regulator mode not working (InusualZ)
+- Fixed Fluid Interface still being sided (raoulvdberge)
+- Fixed Constructor not working on Botania flowers (raoulvdberge)
+- Fixed Wireless Transmitter working even if it was disabled with redstone mode (raoulvdberge)
+- Fixed Solderer not accepting books created in an Anvil (raoulvdberge)
+- Fixed bug where network machines stopped working on chunk borders (raoulvdberge)
+- Fixed memes not working (raoulvdberge)
+- Made sure External Storage always has the correct inventory in world (raoulvdberge)
+
 ### 1.3.5
 - Fixed TPS lag on very large crafting tasks (way2muchnoise)
 - Fixed not being able to use autocrafting on some EnderIO items (way2muchnoise)
@@ -46,6 +64,21 @@
 - Removed IC2 support (raoulvdberge)
 - Removed MCMultiPart support (will be re-added as soon as MCMultiPart for MC 1.11 is available) (raoulvdberge)
 
+### 1.2.15
+- Autocrafting bugfixes (way2muchnoise)
+- Fixed Grid Filter hiding everything when 2 or more items are in it (raoulvdberge)
+
+### 1.2.14
+- Fixed server crash (way2muchnoise)
+
+### 1.2.13
+- Fixed memes not working (raoulvdberge)
+- Fixed controller causing network rebuild on every neighbor change (raoulvdberge)
+- Autocrafting bugfixes (way2muchnoise)
+- Fixed Wireless Transmitter working even if it was disabled with redstone mode (raoulvdberge)
+- Fixed Solderer not accepting books created in an Anvil (raoulvdberge)
+- Made sure External Storage always has the correct inventory in world (raoulvdberge)
+
 ### 1.2.12
 - Fixed TPS lag on very large crafting tasks (way2muchnoise)
 - Fixed not being able to use autocrafting on some EnderIO items (way2muchnoise)
diff --git a/build.gradle b/build.gradle
index f93297932..eb8f8a906 100755
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "1.3.6"
+version = "1.4"
 group = "refinedstorage"
 archivesBaseName = "refinedstorage"
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
index 7dd6ee2c3..3ae3a6f4b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
@@ -21,7 +21,7 @@ public final class RS {
     }
 
     public static final String ID = "refinedstorage";
-    public static final String VERSION = "1.3.6";
+    public static final String VERSION = "1.4";
     public static final String DEPENDENCIES = "required-after:forge@[13.19.1.2188,);";
     public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
 
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 7bb502475..3c5a0a246 100755
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
       "modid": "refinedstorage",
       "name": "Refined Storage",
       "description": "An elegant solution to your hoarding problem",
-      "version": "1.3.6",
+      "version": "1.4",
       "mcversion": "1.11",
       "url": "",
       "updateUrl": "",