aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2020-10-31 13:47:38 -0400
committerGitHub <noreply@github.com>2020-10-31 13:47:38 -0400
commit7188fdf8bc58cc0c2ffeceb43af646c211186314 (patch)
tree1093f55a52a7569908782fd6d537c0c4b4b6c7bc
parent63ba167a1d31bdfefc452de23af4fc161d2b7b61 (diff)
parent54f0e070d0302675177a6c6c6da16f2c2880a551 (diff)
downloadNotEnoughUpdates-REPO-7188fdf8bc58cc0c2ffeceb43af646c211186314.tar.gz
NotEnoughUpdates-REPO-7188fdf8bc58cc0c2ffeceb43af646c211186314.tar.bz2
NotEnoughUpdates-REPO-7188fdf8bc58cc0c2ffeceb43af646c211186314.zip
Merge pull request #18 from Moulberry/master
update fork
-rw-r--r--constants/disable.json3
-rw-r--r--items/LAPIS_GENERATOR_1.json18
-rw-r--r--update.json2
3 files changed, 12 insertions, 11 deletions
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
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
+}
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",