aboutsummaryrefslogtreecommitdiff
path: root/items
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2020-11-13 18:34:31 -0500
committerGitHub <noreply@github.com>2020-11-13 18:34:31 -0500
commita582be1d33cb915aa5f0526f0160c35dcf10b1d7 (patch)
treeef633e59e3783951beb986e2d09a5a18a11e14df /items
parente58f92919f9e55ad06d34c5dc129ddd839d88bec (diff)
parentf8a56abfb09bfb9e9005a26ab9e42a80b30f966a (diff)
downloadNotEnoughUpdates-REPO-a582be1d33cb915aa5f0526f0160c35dcf10b1d7.tar.gz
NotEnoughUpdates-REPO-a582be1d33cb915aa5f0526f0160c35dcf10b1d7.tar.bz2
NotEnoughUpdates-REPO-a582be1d33cb915aa5f0526f0160c35dcf10b1d7.zip
Merge branch 'master' into master-patch
Diffstat (limited to 'items')
-rw-r--r--items/DUNGEON_TRAP.json2
-rw-r--r--items/GREAT_WHITE_SHARK_TOOTH.json2
-rw-r--r--items/HOLY_FRAGMENT.json2
-rw-r--r--items/INFLATABLE_JERRY.json2
-rw-r--r--items/LAPIS_CRYSTAL.json2
-rw-r--r--items/MACHINE_GUN_BOW.json2
-rw-r--r--items/MOLTEN_CUBE.json2
-rw-r--r--items/NECROMANCER_BROOCH.json2
-rw-r--r--items/NURSE_SHARK_TOOTH.json2
-rw-r--r--items/POOCH_SWORD.json3
-rw-r--r--items/PREMIUM_FLESH.json2
-rw-r--r--items/SKYBLOCK_MENU.json2
-rw-r--r--items/TIGER_SHARK_TOOTH.json2
13 files changed, 13 insertions, 14 deletions
diff --git a/items/DUNGEON_TRAP.json b/items/DUNGEON_TRAP.json
index c5a538ed..e21b186f 100644
--- a/items/DUNGEON_TRAP.json
+++ b/items/DUNGEON_TRAP.json
@@ -23,4 +23,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Trap"
]
-} \ No newline at end of file
+}
diff --git a/items/GREAT_WHITE_SHARK_TOOTH.json b/items/GREAT_WHITE_SHARK_TOOTH.json
index d6e4e7b0..f3f0aeec 100644
--- a/items/GREAT_WHITE_SHARK_TOOTH.json
+++ b/items/GREAT_WHITE_SHARK_TOOTH.json
@@ -19,4 +19,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Great_White_Shark_Tooth"
]
-} \ No newline at end of file
+}
diff --git a/items/HOLY_FRAGMENT.json b/items/HOLY_FRAGMENT.json
index 080504e8..2c69a63e 100644
--- a/items/HOLY_FRAGMENT.json
+++ b/items/HOLY_FRAGMENT.json
@@ -16,4 +16,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Dragon_Fragment"
]
-} \ No newline at end of file
+}
diff --git a/items/INFLATABLE_JERRY.json b/items/INFLATABLE_JERRY.json
index cbffe58d..23a34c2f 100644
--- a/items/INFLATABLE_JERRY.json
+++ b/items/INFLATABLE_JERRY.json
@@ -20,4 +20,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Inflatable_Jerry"
]
-} \ No newline at end of file
+}
diff --git a/items/LAPIS_CRYSTAL.json b/items/LAPIS_CRYSTAL.json
index bbf19bd4..0747b5dd 100644
--- a/items/LAPIS_CRYSTAL.json
+++ b/items/LAPIS_CRYSTAL.json
@@ -24,4 +24,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Lapis_Crystal"
]
-} \ No newline at end of file
+}
diff --git a/items/MACHINE_GUN_BOW.json b/items/MACHINE_GUN_BOW.json
index 14167e0c..87577460 100644
--- a/items/MACHINE_GUN_BOW.json
+++ b/items/MACHINE_GUN_BOW.json
@@ -28,4 +28,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Machine_Gun_Bow"
]
-} \ No newline at end of file
+}
diff --git a/items/MOLTEN_CUBE.json b/items/MOLTEN_CUBE.json
index f13a135d..0a6d18f1 100644
--- a/items/MOLTEN_CUBE.json
+++ b/items/MOLTEN_CUBE.json
@@ -29,4 +29,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Molten_Cube"
]
-} \ No newline at end of file
+}
diff --git a/items/NECROMANCER_BROOCH.json b/items/NECROMANCER_BROOCH.json
index d856fadd..77c09496 100644
--- a/items/NECROMANCER_BROOCH.json
+++ b/items/NECROMANCER_BROOCH.json
@@ -28,4 +28,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Necromancer%27s_Brooch"
]
-} \ No newline at end of file
+}
diff --git a/items/NURSE_SHARK_TOOTH.json b/items/NURSE_SHARK_TOOTH.json
index 1f1057d3..33cb114a 100644
--- a/items/NURSE_SHARK_TOOTH.json
+++ b/items/NURSE_SHARK_TOOTH.json
@@ -19,4 +19,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Nurse_Shark_Tooth"
]
-} \ No newline at end of file
+}
diff --git a/items/POOCH_SWORD.json b/items/POOCH_SWORD.json
index 268ea557..134895fe 100644
--- a/items/POOCH_SWORD.json
+++ b/items/POOCH_SWORD.json
@@ -2,7 +2,6 @@
"internalname": "POOCH_SWORD",
"itemid": "minecraft:golden_sword",
"displayname": "§6Pooch Sword",
- "clickcommand": "",
"damage": 0,
"nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+120\",1:\"§7Strength: §c+20\",2:\"§7Crit Damage: §c+50%\",3:\"\",4:\"§7Speed: §a+5\",5:\"\",6:\"§7Deal §c+1 Damage §7per §c50 max ❤§7.\",7:\"§7Receive §a-20% §7damage from wolves.\",8:\"§7Gain §c+150❁ Strength §7against wolves.\",9:\"\",10:\"§c☠ §5Requires Wolf LVL 6\",11:\"§6§lLEGENDARY SWORD\"],Name:\"§6Pooch Sword\"},ExtraAttributes:{hot_potato_count:10,hotPotatoBonus:\"STRENGTH\u003d20;DAMAGE\u003d20;\",modifier:\"spicy\",originTag:\"POOCH_SWORD\",id:\"POOCH_SWORD\",uuid:\"9ce05e48-1368-492d-9ddc-500a01e21e45\",anvil_uses:16,timestamp:\"3/19/20 9:20 AM\"}}",
"modver": "1.0.0",
@@ -36,4 +35,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Pooch_Sword"
]
-} \ No newline at end of file
+}
diff --git a/items/PREMIUM_FLESH.json b/items/PREMIUM_FLESH.json
index 328de26d..5c1b44d4 100644
--- a/items/PREMIUM_FLESH.json
+++ b/items/PREMIUM_FLESH.json
@@ -28,4 +28,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Premium_Flesh"
]
-} \ No newline at end of file
+}
diff --git a/items/SKYBLOCK_MENU.json b/items/SKYBLOCK_MENU.json
index 7c3da09d..6eb9335a 100644
--- a/items/SKYBLOCK_MENU.json
+++ b/items/SKYBLOCK_MENU.json
@@ -18,4 +18,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/SkyBlock_Menu"
]
-} \ No newline at end of file
+}
diff --git a/items/TIGER_SHARK_TOOTH.json b/items/TIGER_SHARK_TOOTH.json
index 1f4e09df..ab7edf5e 100644
--- a/items/TIGER_SHARK_TOOTH.json
+++ b/items/TIGER_SHARK_TOOTH.json
@@ -19,4 +19,4 @@
"info": [
"https://hypixel-skyblock.fandom.com/wiki/Tiger_Shark_Tooth"
]
-} \ No newline at end of file
+}