Merge branch '1.14-dev' into 1.14

97 files changed, 960 insertions, 50 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35f13813f..66a4b2643 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 View full changelog [here](https://github.com/shedaniel/RoughlyEnoughItems/blob/1.14/CHANGELOG.md).
+## v2.9-beta+build.109 (BETA)
+- Fixed [#92](https://github.com/shedaniel/RoughlyEnoughItems/issues/92): Make REI Buttons use an extra sheet
+- Adds: Support for `{item_name}` in cheating items for getting the path of the item identifier
 ## v2.9-beta+build.108 (BETA)
 - Fixed [#88](https://github.com/shedaniel/RoughlyEnoughItems/issues/88): Stupid Item Search
 ## v2.9-beta+build.107 (BETA)
diff --git a/build.gradle b/build.gradle
index a9a04feed..66ca0e783 100755
--- a/build.gradle
+++ b/build.gradle
@@ -50,21 +50,21 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_version}"
     modCompile "net.fabricmc:fabric-loader:${project.fabricloader_version}"
-    modCompile "net.fabricmc:fabric:${project.fabric_version}"
-//    modCompile "net.fabricmc.fabric-api:fabric-keybindings:${project.fabric_keybindings}"
-//    modCompile "net.fabricmc.fabric-api:fabric-lib:${project.fabric_lib}"
-//    modCompile "net.fabricmc.fabric-api:fabric-networking:${project.fabric_networking}"
-//    modCompile "net.fabricmc.fabric-api:fabric-events-lifecycle:${project.fabric_events_lifecycle}"
-//    modCompile "net.fabricmc.fabric-api:fabric-resource-loader:${project.fabric_resource_loader}"
+//    modCompile "net.fabricmc:fabric:${project.fabric_version}"
+    modCompile "net.fabricmc.fabric-api:fabric-keybindings:${project.fabric_keybindings}"
+    modCompile "net.fabricmc.fabric-api:fabric-lib:${project.fabric_lib}"
+    modCompile "net.fabricmc.fabric-api:fabric-networking:${project.fabric_networking}"
+    modCompile "net.fabricmc.fabric-api:fabric-events-lifecycle:${project.fabric_events_lifecycle}"
+    modCompile "net.fabricmc.fabric-api:fabric-resource-loader:${project.fabric_resource_loader}"
     modCompile "cloth:ClothEvents:${cloth_events_version}"
     modCompile "cloth-config:ClothConfig:${cloth_config_version}"
     if (includeDep) {
-        include "net.fabricmc:fabric:${project.fabric_version}"
-//        include "net.fabricmc.fabric-api:fabric-keybindings:${project.fabric_keybindings}"
-//        include "net.fabricmc.fabric-api:fabric-lib:${project.fabric_lib}"
-//        include "net.fabricmc.fabric-api:fabric-networking:${project.fabric_networking}"
-//        include "net.fabricmc.fabric-api:fabric-events-lifecycle:${project.fabric_events_lifecycle}"
-//        include "net.fabricmc.fabric-api:fabric-resource-loader:${project.fabric_resource_loader}"
+//        include "net.fabricmc:fabric:${project.fabric_version}"
+        include "net.fabricmc.fabric-api:fabric-keybindings:${project.fabric_keybindings}"
+        include "net.fabricmc.fabric-api:fabric-lib:${project.fabric_lib}"
+        include "net.fabricmc.fabric-api:fabric-networking:${project.fabric_networking}"
+        include "net.fabricmc.fabric-api:fabric-events-lifecycle:${project.fabric_events_lifecycle}"
+        include "net.fabricmc.fabric-api:fabric-resource-loader:${project.fabric_resource_loader}"
         include "cloth:ClothEvents:${cloth_events_version}"
         include "cloth-config:ClothConfig:${cloth_config_version}"
     }
diff --git a/gradle.properties b/gradle.properties
index 5c886bcf7..ab4d7e811 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-mod_version=2.9-beta+build.108
+mod_version=2.9-beta+build.109
 minecraft_version=1.14
 yarn_version=1.14+build.5
 fabricloader_version=0.4.6+build.141
@@ -8,8 +8,8 @@ cloth_config_version=0.2.1.14
 modmenu_version=1.4.0-71
 fabric_version=0.2.7+build.127
 
-fabric_keybindings=0.1.0
-fabric_lib=0.1.0
-fabric_networking=0.1.0
-fabric_events_lifecycle=0.1.0
-fabric_resource_loader=0.1.0
+fabric_keybindings=0.1.0+93af775a
+fabric_lib=0.1.0+93af775a
+fabric_networking=0.1.0+93af775a
+fabric_events_lifecycle=0.1.0+93af775a
+fabric_resource_loader=0.1.0+93af775a
diff --git a/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java b/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java
index 36d56329d..fb1334989 100644
--- a/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java
+++ b/src/main/java/com/zeitheron/hammercore/client/utils/Scissors.java
@@ -11,10 +11,21 @@ import org.lwjgl.opengl.GL11;
  * @author Zeitheron
  */
 public class Scissors {
+    /**
+     * Starts the scissor test
+     */
     public static void begin() {
         GL11.glEnable(GL11.GL_SCISSOR_TEST);
     }
     
+    /**
+     * Setup the scissor bounds
+     *
+     * @param x      the top left x coordinates
+     * @param y      the top left y coordinates
+     * @param width  the width of the bounds
+     * @param height the height of the bounds
+     */
     public static void scissor(int x, int y, int width, int height) {
         Window window = MinecraftClient.getInstance().window;
         
@@ -32,6 +43,9 @@ public class Scissors {
         GL11.glScissor(x, sh - height - y, width, height);
     }
     
+    /**
+     * Stops the scissor test
+     */
     public static void end() {
         GL11.glDisable(GL11.GL_SCISSOR_TEST);
     }
diff --git a/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java b/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java
index 557336173..3d329531c 100644
--- a/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java
+++ b/<