From 717951cf1d842423f74c2e7b724e709da1f7459f Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Fri, 16 Jun 2017 17:18:28 +0200
Subject: [PATCH] Change some recipes, and update Forge once more

---
 CHANGELOG.md                                  |  4 +++-
 build.gradle                                  |  2 +-
 .../com/raoulvdberge/refinedstorage/RS.java   |  2 +-
 .../recipes/crafting_monitor.json             | 19 ++++++++++--------
 .../assets/refinedstorage/recipes/grid.json   | 20 +++++++++++--------
 5 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f13e248ae..c40c82300 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,11 @@
 # Refined Storage Changelog
 
 ### 1.5.1
-- Updated Forge to 2329 (raoulvdberge)
+- Updated Forge to 2331 (raoulvdberge)
 - Re-added MCMultiPart support (raoulvdberge)
 - Added back crafting recipes (raoulvdberge)
+- Changed Grid recipe (raoulvdberge)
+- Changed Crafting Monitor recipe (raoulvdberge)
 
 ### 1.5
 - Port to Minecraft 1.12 (raoulvdberge)
diff --git a/build.gradle b/build.gradle
index 6eb8ac961..3073317f6 100755
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 minecraft {
-    version = "1.12-14.21.0.2329"
+    version = "1.12-14.21.0.2331"
     runDir = "run"
     useDepAts = true
     mappings = "snapshot_20170615"
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
index e489678a6..bbf789539 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
@@ -23,7 +23,7 @@ public final class RS {
 
     public static final String ID = "refinedstorage";
     public static final String VERSION = "1.5.1";
-    public static final String DEPENDENCIES = "required-after:forge@[14.21.0.2329,);";
+    public static final String DEPENDENCIES = "required-after:forge@[14.21.0.2331,);";
     public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
     public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update";
 
diff --git a/src/main/resources/assets/refinedstorage/recipes/crafting_monitor.json b/src/main/resources/assets/refinedstorage/recipes/crafting_monitor.json
index fa206e4ac..275a2946e 100644
--- a/src/main/resources/assets/refinedstorage/recipes/crafting_monitor.json
+++ b/src/main/resources/assets/refinedstorage/recipes/crafting_monitor.json
@@ -1,23 +1,26 @@
 {
   "type": "minecraft:crafting_shaped",
   "pattern": [
-    "EGE",
-    "GMG",
-    "EPE"
+    "PAG",
+    "EMG",
+    "PAG"
   ],
   "key": {
-    "E": {
-      "item": "refinedstorage:quartz_enriched_iron"
+    "P": {
+      "item": "#improved_processor"
+    },
+    "A": {
+      "item": "refinedstorage:pattern"
     },
     "G": {
       "type": "forge:ore_dict",
       "ore": "blockGlass"
     },
+    "E": {
+      "item": "refinedstorage:quartz_enriched_iron"
+    },
     "M": {
       "item": "refinedstorage:machine_casing"
-    },
-    "P": {
-      "item": "#improved_processor"
     }
   },
   "result": {
diff --git a/src/main/resources/assets/refinedstorage/recipes/grid.json b/src/main/resources/assets/refinedstorage/recipes/grid.json
index bb2af0ddd..d428358ee 100644
--- a/src/main/resources/assets/refinedstorage/recipes/grid.json
+++ b/src/main/resources/assets/refinedstorage/recipes/grid.json
@@ -1,25 +1,29 @@
 {
   "type": "minecraft:crafting_shaped",
   "pattern": [
-    "ECE",
-    "PMP",
-    "EDE"
+    "PCG",
+    "EMG",
+    "PDG"
   ],
   "key": {
-    "E": {
-      "item": "refinedstorage:quartz_enriched_iron"
-    },
     "P": {
       "item": "#improved_processor"
     },
     "C": {
       "item": "#construction_core"
     },
-    "D": {
-      "item": "#destruction_core"
+    "G": {
+      "type": "forge:ore_dict",
+      "ore": "blockGlass"
+    },
+    "E": {
+      "item": "refinedstorage:quartz_enriched_iron"
     },
     "M": {
       "item": "refinedstorage:machine_casing"
+    },
+    "D": {
+      "item": "#destruction_core"
     }
   },
   "result": {