From c4d45e6d9d450d346cb397d6f39253cfebba2082 Mon Sep 17 00:00:00 2001
From: RobotHanzo <36107150+RobotHanzo@users.noreply.github.com>
Date: Sat, 31 Oct 2020 13:59:02 +0800
Subject: Re-fix broken lapis minion sub-IDs

The fix previously got broken by #293 because of their outdated branch and didn't noticed my the merger when merging, thus this change resubmitted
---
 items/LAPIS_GENERATOR_1.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/items/LAPIS_GENERATOR_1.json b/items/LAPIS_GENERATOR_1.json
index 7ccd5bfb..37c3f4f5 100644
--- a/items/LAPIS_GENERATOR_1.json
+++ b/items/LAPIS_GENERATOR_1.json
@@ -14,15 +14,15 @@
     "§7Max Storage: §e64"
   ],
   "recipe": {
-    "A1": "INK_SACK:4:32",
-    "A2": "INK_SACK:4:32",
-    "A3": "INK_SACK:4:32",
-    "B1": "INK_SACK:4:32",
+    "A1": "INK_SACK-4:32",
+    "A2": "INK_SACK-4:32",
+    "A3": "INK_SACK-4:32",
+    "B1": "INK_SACK-4:32",
     "B2": "WOOD_PICKAXE:1",
-    "B3": "INK_SACK:4:32",
-    "C1": "INK_SACK:4:32",
-    "C2": "INK_SACK:4:32",
-    "C3": "INK_SACK:4:32"
+    "B3": "INK_SACK-4:32",
+    "C1": "INK_SACK-4:32",
+    "C2": "INK_SACK-4:32",
+    "C3": "INK_SACK-4:32"
   },
   "internalname": "LAPIS_GENERATOR_1",
   "clickcommand": "viewrecipe",
@@ -31,4 +31,4 @@
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Lapis_Minion"
   ]
-}
\ No newline at end of file
+}
-- 
cgit 


From 927aeb2bad314589cedbe1820aafc48449582d69 Mon Sep 17 00:00:00 2001
From: Moulberry <james.jenour@student.scotch.wa.edu.au>
Date: Sun, 1 Nov 2020 00:18:29 +1100
Subject: disable old neuah

---
 constants/disable.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/constants/disable.json b/constants/disable.json
index 6834ca09..60f398a7 100644
--- a/constants/disable.json
+++ b/constants/disable.json
@@ -1,3 +1,4 @@
 {
-	"auctions": false
+	"auctions": true,
+	"auctions_new": false
 }
\ No newline at end of file
-- 
cgit 


From 28765eef3a239048859de6a0d96a85624969a494 Mon Sep 17 00:00:00 2001
From: Moulberry <james.jenour@student.scotch.wa.edu.au>
Date: Sun, 1 Nov 2020 00:34:48 +1100
Subject: test

---
 test.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test.txt

diff --git a/test.txt b/test.txt
new file mode 100644
index 00000000..e69de29b
-- 
cgit 


From 6bfa33cdb31ea9250df1afcef0a92c04ce551ca9 Mon Sep 17 00:00:00 2001
From: Moulberry <james.jenour@student.scotch.wa.edu.au>
Date: Sun, 1 Nov 2020 00:35:51 +1100
Subject: test2

---
 test.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 test.txt

diff --git a/test.txt b/test.txt
deleted file mode 100644
index e69de29b..00000000
-- 
cgit 


From 54f0e070d0302675177a6c6c6da16f2c2880a551 Mon Sep 17 00:00:00 2001
From: Moulberry <james.jenour@student.scotch.wa.edu.au>
Date: Sun, 1 Nov 2020 04:26:29 +1100
Subject: 1.5 ver

---
 update.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update.json b/update.json
index c2249a27..ab373e05 100644
--- a/update.json
+++ b/update.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.4-REL",
+	"version": "1.5-REL",
 	"update_msg": "§7§m§l------------------§6§l[§c§lNEU§6§l]§7§m§l------------------\n§7There is a new version of the mod out! (v{version}). Update showcase video: ",
 	"discord_link": "https://discord.gg/spr6ESn",
 	"youtube_link": "https://www.youtube.com/channel/UCPh-OKmRSS3IQi9p6YppLcw",
-- 
cgit