From a3e70afea138a6f480115aac0b024b3a8ea801e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?=
 <Idrinth@users.noreply.github.com>
Date: Wed, 11 Jan 2017 11:18:21 +0100
Subject: [PATCH 1/2] Update core.js

making sure null being an object doesn't prevent lang from being written
---
 src/mods/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mods/core.js b/src/mods/core.js
index 1ad4515..3569d01 100644
--- a/src/mods/core.js
+++ b/src/mods/core.js
@@ -10,7 +10,7 @@ idrinth.core = {
      * @returns {Boolean}
      */
     fieldIsSetting: function ( parent, field, allowObjects ) {
-        return parent && typeof parent === 'object' && field && parent.hasOwnProperty ( field ) && ( typeof parent[field] !== 'object' || allowObjects ) && typeof parent[field] !== 'function';
+        return parent && typeof parent === 'object' && field && parent.hasOwnProperty ( field ) && ( parent[field] === null || typeof parent[field] !== 'object' || allowObjects ) && typeof parent[field] !== 'function';
     },
     ajax: {
         runHome: function ( url, success, failure, timeout, additionalHeader, isStatic ) {
@@ -160,4 +160,4 @@ idrinth.core = {
             }
         }
     }
-};
\ No newline at end of file
+};

From 4f4953b48aeed7b0ba5a310563470d2dad00123c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20B=C3=BCttner?=
 <Idrinth@users.noreply.github.com>
Date: Wed, 11 Jan 2017 11:39:56 +0100
Subject: [PATCH 2/2] Update root.scss

---
 src/root.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/root.scss b/src/root.scss
index b0aa02c..4321637 100644
--- a/src/root.scss
+++ b/src/root.scss
@@ -135,6 +135,7 @@
 
 #idrinth-controls {
     top: 5px;
+    @include z-offset(5);
     right: 5px;
     position: fixed;
 }