repush

roracle · May 29, 2021 · 5a0947f · 5a0947f
1 parent 9e9aefe
commit 5a0947f
Show file tree

Hide file tree

Showing 2,295 changed files with 84,436 additions and 26,314 deletions.
diff --git a/README.md b/README.md
@@ -16,3 +16,31 @@ Screenshots:
 
 ![a](https://i.ibb.co/VL235dJ/a.png)![b](https://i.ibb.co/bXnb6dR/b.png)
 ![c](https://i.ibb.co/cc4fJ2K/c.png)![d](https://i.ibb.co/8KhwqVJ/d.png)
+
+# Magic Resource Pack
+
+This RP is meant for use with the Magic Bukkit plugin:
+
+https://github.com/elBukkit/MagicPlugin/wiki
+
+## RP Credits
+
+- 3D Artists:
+  - RealFlamegirl (Discord flame#0464)
+  - Dr00bles
+  - Phantom
+  - Night
+  - Toffy
+  - Lix3nn (https://sketchfab.com/Lix3nn/models)
+  - VelVoxel Raptor (https://www.youtube.com/watch?v=5QId3rMv89o)
+- 2D Artists:
+  - realflamegirl (Discord flame#0464)
+  - Dr00bles
+  - eleazzaar
+  - Claire Meyers (https://www.behance.net/gallery/18354273/D-D-Class-Icon-System)
+  - https://vectorified.com/download-image#rpg-icon-1.png
+  - Forrest Imel (https://www.unrealengine.com/marketplace/150-fantasy-spell-icons-pack)
+  - MutimEndymion
+- Sound Effects:
+  - Dr00bles
+  - S-Toad (Flute samples for Ocarina)
diff --git a/LICENSE → SF-resources-main/LICENSE b/LICENSE → SF-resources-main/LICENSE
diff --git a/SF-resources-main/README.md b/SF-resources-main/README.md
@@ -0,0 +1,18 @@
+# SF-resources
+Data from RaulH22 and some from the (not) official Slimefun Resource Pack repo.
+
+This is for use on various servers, and if you would like your addon to be included, provide some graphics to be used or put in a request.  Requests might take longer than providing them yourself, as we try to focus on the Mine Struggle server.
+
+This is a labor of love, and is licensed under the GPL version 2, but the main branch will seek to comply with compatibility standards of GPL3 so it works in the future.
+
+This resource pack does NOT require Optifine.
+
+SERVER OWNERS:
+Place the item-models.yml file in your <serverroot>/plugins/slimefun/ directory, and overwrite the default one, then restart your server.  This is for Spigot based servers (including Paper and the likes) only.
+
+Use at your own risk, but I can honestly say it's working pretty well so far.
+
+Screenshots:
+
+![a](https://i.ibb.co/VL235dJ/a.png)![b](https://i.ibb.co/bXnb6dR/b.png)
+![c](https://i.ibb.co/cc4fJ2K/c.png)![d](https://i.ibb.co/8KhwqVJ/d.png)
diff --git a/...minecraft/models/item/activator_rail.json → ...minecraft/models/item/activator_rail.json b/...minecraft/models/item/activator_rail.json → ...minecraft/models/item/activator_rail.json
diff --git a/SF-resources-main/assets/minecraft/models/item/anvil.json b/SF-resources-main/assets/minecraft/models/item/anvil.json
diff --git a/...models/item/black_stained_glass_pane.json → ...models/item/black_stained_glass_pane.json b/...models/item/black_stained_glass_pane.json → ...models/item/black_stained_glass_pane.json
diff --git a/SF-resources-main/assets/minecraft/models/item/bone_meal.json b/SF-resources-main/assets/minecraft/models/item/bone_meal.json
diff --git a/SF-resources-main/assets/minecraft/models/item/book.json b/SF-resources-main/assets/minecraft/models/item/book.json
diff --git a/SF-resources-main/assets/minecraft/models/item/bow.json b/SF-resources-main/assets/minecraft/models/item/bow.json
diff --git a/.../minecraft/models/item/bow_pulling_0.json → .../minecraft/models/item/bow_pulling_0.json b/.../minecraft/models/item/bow_pulling_0.json → .../minecraft/models/item/bow_pulling_0.json
diff --git a/.../minecraft/models/item/bow_pulling_1.json → .../minecraft/models/item/bow_pulling_1.json b/.../minecraft/models/item/bow_pulling_1.json → .../minecraft/models/item/bow_pulling_1.json
diff --git a/.../minecraft/models/item/bow_pulling_2.json → .../minecraft/models/item/bow_pulling_2.json b/.../minecraft/models/item/bow_pulling_2.json → .../minecraft/models/item/bow_pulling_2.json
diff --git a/SF-resources-main/assets/minecraft/models/item/bowl.json b/SF-resources-main/assets/minecraft/models/item/bowl.json
diff --git a/SF-resources-main/assets/minecraft/models/item/brick.json b/SF-resources-main/assets/minecraft/models/item/brick.json
diff --git a/SF-resources-main/assets/minecraft/models/item/bucket.json b/SF-resources-main/assets/minecraft/models/item/bucket.json
diff --git a/assets/minecraft/models/item/cauldron.json → ...ssets/minecraft/models/item/cauldron.json b/assets/minecraft/models/item/cauldron.json → ...ssets/minecraft/models/item/cauldron.json
diff --git a/SF-resources-main/assets/minecraft/models/item/chest.json b/SF-resources-main/assets/minecraft/models/item/chest.json
diff --git a/SF-resources-main/assets/minecraft/models/item/comparator.json b/SF-resources-main/assets/minecraft/models/item/comparator.json
diff --git a/...ts/minecraft/models/item/cooked_beef.json → ...ts/minecraft/models/item/cooked_beef.json b/...ts/minecraft/models/item/cooked_beef.json → ...ts/minecraft/models/item/cooked_beef.json
diff --git a/...minecraft/models/item/cooked_chicken.json → ...minecraft/models/item/cooked_chicken.json b/...minecraft/models/item/cooked_chicken.json → ...minecraft/models/item/cooked_chicken.json
diff --git a/assets/minecraft/models/item/cooked_cod.json → ...ets/minecraft/models/item/cooked_cod.json b/assets/minecraft/models/item/cooked_cod.json → ...ets/minecraft/models/item/cooked_cod.json
diff --git a/SF-resources-main/assets/minecraft/models/item/cooked_mutton.json b/SF-resources-main/assets/minecraft/models/item/cooked_mutton.json
diff --git a/...inecraft/models/item/cooked_porkchop.json → ...inecraft/models/item/cooked_porkchop.json b/...inecraft/models/item/cooked_porkchop.json → ...inecraft/models/item/cooked_porkchop.json
diff --git a/.../minecraft/models/item/cooked_rabbit.json → .../minecraft/models/item/cooked_rabbit.json b/.../minecraft/models/item/cooked_rabbit.json → .../minecraft/models/item/cooked_rabbit.json
diff --git a/SF-resources-main/assets/minecraft/models/item/cookie.json b/SF-resources-main/assets/minecraft/models/item/cookie.json
diff --git a/SF-resources-main/assets/minecraft/models/item/crafting_table.json b/SF-resources-main/assets/minecraft/models/item/crafting_table.json
diff --git a/SF-resources-main/assets/minecraft/models/item/diamond.json b/SF-resources-main/assets/minecraft/models/item/diamond.json
diff --git a/SF-resources-main/assets/minecraft/models/item/diamond_axe.json b/SF-resources-main/assets/minecraft/models/item/diamond_axe.json
diff --git a/SF-resources-main/assets/minecraft/models/item/diamond_hoe.json b/SF-resources-main/assets/minecraft/models/item/diamond_hoe.json
diff --git a/...inecraft/models/item/diamond_pickaxe.json → ...inecraft/models/item/diamond_pickaxe.json b/...inecraft/models/item/diamond_pickaxe.json → ...inecraft/models/item/diamond_pickaxe.json
diff --git a/...minecraft/models/item/diamond_shovel.json → ...minecraft/models/item/diamond_shovel.json b/...minecraft/models/item/diamond_shovel.json → ...minecraft/models/item/diamond_shovel.json
diff --git a/SF-resources-main/assets/minecraft/models/item/diamond_sword.json b/SF-resources-main/assets/minecraft/models/item/diamond_sword.json
diff --git a/assets/minecraft/models/item/dispenser.json → ...sets/minecraft/models/item/dispenser.json b/assets/minecraft/models/item/dispenser.json → ...sets/minecraft/models/item/dispenser.json
diff --git a/assets/minecraft/models/item/dropper.json → ...assets/minecraft/models/item/dropper.json b/assets/minecraft/models/item/dropper.json → ...assets/minecraft/models/item/dropper.json
diff --git a/SF-resources-main/assets/minecraft/models/item/emerald.json b/SF-resources-main/assets/minecraft/models/item/emerald.json
diff --git a/SF-resources-main/assets/minecraft/models/item/enchanted_book.json b/SF-resources-main/assets/minecraft/models/item/enchanted_book.json
diff --git a/...necraft/models/item/enchanting_table.json → ...necraft/models/item/enchanting_table.json b/...necraft/models/item/enchanting_table.json → ...necraft/models/item/enchanting_table.json
diff --git a/SF-resources-main/assets/minecraft/models/item/ender_eye.json b/SF-resources-main/assets/minecraft/models/item/ender_eye.json
diff --git a/SF-resources-main/assets/minecraft/models/item/feather.json b/SF-resources-main/assets/minecraft/models/item/feather.json
diff --git a/SF-resources-main/assets/minecraft/models/item/firework_star.json b/SF-resources-main/assets/minecraft/models/item/firework_star.json
diff --git a/SF-resources-main/assets/minecraft/models/item/flint.json b/SF-resources-main/assets/minecraft/models/item/flint.json
diff --git a/assets/minecraft/models/item/furnace.json → ...assets/minecraft/models/item/furnace.json b/assets/minecraft/models/item/furnace.json → ...assets/minecraft/models/item/furnace.json
diff --git a/assets/minecraft/models/item/glass.json → ...n/assets/minecraft/models/item/glass.json b/assets/minecraft/models/item/glass.json → ...n/assets/minecraft/models/item/glass.json
diff --git a/SF-resources-main/assets/minecraft/models/item/glass_bottle.json b/SF-resources-main/assets/minecraft/models/item/glass_bottle.json
diff --git a/SF-resources-main/assets/minecraft/models/item/glass_pane.json b/SF-resources-main/assets/minecraft/models/item/glass_pane.json
diff --git a/SF-resources-main/assets/minecraft/models/item/glowstone_dust.json b/SF-resources-main/assets/minecraft/models/item/glowstone_dust.json
diff --git a/assets/minecraft/models/item/gold_block.json → ...ets/minecraft/models/item/gold_block.json b/assets/minecraft/models/item/gold_block.json → ...ets/minecraft/models/item/gold_block.json
diff --git a/SF-resources-main/assets/minecraft/models/item/gold_ingot.json b/SF-resources-main/assets/minecraft/models/item/gold_ingot.json
diff --git a/...ts/minecraft/models/item/gold_nugget.json → ...ts/minecraft/models/item/gold_nugget.json b/...ts/minecraft/models/item/gold_nugget.json → ...ts/minecraft/models/item/gold_nugget.json
diff --git a/SF-resources-main/assets/minecraft/models/item/golden_pickaxe.json b/SF-resources-main/assets/minecraft/models/item/golden_pickaxe.json
diff --git a/SF-resources-main/assets/minecraft/models/item/golden_sword.json b/SF-resources-main/assets/minecraft/models/item/golden_sword.json
diff --git a/.../models/item/gray_stained_glass_pane.json → .../models/item/gray_stained_glass_pane.json b/.../models/item/gray_stained_glass_pane.json → .../models/item/gray_stained_glass_pane.json
diff --git a/SF-resources-main/assets/minecraft/models/item/gunpowder.json b/SF-resources-main/assets/minecraft/models/item/gunpowder.json
diff --git a/SF-resources-main/assets/minecraft/models/item/hopper.json b/SF-resources-main/assets/minecraft/models/item/hopper.json
diff --git a/SF-resources-main/assets/minecraft/models/item/iron_axe.json b/SF-resources-main/assets/minecraft/models/item/iron_axe.json
diff --git a/SF-resources-main/assets/minecraft/models/item/iron_ingot.json b/SF-resources-main/assets/minecraft/models/item/iron_ingot.json
diff --git a/SF-resources-main/assets/minecraft/models/item/iron_pickaxe.json b/SF-resources-main/assets/minecraft/models/item/iron_pickaxe.json
diff --git a/assets/minecraft/models/item/iron_sword.json → ...ets/minecraft/models/item/iron_sword.json b/assets/minecraft/models/item/iron_sword.json → ...ets/minecraft/models/item/iron_sword.json
diff --git a/SF-resources-main/assets/minecraft/models/item/lead.json b/SF-resources-main/assets/minecraft/models/item/lead.json
diff --git a/...models/item/light_gray_stained_glass.json → ...models/item/light_gray_stained_glass.json b/...models/item/light_gray_stained_glass.json → ...models/item/light_gray_stained_glass.json
diff --git a/.../models/item/lime_stained_glass_pane.json → .../models/item/lime_stained_glass_pane.json b/.../models/item/lime_stained_glass_pane.json → .../models/item/lime_stained_glass_pane.json
diff --git a/assets/minecraft/models/item/name_tag.json → ...ssets/minecraft/models/item/name_tag.json b/assets/minecraft/models/item/name_tag.json → ...ssets/minecraft/models/item/name_tag.json
diff --git a/SF-resources-main/assets/minecraft/models/item/nether_wart.json b/SF-resources-main/assets/minecraft/models/item/nether_wart.json
diff --git a/SF-resources-main/assets/minecraft/models/item/obsidian.json b/SF-resources-main/assets/minecraft/models/item/obsidian.json
diff --git a/SF-resources-main/assets/minecraft/models/item/paper.json b/SF-resources-main/assets/minecraft/models/item/paper.json
diff --git a/assets/minecraft/models/item/piston.json → .../assets/minecraft/models/item/piston.json b/assets/minecraft/models/item/piston.json → .../assets/minecraft/models/item/piston.json
diff --git a/...ts/minecraft/models/item/player_head.json → ...ts/minecraft/models/item/player_head.json b/...ts/minecraft/models/item/player_head.json → ...ts/minecraft/models/item/player_head.json
diff --git a/assets/minecraft/models/item/potion.json → .../assets/minecraft/models/item/potion.json b/assets/minecraft/models/item/potion.json → .../assets/minecraft/models/item/potion.json
diff --git a/...s/minecraft/models/item/powered_rail.json → ...s/minecraft/models/item/powered_rail.json b/...s/minecraft/models/item/powered_rail.json → ...s/minecraft/models/item/powered_rail.json
diff --git a/...aft/models/item/purple_stained_glass.json → ...aft/models/item/purple_stained_glass.json b/...aft/models/item/purple_stained_glass.json → ...aft/models/item/purple_stained_glass.json
diff --git a/...22/slimefun/slimefun/android/butcher.json → ...22/slimefun/slimefun/android/butcher.json b/...22/slimefun/slimefun/android/butcher.json → ...22/slimefun/slimefun/android/butcher.json
diff --git a/...h22/slimefun/slimefun/android/farmer.json → ...h22/slimefun/slimefun/android/farmer.json b/...h22/slimefun/slimefun/android/farmer.json → ...h22/slimefun/slimefun/android/farmer.json
diff --git a/.../slimefun/slimefun/android/fisherman.json → .../slimefun/slimefun/android/fisherman.json b/.../slimefun/slimefun/android/fisherman.json → .../slimefun/slimefun/android/fisherman.json
diff --git a/...efun/slimefun/android/interface_fuel.json → ...efun/slimefun/android/interface_fuel.json b/...efun/slimefun/android/interface_fuel.json → ...efun/slimefun/android/interface_fuel.json
diff --git a/...fun/slimefun/android/interface_items.json → ...fun/slimefun/android/interface_items.json b/...fun/slimefun/android/interface_items.json → ...fun/slimefun/android/interface_items.json
diff --git a/...lh22/slimefun/slimefun/android/miner.json → ...lh22/slimefun/slimefun/android/miner.json b/...lh22/slimefun/slimefun/android/miner.json → ...lh22/slimefun/slimefun/android/miner.json
diff --git a/...h22/slimefun/slimefun/android/normal.json → ...h22/slimefun/slimefun/android/normal.json b/...h22/slimefun/slimefun/android/normal.json → ...h22/slimefun/slimefun/android/normal.json
diff --git a/...slimefun/slimefun/android/woodcutter.json → ...slimefun/slimefun/android/woodcutter.json b/...slimefun/slimefun/android/woodcutter.json → ...slimefun/slimefun/android/woodcutter.json
diff --git a/...2/slimefun/slimefun/android2/butcher.json → ...2/slimefun/slimefun/android2/butcher.json b/...2/slimefun/slimefun/android2/butcher.json → ...2/slimefun/slimefun/android2/butcher.json
diff --git a/...22/slimefun/slimefun/android2/farmer.json → ...22/slimefun/slimefun/android2/farmer.json b/...22/slimefun/slimefun/android2/farmer.json → ...22/slimefun/slimefun/android2/farmer.json
diff --git a/...slimefun/slimefun/android2/fisherman.json → ...slimefun/slimefun/android2/fisherman.json b/...slimefun/slimefun/android2/fisherman.json → ...slimefun/slimefun/android2/fisherman.json
diff --git a/...h22/slimefun/slimefun/android2/miner.json → ...h22/slimefun/slimefun/android2/miner.json b/...h22/slimefun/slimefun/android2/miner.json → ...h22/slimefun/slimefun/android2/miner.json
diff --git a/...22/slimefun/slimefun/android2/normal.json → ...22/slimefun/slimefun/android2/normal.json b/...22/slimefun/slimefun/android2/normal.json → ...22/slimefun/slimefun/android2/normal.json
diff --git a/...limefun/slimefun/android2/woodcutter.json → ...limefun/slimefun/android2/woodcutter.json b/...limefun/slimefun/android2/woodcutter.json → ...limefun/slimefun/android2/woodcutter.json
diff --git a/...2/slimefun/slimefun/android3/butcher.json → ...2/slimefun/slimefun/android3/butcher.json b/...2/slimefun/slimefun/android3/butcher.json → ...2/slimefun/slimefun/android3/butcher.json
diff --git a/...22/slimefun/slimefun/android3/farmer.json → ...22/slimefun/slimefun/android3/farmer.json b/...22/slimefun/slimefun/android3/farmer.json → ...22/slimefun/slimefun/android3/farmer.json
diff --git a/...slimefun/slimefun/android3/fisherman.json → ...slimefun/slimefun/android3/fisherman.json b/...slimefun/slimefun/android3/fisherman.json → ...slimefun/slimefun/android3/fisherman.json
diff --git a/...h22/slimefun/slimefun/android3/miner.json → ...h22/slimefun/slimefun/android3/miner.json b/...h22/slimefun/slimefun/android3/miner.json → ...h22/slimefun/slimefun/android3/miner.json
diff --git a/...22/slimefun/slimefun/android3/normal.json → ...22/slimefun/slimefun/android3/normal.json b/...22/slimefun/slimefun/android3/normal.json → ...22/slimefun/slimefun/android3/normal.json
diff --git a/...limefun/slimefun/android3/woodcutter.json → ...limefun/slimefun/android3/woodcutter.json b/...limefun/slimefun/android3/woodcutter.json → ...limefun/slimefun/android3/woodcutter.json
diff --git a/...c_machines/advanced_industrial_miner.json → ...c_machines/advanced_industrial_miner.json b/...c_machines/advanced_industrial_miner.json → ...c_machines/advanced_industrial_miner.json
diff --git a/.../slimefun/basic_machines/armor_forge.json → .../slimefun/basic_machines/armor_forge.json b/.../slimefun/basic_machines/armor_forge.json → .../slimefun/basic_machines/armor_forge.json
diff --git a/...c_machines/automated_panning_machine.json → ...c_machines/automated_panning_machine.json b/...c_machines/automated_panning_machine.json → ...c_machines/automated_panning_machine.json
diff --git a/..._machines/automatic_ignition_chamber.json → ..._machines/automatic_ignition_chamber.json b/..._machines/automatic_ignition_chamber.json → ..._machines/automatic_ignition_chamber.json
diff --git a/...slimefun/basic_machines/block_placer.json → ...slimefun/basic_machines/block_placer.json b/...slimefun/basic_machines/block_placer.json → ...slimefun/basic_machines/block_placer.json
diff --git a/...sic_machines/carbonado_edged_furnace.json → ...sic_machines/carbonado_edged_furnace.json b/...sic_machines/carbonado_edged_furnace.json → ...sic_machines/carbonado_edged_furnace.json
diff --git a/...un/slimefun/basic_machines/composter.json → ...un/slimefun/basic_machines/composter.json b/...un/slimefun/basic_machines/composter.json → ...un/slimefun/basic_machines/composter.json
diff --git a/...n/slimefun/basic_machines/compressor.json → ...n/slimefun/basic_machines/compressor.json b/...n/slimefun/basic_machines/compressor.json → ...n/slimefun/basic_machines/compressor.json
diff --git a/...fun/slimefun/basic_machines/crucible.json → ...fun/slimefun/basic_machines/crucible.json b/...fun/slimefun/basic_machines/crucible.json → ...fun/slimefun/basic_machines/crucible.json
diff --git a/...ic_machines/enchanced_crafting_table.json → ...ic_machines/enchanced_crafting_table.json b/...ic_machines/enchanced_crafting_table.json → ...ic_machines/enchanced_crafting_table.json
diff --git a/...un/basic_machines/enhanced_furnace_1.json → ...un/basic_machines/enhanced_furnace_1.json b/...un/basic_machines/enhanced_furnace_1.json → ...un/basic_machines/enhanced_furnace_1.json
diff --git a/...n/basic_machines/enhanced_furnace_10.json → ...n/basic_machines/enhanced_furnace_10.json b/...n/basic_machines/enhanced_furnace_10.json → ...n/basic_machines/enhanced_furnace_10.json
diff --git a/...n/basic_machines/enhanced_furnace_11.json → ...n/basic_machines/enhanced_furnace_11.json b/...n/basic_machines/enhanced_furnace_11.json → ...n/basic_machines/enhanced_furnace_11.json
diff --git a/...un/basic_machines/enhanced_furnace_2.json → ...un/basic_machines/enhanced_furnace_2.json b/...un/basic_machines/enhanced_furnace_2.json → ...un/basic_machines/enhanced_furnace_2.json
diff --git a/...un/basic_machines/enhanced_furnace_3.json → ...un/basic_machines/enhanced_furnace_3.json b/...un/basic_machines/enhanced_furnace_3.json → ...un/basic_machines/enhanced_furnace_3.json
diff --git a/...un/basic_machines/enhanced_furnace_4.json → ...un/basic_machines/enhanced_furnace_4.json b/...un/basic_machines/enhanced_furnace_4.json → ...un/basic_machines/enhanced_furnace_4.json
diff --git a/...un/basic_machines/enhanced_furnace_5.json → ...un/basic_machines/enhanced_furnace_5.json b/...un/basic_machines/enhanced_furnace_5.json → ...un/basic_machines/enhanced_furnace_5.json
diff --git a/...un/basic_machines/enhanced_furnace_6.json → ...un/basic_machines/enhanced_furnace_6.json b/...un/basic_machines/enhanced_furnace_6.json → ...un/basic_machines/enhanced_furnace_6.json
diff --git a/...un/basic_machines/enhanced_furnace_7.json → ...un/basic_machines/enhanced_furnace_7.json b/...un/basic_machines/enhanced_furnace_7.json → ...un/basic_machines/enhanced_furnace_7.json
diff --git a/...un/basic_machines/enhanced_furnace_8.json → ...un/basic_machines/enhanced_furnace_8.json b/...un/basic_machines/enhanced_furnace_8.json → ...un/basic_machines/enhanced_furnace_8.json
diff --git a/...un/basic_machines/enhanced_furnace_9.json → ...un/basic_machines/enhanced_furnace_9.json b/...un/basic_machines/enhanced_furnace_9.json → ...un/basic_machines/enhanced_furnace_9.json
diff --git a/.../slimefun/basic_machines/grind_stone.json → .../slimefun/basic_machines/grind_stone.json b/.../slimefun/basic_machines/grind_stone.json → .../slimefun/basic_machines/grind_stone.json
diff --git a/...efun/basic_machines/industrial_miner.json → ...efun/basic_machines/industrial_miner.json b/...efun/basic_machines/industrial_miner.json → ...efun/basic_machines/industrial_miner.json
diff --git a/...mefun/slimefun/basic_machines/juicer.json → ...mefun/slimefun/basic_machines/juicer.json b/...mefun/slimefun/basic_machines/juicer.json → ...mefun/slimefun/basic_machines/juicer.json
diff --git a/...mefun/basic_machines/magic_workbench.json → ...mefun/basic_machines/magic_workbench.json b/...mefun/basic_machines/magic_workbench.json → ...mefun/basic_machines/magic_workbench.json
diff --git a/...un/basic_machines/makeshift_smeltery.json → ...un/basic_machines/makeshift_smeltery.json b/...un/basic_machines/makeshift_smeltery.json → ...un/basic_machines/makeshift_smeltery.json
diff --git a/.../slimefun/basic_machines/ore_crusher.json → .../slimefun/basic_machines/ore_crusher.json b/.../slimefun/basic_machines/ore_crusher.json → .../slimefun/basic_machines/ore_crusher.json
diff --git a/...n/slimefun/basic_machines/ore_washer.json → ...n/slimefun/basic_machines/ore_washer.json b/...n/slimefun/basic_machines/ore_washer.json → ...n/slimefun/basic_machines/ore_washer.json
diff --git a/...slimefun/basic_machines/output_chest.json → ...slimefun/basic_machines/output_chest.json b/...slimefun/basic_machines/output_chest.json → ...slimefun/basic_machines/output_chest.json
diff --git a/...efun/basic_machines/pressure_chamber.json → ...efun/basic_machines/pressure_chamber.json b/...efun/basic_machines/pressure_chamber.json → ...efun/basic_machines/pressure_chamber.json
diff --git a/...un/basic_machines/reinforced_furnace.json → ...un/basic_machines/reinforced_furnace.json b/...un/basic_machines/reinforced_furnace.json → ...un/basic_machines/reinforced_furnace.json
diff --git a/...fun/slimefun/basic_machines/smeltery.json → ...fun/slimefun/basic_machines/smeltery.json b/...fun/slimefun/basic_machines/smeltery.json → ...fun/slimefun/basic_machines/smeltery.json
diff --git a/...22/slimefun/slimefun/cargo/connector.json → ...22/slimefun/slimefun/cargo/connector.json b/...22/slimefun/slimefun/cargo/connector.json → ...22/slimefun/slimefun/cargo/connector.json
diff --git a/...aulh22/slimefun/slimefun/cargo/input.json → ...aulh22/slimefun/slimefun/cargo/input.json b/...aulh22/slimefun/slimefun/cargo/input.json → ...aulh22/slimefun/slimefun/cargo/input.json
diff --git a/...lh22/slimefun/slimefun/cargo/manager.json → ...lh22/slimefun/slimefun/cargo/manager.json b/...lh22/slimefun/slimefun/cargo/manager.json → ...lh22/slimefun/slimefun/cargo/manager.json
diff --git a/...aulh22/slimefun/slimefun/cargo/motor.json → ...aulh22/slimefun/slimefun/cargo/motor.json b/...aulh22/slimefun/slimefun/cargo/motor.json → ...aulh22/slimefun/slimefun/cargo/motor.json
diff --git a/...ulh22/slimefun/slimefun/cargo/output.json → ...ulh22/slimefun/slimefun/cargo/output.json b/...ulh22/slimefun/slimefun/cargo/output.json → ...ulh22/slimefun/slimefun/cargo/output.json
diff --git a/...lh22/slimefun/slimefun/cargo/output2.json → ...lh22/slimefun/slimefun/cargo/output2.json b/...lh22/slimefun/slimefun/cargo/output2.json → ...lh22/slimefun/slimefun/cargo/output2.json
diff --git a/...aulh22/slimefun/slimefun/cargo/trash.json → ...aulh22/slimefun/slimefun/cargo/trash.json b/...aulh22/slimefun/slimefun/cargo/trash.json → ...aulh22/slimefun/slimefun/cargo/trash.json
diff --git a/...un/slimefun/energy/auto_disenchanter.json → ...un/slimefun/energy/auto_disenchanter.json b/...un/slimefun/energy/auto_disenchanter.json → ...un/slimefun/energy/auto_disenchanter.json
diff --git a/...mefun/slimefun/energy/auto_enchanter.json → ...mefun/slimefun/energy/auto_enchanter.json b/...mefun/slimefun/energy/auto_enchanter.json → ...mefun/slimefun/energy/auto_enchanter.json
diff --git a/...un/energy/automated_crafting_chamber.json → ...un/energy/automated_crafting_chamber.json b/...un/energy/automated_crafting_chamber.json → ...un/energy/automated_crafting_chamber.json
diff --git a/...slimefun/energy/big_energy_capacitor.json → ...slimefun/energy/big_energy_capacitor.json b/...slimefun/energy/big_energy_capacitor.json → ...slimefun/energy/big_energy_capacitor.json
diff --git a/...rgy/carbonado_edged_energy_capacitor.json → ...rgy/carbonado_edged_energy_capacitor.json b/...rgy/carbonado_edged_energy_capacitor.json → ...rgy/carbonado_edged_energy_capacitor.json
diff --git a/...mefun/slimefun/energy/charging_bench.json → ...mefun/slimefun/energy/charging_bench.json b/...mefun/slimefun/energy/charging_bench.json → ...mefun/slimefun/energy/charging_bench.json
diff --git a/...mefun/slimefun/energy/coal_generator.json → ...mefun/slimefun/energy/coal_generator.json b/...mefun/slimefun/energy/coal_generator.json → ...mefun/slimefun/energy/coal_generator.json
diff --git a/...efun/slimefun/energy/coal_generator2.json → ...efun/slimefun/energy/coal_generator2.json b/...efun/slimefun/energy/coal_generator2.json → ...efun/slimefun/energy/coal_generator2.json
diff --git a/...n/slimefun/energy/combustion_reactor.json → ...n/slimefun/energy/combustion_reactor.json b/...n/slimefun/energy/combustion_reactor.json → ...n/slimefun/energy/combustion_reactor.json
diff --git a/...fun/slimefun/energy/electric_furnace.json → ...fun/slimefun/energy/electric_furnace.json b/...fun/slimefun/energy/electric_furnace.json → ...fun/slimefun/energy/electric_furnace.json
diff --git a/...un/slimefun/energy/electric_furnace2.json → ...un/slimefun/energy/electric_furnace2.json b/...un/slimefun/energy/electric_furnace2.json → ...un/slimefun/energy/electric_furnace2.json
diff --git a/...un/slimefun/energy/electric_furnace3.json → ...un/slimefun/energy/electric_furnace3.json b/...un/slimefun/energy/electric_furnace3.json → ...un/slimefun/energy/electric_furnace3.json
diff --git a/...fun/energy/electric_ingot_pulverizer.json → ...fun/energy/electric_ingot_pulverizer.json b/...fun/energy/electric_ingot_pulverizer.json → ...fun/energy/electric_ingot_pulverizer.json
diff --git a/...slimefun/energy/electric_ore_grinder.json → ...slimefun/energy/electric_ore_grinder.json b/...slimefun/energy/electric_ore_grinder.json → ...slimefun/energy/electric_ore_grinder.json
diff --git a/...limefun/energy/electric_ore_grinder2.json → ...limefun/energy/electric_ore_grinder2.json b/...limefun/energy/electric_ore_grinder2.json → ...limefun/energy/electric_ore_grinder2.json
diff --git a/...mefun/slimefun/energy/electric_press.json → ...mefun/slimefun/energy/electric_press.json b/...mefun/slimefun/energy/electric_press.json → ...mefun/slimefun/energy/electric_press.json
diff --git a/...efun/slimefun/energy/electric_press2.json → ...efun/slimefun/energy/electric_press2.json b/...efun/slimefun/energy/electric_press2.json → ...efun/slimefun/energy/electric_press2.json
diff --git a/...un/slimefun/energy/electric_smeltery.json → ...un/slimefun/energy/electric_smeltery.json b/...un/slimefun/energy/electric_smeltery.json → ...un/slimefun/energy/electric_smeltery.json
diff --git a/...n/slimefun/energy/electric_smeltery2.json → ...n/slimefun/energy/electric_smeltery2.json b/...n/slimefun/energy/electric_smeltery2.json → ...n/slimefun/energy/electric_smeltery2.json
diff --git a/...fun/slimefun/energy/energy_regulator.json → ...fun/slimefun/energy/energy_regulator.json b/...fun/slimefun/energy/energy_regulator.json → ...fun/slimefun/energy/energy_regulator.json
diff --git a/...imefun/slimefun/energy/exp_collector.json → ...imefun/slimefun/energy/exp_collector.json b/...imefun/slimefun/energy/exp_collector.json → ...imefun/slimefun/energy/exp_collector.json
diff --git a/...mefun/energy/heated_pressure_chamber.json → ...mefun/energy/heated_pressure_chamber.json b/...mefun/energy/heated_pressure_chamber.json → ...mefun/energy/heated_pressure_chamber.json
diff --git a/...efun/energy/heated_pressure_chamber2.json → ...efun/energy/heated_pressure_chamber2.json b/...efun/energy/heated_pressure_chamber2.json → ...efun/energy/heated_pressure_chamber2.json
diff --git a/...imefun/energy/large_energy_capacitor.json → ...imefun/energy/large_energy_capacitor.json b/...imefun/energy/large_energy_capacitor.json → ...imefun/energy/large_energy_capacitor.json
diff --git a/...mefun/slimefun/energy/lava_generator.json → ...mefun/slimefun/energy/lava_generator.json b/...mefun/slimefun/energy/lava_generator.json → ...mefun/slimefun/energy/lava_generator.json
diff --git a/...efun/slimefun/energy/lava_generator2.json → ...efun/slimefun/energy/lava_generator2.json b/...efun/slimefun/energy/lava_generator2.json → ...efun/slimefun/energy/lava_generator2.json
diff --git a/.../slimefun/energy/magnesium_generator.json → .../slimefun/energy/magnesium_generator.json b/.../slimefun/energy/magnesium_generator.json → .../slimefun/energy/magnesium_generator.json
diff --git a/...mefun/energy/medium_energy_capacitor.json → ...mefun/energy/medium_energy_capacitor.json b/...mefun/energy/medium_energy_capacitor.json → ...mefun/energy/medium_energy_capacitor.json
diff --git a/.../slimefun/slimefun/energy/multimeter.json → .../slimefun/slimefun/energy/multimeter.json b/.../slimefun/slimefun/energy/multimeter.json → .../slimefun/slimefun/energy/multimeter.json
diff --git a/.../slimefun/energy/nether_star_reactor.json → .../slimefun/energy/nether_star_reactor.json b/.../slimefun/energy/nether_star_reactor.json → .../slimefun/energy/nether_star_reactor.json
diff --git a/...efun/slimefun/energy/nuclear_reactor.json → ...efun/slimefun/energy/nuclear_reactor.json b/...efun/slimefun/energy/nuclear_reactor.json → ...efun/slimefun/energy/nuclear_reactor.json
diff --git a/...22/slimefun/slimefun/energy/refinery.json → ...22/slimefun/slimefun/energy/refinery.json b/...22/slimefun/slimefun/energy/refinery.json → ...22/slimefun/slimefun/energy/refinery.json
diff --git a/...imefun/energy/small_energy_capacitor.json → ...imefun/energy/small_energy_capacitor.json b/...imefun/energy/small_energy_capacitor.json → ...imefun/energy/small_energy_capacitor.json
diff --git a/...fun/slimefun/energy/wither_assembler.json → ...fun/slimefun/energy/wither_assembler.json b/...fun/slimefun/energy/wither_assembler.json → ...fun/slimefun/energy/wither_assembler.json
diff --git a/...2/slimefun/slimefun/food/apple_juice.json → ...2/slimefun/slimefun/food/apple_juice.json b/...2/slimefun/slimefun/food/apple_juice.json → ...2/slimefun/slimefun/food/apple_juice.json
diff --git a/...22/slimefun/slimefun/food/beef_jerky.json → ...22/slimefun/slimefun/food/beef_jerky.json b/...22/slimefun/slimefun/food/beef_jerky.json → ...22/slimefun/slimefun/food/beef_jerky.json
diff --git a/.../slimefun/slimefun/food/carrot_juice.json → .../slimefun/slimefun/food/carrot_juice.json b/.../slimefun/slimefun/food/carrot_juice.json → .../slimefun/slimefun/food/carrot_juice.json
diff --git a/...slimefun/slimefun/food/chicken_jerky.json → ...slimefun/slimefun/food/chicken_jerky.json b/...slimefun/slimefun/food/chicken_jerky.json → ...slimefun/slimefun/food/chicken_jerky.json
diff --git a/...2/slimefun/slimefun/food/diet_cookie.json → ...2/slimefun/slimefun/food/diet_cookie.json b/...2/slimefun/slimefun/food/diet_cookie.json → ...2/slimefun/slimefun/food/diet_cookie.json
diff --git a/...22/slimefun/slimefun/food/fish_jerky.json → ...22/slimefun/slimefun/food/fish_jerky.json b/...22/slimefun/slimefun/food/fish_jerky.json → ...22/slimefun/slimefun/food/fish_jerky.json
diff --git a/...limefun/slimefun/food/fortune_cookie.json → ...limefun/slimefun/food/fortune_cookie.json b/...limefun/slimefun/food/fortune_cookie.json → ...limefun/slimefun/food/fortune_cookie.json
diff --git a/...fun/slimefun/food/golden_apple_juice.json → ...fun/slimefun/food/golden_apple_juice.json b/...fun/slimefun/food/golden_apple_juice.json → ...fun/slimefun/food/golden_apple_juice.json
diff --git a/...2/slimefun/slimefun/food/kelp_cookie.json → ...2/slimefun/slimefun/food/kelp_cookie.json b/...2/slimefun/slimefun/food/kelp_cookie.json → ...2/slimefun/slimefun/food/kelp_cookie.json
diff --git a/...2/slimefun/slimefun/food/magic_sugar.json → ...2/slimefun/slimefun/food/magic_sugar.json b/...2/slimefun/slimefun/food/magic_sugar.json → ...2/slimefun/slimefun/food/magic_sugar.json
diff --git a/...2/slimefun/slimefun/food/melon_juice.json → ...2/slimefun/slimefun/food/melon_juice.json b/...2/slimefun/slimefun/food/melon_juice.json → ...2/slimefun/slimefun/food/melon_juice.json
diff --git a/...slimefun/slimefun/food/monster_jerky.json → ...slimefun/slimefun/food/monster_jerky.json b/...slimefun/slimefun/food/monster_jerky.json → ...slimefun/slimefun/food/monster_jerky.json
diff --git a/.../slimefun/slimefun/food/mutton_jerky.json → .../slimefun/slimefun/food/mutton_jerky.json b/.../slimefun/slimefun/food/mutton_jerky.json → .../slimefun/slimefun/food/mutton_jerky.json
diff --git a/...22/slimefun/slimefun/food/pork_jerky.json → ...22/slimefun/slimefun/food/pork_jerky.json b/...22/slimefun/slimefun/food/pork_jerky.json → ...22/slimefun/slimefun/food/pork_jerky.json
diff --git a/...slimefun/slimefun/food/pumpkin_juice.json → ...slimefun/slimefun/food/pumpkin_juice.json b/...slimefun/slimefun/food/pumpkin_juice.json → ...slimefun/slimefun/food/pumpkin_juice.json
diff --git a/.../slimefun/slimefun/food/rabbit_jerky.json → .../slimefun/slimefun/food/rabbit_jerky.json b/.../slimefun/slimefun/food/rabbit_jerky.json → .../slimefun/slimefun/food/rabbit_jerky.json
diff --git a/...efun/slimefun/food/sweet_berry_juice.json → ...efun/slimefun/food/sweet_berry_juice.json b/...efun/slimefun/food/sweet_berry_juice.json → ...efun/slimefun/food/sweet_berry_juice.json
diff --git a/...slimefun/slimefun/gps/elevator_plate.json → ...slimefun/slimefun/gps/elevator_plate.json b/...slimefun/slimefun/gps/elevator_plate.json → ...slimefun/slimefun/gps/elevator_plate.json
diff --git a/...lh22/slimefun/slimefun/gps/geo_miner.json → ...lh22/slimefun/slimefun/gps/geo_miner.json b/...lh22/slimefun/slimefun/gps/geo_miner.json → ...lh22/slimefun/slimefun/gps/geo_miner.json
diff --git a/...n/gps/gps_activation_device_personal.json → ...n/gps/gps_activation_device_personal.json b/...n/gps/gps_activation_device_personal.json → ...n/gps/gps_activation_device_personal.json
diff --git a/...fun/gps/gps_activation_device_shared.json → ...fun/gps/gps_activation_device_shared.json b/...fun/gps/gps_activation_device_shared.json → ...fun/gps/gps_activation_device_shared.json
diff --git a/...mefun/slimefun/gps/gps_control_panel.json → ...mefun/slimefun/gps/gps_control_panel.json b/...mefun/slimefun/gps/gps_control_panel.json → ...mefun/slimefun/gps/gps_control_panel.json
diff --git a/...imefun/gps/gps_emergency_transmitter.json → ...imefun/gps/gps_emergency_transmitter.json b/...imefun/gps/gps_emergency_transmitter.json → ...imefun/gps/gps_emergency_transmitter.json
diff --git a/...limefun/slimefun/gps/gps_geo_scanner.json → ...limefun/slimefun/gps/gps_geo_scanner.json b/...limefun/slimefun/gps/gps_geo_scanner.json → ...limefun/slimefun/gps/gps_geo_scanner.json
diff --git a/...h22/slimefun/slimefun/gps/gps_marker.json → ...h22/slimefun/slimefun/gps/gps_marker.json b/...h22/slimefun/slimefun/gps/gps_marker.json → ...h22/slimefun/slimefun/gps/gps_marker.json
diff --git a/...limefun/slimefun/gps/gps_transmitter.json → ...limefun/slimefun/gps/gps_transmitter.json b/...limefun/slimefun/gps/gps_transmitter.json → ...limefun/slimefun/gps/gps_transmitter.json
diff --git a/...limefun/gps/gps_transmitter_advanced.json → ...limefun/gps/gps_transmitter_advanced.json b/...limefun/gps/gps_transmitter_advanced.json → ...limefun/gps/gps_transmitter_advanced.json
diff --git a/...imefun/gps/gps_transmitter_carbonado.json → ...imefun/gps/gps_transmitter_carbonado.json b/...imefun/gps/gps_transmitter_carbonado.json → ...imefun/gps/gps_transmitter_carbonado.json
diff --git a/...imefun/gps/gps_transmitter_energized.json → ...imefun/gps/gps_transmitter_energized.json b/...imefun/gps/gps_transmitter_energized.json → ...imefun/gps/gps_transmitter_energized.json
diff --git a/...2/slimefun/slimefun/gps/nether_drill.json → ...2/slimefun/slimefun/gps/nether_drill.json b/...2/slimefun/slimefun/gps/nether_drill.json → ...2/slimefun/slimefun/gps/nether_drill.json
diff --git a/...ulh22/slimefun/slimefun/gps/oil_pump.json → ...ulh22/slimefun/slimefun/gps/oil_pump.json b/...ulh22/slimefun/slimefun/gps/oil_pump.json → ...ulh22/slimefun/slimefun/gps/oil_pump.json
diff --git a/...mefun/slimefun/gps/teleporter_matrix.json → ...mefun/slimefun/gps/teleporter_matrix.json b/...mefun/slimefun/gps/teleporter_matrix.json → ...mefun/slimefun/gps/teleporter_matrix.json
diff --git a/...imefun/slimefun/gps/teleporter_pylon.json → ...imefun/slimefun/gps/teleporter_pylon.json b/...imefun/slimefun/gps/teleporter_pylon.json → ...imefun/slimefun/gps/teleporter_pylon.json
diff --git a/...m/raulh22/slimefun/slimefun/gui/back.json → ...m/raulh22/slimefun/slimefun/gui/back.json b/...m/raulh22/slimefun/slimefun/gui/back.json → ...m/raulh22/slimefun/slimefun/gui/back.json
diff --git a/...h22/slimefun/slimefun/gui/background.json → ...h22/slimefun/slimefun/gui/background.json b/...h22/slimefun/slimefun/gui/background.json → ...h22/slimefun/slimefun/gui/background.json
diff --git a/...m/raulh22/slimefun/slimefun/gui/menu.json → ...m/raulh22/slimefun/slimefun/gui/menu.json b/...m/raulh22/slimefun/slimefun/gui/menu.json → ...m/raulh22/slimefun/slimefun/gui/menu.json
diff --git a/...22/slimefun/slimefun/gui/next_active.json → ...22/slimefun/slimefun/gui/next_active.json b/...22/slimefun/slimefun/gui/next_active.json → ...22/slimefun/slimefun/gui/next_active.json
diff --git a/.../slimefun/slimefun/gui/next_inactive.json → .../slimefun/slimefun/gui/next_inactive.json b/.../slimefun/slimefun/gui/next_inactive.json → .../slimefun/slimefun/gui/next_inactive.json
diff --git a/...limefun/slimefun/gui/previous_active.json → ...limefun/slimefun/gui/previous_active.json b/...limefun/slimefun/gui/previous_active.json → ...limefun/slimefun/gui/previous_active.json
diff --git a/...mefun/slimefun/gui/previous_inactive.json → ...mefun/slimefun/gui/previous_inactive.json b/...mefun/slimefun/gui/previous_inactive.json → ...mefun/slimefun/gui/previous_inactive.json
diff --git a/...raulh22/slimefun/slimefun/gui/search.json → ...raulh22/slimefun/slimefun/gui/search.json b/...raulh22/slimefun/slimefun/gui/search.json → ...raulh22/slimefun/slimefun/gui/search.json
diff --git a/...slimefun/slimefun/gui/slimefun_guide.json → ...slimefun/slimefun/gui/slimefun_guide.json b/...slimefun/slimefun/gui/slimefun_guide.json → ...slimefun/slimefun/gui/slimefun_guide.json
diff --git a/...h22/slimefun/slimefun/items/backpack.json → ...h22/slimefun/slimefun/items/backpack.json b/...h22/slimefun/slimefun/items/backpack.json → ...h22/slimefun/slimefun/items/backpack.json
diff --git a/...mefun/slimefun/items/backpack_gilded.json → ...mefun/slimefun/items/backpack_gilded.json b/...mefun/slimefun/items/backpack_gilded.json → ...mefun/slimefun/items/backpack_gilded.json
diff --git a/...imefun/slimefun/items/backpack_large.json → ...imefun/slimefun/items/backpack_large.json b/...imefun/slimefun/items/backpack_large.json → ...imefun/slimefun/items/backpack_large.json
diff --git a/...efun/slimefun/items/backpack_radiant.json → ...efun/slimefun/items/backpack_radiant.json b/...efun/slimefun/items/backpack_radiant.json → ...efun/slimefun/items/backpack_radiant.json
diff --git a/...imefun/slimefun/items/backpack_small.json → ...imefun/slimefun/items/backpack_small.json b/...imefun/slimefun/items/backpack_small.json → ...imefun/slimefun/items/backpack_small.json
diff --git a/...imefun/slimefun/items/backpack_woven.json → ...imefun/slimefun/items/backpack_woven.json b/...imefun/slimefun/items/backpack_woven.json → ...imefun/slimefun/items/backpack_woven.json
diff --git a/...lh22/slimefun/slimefun/items/bandage.json → ...lh22/slimefun/slimefun/items/bandage.json b/...lh22/slimefun/slimefun/items/bandage.json → ...lh22/slimefun/slimefun/items/bandage.json
diff --git a/...ulh22/slimefun/slimefun/items/cooler.json → ...ulh22/slimefun/slimefun/items/cooler.json b/...ulh22/slimefun/slimefun/items/cooler.json → ...ulh22/slimefun/slimefun/items/cooler.json
diff --git a/...h22/slimefun/slimefun/items/medicine.json → ...h22/slimefun/slimefun/items/medicine.json b/...h22/slimefun/slimefun/items/medicine.json → ...h22/slimefun/slimefun/items/medicine.json
diff --git a/...imefun/items/portable_craftingtabble.json → ...imefun/items/portable_craftingtabble.json b/...imefun/items/portable_craftingtabble.json → ...imefun/items/portable_craftingtabble.json
diff --git a/...efun/slimefun/items/portable_dustbin.json → ...efun/slimefun/items/portable_dustbin.json b/...efun/slimefun/items/portable_dustbin.json → ...efun/slimefun/items/portable_dustbin.json
diff --git a/.../raulh22/slimefun/slimefun/items/rag.json → .../raulh22/slimefun/slimefun/items/rag.json b/.../raulh22/slimefun/slimefun/items/rag.json → .../raulh22/slimefun/slimefun/items/rag.json
diff --git a/...ulh22/slimefun/slimefun/items/splint.json → ...ulh22/slimefun/slimefun/items/splint.json b/...ulh22/slimefun/slimefun/items/splint.json → ...ulh22/slimefun/slimefun/items/splint.json
diff --git a/...slimefun/slimefun/items/tape_measure.json → ...slimefun/slimefun/items/tape_measure.json b/...slimefun/slimefun/items/tape_measure.json → ...slimefun/slimefun/items/tape_measure.json
diff --git a/...h22/slimefun/slimefun/items/vitamins.json → ...h22/slimefun/slimefun/items/vitamins.json b/...h22/slimefun/slimefun/items/vitamins.json → ...h22/slimefun/slimefun/items/vitamins.json
diff --git a/...imefun/magical_gadgets/ancient_altar.json → ...imefun/magical_gadgets/ancient_altar.json b/...imefun/magical_gadgets/ancient_altar.json → ...imefun/magical_gadgets/ancient_altar.json
diff --git a/...mefun/magical_gadgets/backpack_ender.json → ...mefun/magical_gadgets/backpack_ender.json b/...mefun/magical_gadgets/backpack_ender.json → ...mefun/magical_gadgets/backpack_ender.json
diff --git a/...n/magical_gadgets/backpack_soulbound.json → ...n/magical_gadgets/backpack_soulbound.json b/...n/magical_gadgets/backpack_soulbound.json → ...n/magical_gadgets/backpack_soulbound.json
diff --git a/...n/magical_gadgets/dimensional_scroll.json → ...n/magical_gadgets/dimensional_scroll.json b/...n/magical_gadgets/dimensional_scroll.json → ...n/magical_gadgets/dimensional_scroll.json
diff --git a/...efun/magical_gadgets/elemental_staff.json → ...efun/magical_gadgets/elemental_staff.json b/...efun/magical_gadgets/elemental_staff.json → ...efun/magical_gadgets/elemental_staff.json
diff --git a/...limefun/magical_gadgets/elytra_scale.json → ...limefun/magical_gadgets/elytra_scale.json b/...limefun/magical_gadgets/elytra_scale.json → ...limefun/magical_gadgets/elytra_scale.json
diff --git a/.../slimefun/magical_gadgets/fire_staff.json → .../slimefun/magical_gadgets/fire_staff.json b/.../slimefun/magical_gadgets/fire_staff.json → .../slimefun/magical_gadgets/fire_staff.json
diff --git a/...un/magical_gadgets/infernal_bonemeal.json → ...un/magical_gadgets/infernal_bonemeal.json b/...un/magical_gadgets/infernal_bonemeal.json → ...un/magical_gadgets/infernal_bonemeal.json
diff --git a/...mefun/magical_gadgets/infused_hopper.json → ...mefun/magical_gadgets/infused_hopper.json b/...mefun/magical_gadgets/infused_hopper.json → ...mefun/magical_gadgets/infused_hopper.json
diff --git a/...mefun/magical_gadgets/infused_magnet.json → ...mefun/magical_gadgets/infused_magnet.json b/...mefun/magical_gadgets/infused_magnet.json → ...mefun/magical_gadgets/infused_magnet.json
diff --git a/...efun/magical_gadgets/knowledge_flask.json → ...efun/magical_gadgets/knowledge_flask.json b/...efun/magical_gadgets/knowledge_flask.json → ...efun/magical_gadgets/knowledge_flask.json
diff --git a/...mefun/magical_gadgets/knowledge_tome.json → ...mefun/magical_gadgets/knowledge_tome.json b/...mefun/magical_gadgets/knowledge_tome.json → ...mefun/magical_gadgets/knowledge_tome.json
diff --git a/...efun/magical_gadgets/magic_ender_eye.json → ...efun/magical_gadgets/magic_ender_eye.json b/...efun/magical_gadgets/magic_ender_eye.json → ...efun/magical_gadgets/magic_ender_eye.json
diff --git a/...magical_gadgets/magical_zombie_pills.json → ...magical_gadgets/magical_zombie_pills.json b/...magical_gadgets/magical_zombie_pills.json → ...magical_gadgets/magical_zombie_pills.json
diff --git a/...limefun/magical_gadgets/rainbow_clay.json → ...limefun/magical_gadgets/rainbow_clay.json b/...limefun/magical_gadgets/rainbow_clay.json → ...limefun/magical_gadgets/rainbow_clay.json
diff --git a/...fun/magical_gadgets/rainbow_concrete.json → ...fun/magical_gadgets/rainbow_concrete.json b/...fun/magical_gadgets/rainbow_concrete.json → ...fun/magical_gadgets/rainbow_concrete.json
diff --git a/...imefun/magical_gadgets/rainbow_glass.json → ...imefun/magical_gadgets/rainbow_glass.json b/...imefun/magical_gadgets/rainbow_glass.json → ...imefun/magical_gadgets/rainbow_glass.json
diff --git a/...n/magical_gadgets/rainbow_glass_pane.json → ...n/magical_gadgets/rainbow_glass_pane.json b/...n/magical_gadgets/rainbow_glass_pane.json → ...n/magical_gadgets/rainbow_glass_pane.json
diff --git a/...al_gadgets/rainbow_glazed_terracotta.json → ...al_gadgets/rainbow_glazed_terracotta.json b/...al_gadgets/rainbow_glazed_terracotta.json → ...al_gadgets/rainbow_glazed_terracotta.json
diff --git a/...limefun/magical_gadgets/rainbow_wool.json → ...limefun/magical_gadgets/rainbow_wool.json b/...limefun/magical_gadgets/rainbow_wool.json → ...limefun/magical_gadgets/rainbow_wool.json
diff --git a/...slimefun/magical_gadgets/storm_staff.json → ...slimefun/magical_gadgets/storm_staff.json b/...slimefun/magical_gadgets/storm_staff.json → ...slimefun/magical_gadgets/storm_staff.json
diff --git a/...slimefun/magical_gadgets/water_staff.json → ...slimefun/magical_gadgets/water_staff.json b/...slimefun/magical_gadgets/water_staff.json → ...slimefun/magical_gadgets/water_staff.json
diff --git a/.../slimefun/magical_gadgets/wind_staff.json → .../slimefun/magical_gadgets/wind_staff.json b/.../slimefun/magical_gadgets/wind_staff.json → .../slimefun/magical_gadgets/wind_staff.json
diff --git a/...mefun/magical_items/ancient_pedestal.json → ...mefun/magical_items/ancient_pedestal.json b/...mefun/magical_items/ancient_pedestal.json → ...mefun/magical_items/ancient_pedestal.json
diff --git a/...limefun/magical_items/broken_spawner.json → ...limefun/magical_items/broken_spawner.json b/...limefun/magical_items/broken_spawner.json → ...limefun/magical_items/broken_spawner.json
diff --git a/...imefun/magical_items/common_talisman.json → ...imefun/magical_items/common_talisman.json b/...imefun/magical_items/common_talisman.json → ...imefun/magical_items/common_talisman.json
diff --git a/...un/slimefun/magical_items/ender_lump.json → ...un/slimefun/magical_items/ender_lump.json b/...un/slimefun/magical_items/ender_lump.json → ...un/slimefun/magical_items/ender_lump.json
diff --git a/...n/slimefun/magical_items/ender_lump2.json → ...n/slimefun/magical_items/ender_lump2.json b/...n/slimefun/magical_items/ender_lump2.json → ...n/slimefun/magical_items/ender_lump2.json
diff --git a/...n/slimefun/magical_items/ender_lump3.json → ...n/slimefun/magical_items/ender_lump3.json b/...n/slimefun/magical_items/ender_lump3.json → ...n/slimefun/magical_items/ender_lump3.json
diff --git a/...n/magical_items/essence_of_afterlife.json → ...n/magical_items/essence_of_afterlife.json b/...n/magical_items/essence_of_afterlife.json → ...n/magical_items/essence_of_afterlife.json
diff --git a/.../slimefun/magical_items/lava_crystal.json → .../slimefun/magical_items/lava_crystal.json b/.../slimefun/magical_items/lava_crystal.json → .../slimefun/magical_items/lava_crystal.json
diff --git a/...fun/magical_items/magical_book_cover.json → ...fun/magical_items/magical_book_cover.json b/...fun/magical_items/magical_book_cover.json → ...fun/magical_items/magical_book_cover.json
diff --git a/...slimefun/magical_items/magical_glass.json → ...slimefun/magical_items/magical_glass.json b/...slimefun/magical_items/magical_glass.json → ...slimefun/magical_items/magical_glass.json
diff --git a/.../slimefun/magical_items/magical_lump.json → .../slimefun/magical_items/magical_lump.json b/.../slimefun/magical_items/magical_lump.json → .../slimefun/magical_items/magical_lump.json
diff --git a/...slimefun/magical_items/magical_lump2.json → ...slimefun/magical_items/magical_lump2.json b/...slimefun/magical_items/magical_lump2.json → ...slimefun/magical_items/magical_lump2.json
diff --git a/...slimefun/magical_items/magical_lump3.json → ...slimefun/magical_items/magical_lump3.json b/...slimefun/magical_items/magical_lump3.json → ...slimefun/magical_items/magical_lump3.json
diff --git a/...limefun/magical_items/necrotic_skull.json → ...limefun/magical_items/necrotic_skull.json b/...limefun/magical_items/necrotic_skull.json → ...limefun/magical_items/necrotic_skull.json
diff --git a/...efun/slimefun/magical_items/rune_air.json → ...efun/slimefun/magical_items/rune_air.json b/...efun/slimefun/magical_items/rune_air.json → ...efun/slimefun/magical_items/rune_air.json
diff --git a/...un/slimefun/magical_items/rune_blank.json → ...un/slimefun/magical_items/rune_blank.json b/...un/slimefun/magical_items/rune_blank.json → ...un/slimefun/magical_items/rune_blank.json
diff --git a/...un/slimefun/magical_items/rune_earth.json → ...un/slimefun/magical_items/rune_earth.json b/...un/slimefun/magical_items/rune_earth.json → ...un/slimefun/magical_items/rune_earth.json
diff --git a/...mefun/magical_items/rune_enchantment.json → ...mefun/magical_items/rune_enchantment.json b/...mefun/magical_items/rune_enchantment.json → ...mefun/magical_items/rune_enchantment.json
diff --git a/...un/slimefun/magical_items/rune_ender.json → ...un/slimefun/magical_items/rune_ender.json b/...un/slimefun/magical_items/rune_ender.json → ...un/slimefun/magical_items/rune_ender.json
diff --git a/...fun/slimefun/magical_items/rune_fire.json → ...fun/slimefun/magical_items/rune_fire.json b/...fun/slimefun/magical_items/rune_fire.json → ...fun/slimefun/magical_items/rune_fire.json
diff --git a/...limefun/magical_items/rune_lightning.json → ...limefun/magical_items/rune_lightning.json b/...limefun/magical_items/rune_lightning.json → ...limefun/magical_items/rune_lightning.json
diff --git a/.../slimefun/magical_items/rune_rainbow.json → .../slimefun/magical_items/rune_rainbow.json b/.../slimefun/magical_items/rune_rainbow.json → .../slimefun/magical_items/rune_rainbow.json
diff --git a/...limefun/magical_items/rune_soulbound.json → ...limefun/magical_items/rune_soulbound.json b/...limefun/magical_items/rune_soulbound.json → ...limefun/magical_items/rune_soulbound.json
diff --git a/...un/slimefun/magical_items/rune_water.json → ...un/slimefun/magical_items/rune_water.json b/...un/slimefun/magical_items/rune_water.json → ...un/slimefun/magical_items/rune_water.json
diff --git a/...un/miscellaneous/android_memory_core.json → ...un/miscellaneous/android_memory_core.json b/...un/miscellaneous/android_memory_core.json → ...un/miscellaneous/android_memory_core.json
diff --git a/...imefun/slimefun/miscellaneous/butter.json → ...imefun/slimefun/miscellaneous/butter.json b/...imefun/slimefun/miscellaneous/butter.json → ...imefun/slimefun/miscellaneous/butter.json
diff --git a/...limefun/slimefun/miscellaneous/chain.json → ...limefun/slimefun/miscellaneous/chain.json b/...limefun/slimefun/miscellaneous/chain.json → ...limefun/slimefun/miscellaneous/chain.json
diff --git a/...imefun/slimefun/miscellaneous/cheese.json → ...imefun/slimefun/miscellaneous/cheese.json b/...imefun/slimefun/miscellaneous/cheese.json → ...imefun/slimefun/miscellaneous/cheese.json
diff --git a/...limefun/slimefun/miscellaneous/cloth.json → ...limefun/slimefun/miscellaneous/cloth.json b/...limefun/slimefun/miscellaneous/cloth.json → ...limefun/slimefun/miscellaneous/cloth.json
diff --git a/...efun/slimefun/miscellaneous/cornmeal.json → ...efun/slimefun/miscellaneous/cornmeal.json b/...efun/slimefun/miscellaneous/cornmeal.json → ...efun/slimefun/miscellaneous/cornmeal.json
diff --git a/...n/slimefun/miscellaneous/crushed_ore.json → ...n/slimefun/miscellaneous/crushed_ore.json b/...n/slimefun/miscellaneous/crushed_ore.json → ...n/slimefun/miscellaneous/crushed_ore.json
diff --git a/...fun/slimefun/miscellaneous/duct_tape.json → ...fun/slimefun/miscellaneous/duct_tape.json b/...fun/slimefun/miscellaneous/duct_tape.json → ...fun/slimefun/miscellaneous/duct_tape.json
diff --git a/...un/miscellaneous/gold_block_carat_24.json → ...un/miscellaneous/gold_block_carat_24.json b/...un/miscellaneous/gold_block_carat_24.json → ...un/miscellaneous/gold_block_carat_24.json
diff --git a/...n/slimefun/miscellaneous/heavy_cream.json → ...n/slimefun/miscellaneous/heavy_cream.json b/...n/slimefun/miscellaneous/heavy_cream.json → ...n/slimefun/miscellaneous/heavy_cream.json
diff --git a/...slimefun/slimefun/miscellaneous/hook.json → ...slimefun/slimefun/miscellaneous/hook.json b/...slimefun/slimefun/miscellaneous/hook.json → ...slimefun/slimefun/miscellaneous/hook.json
diff --git a/...efun/slimefun/miscellaneous/ice_cube.json → ...efun/slimefun/miscellaneous/ice_cube.json b/...efun/slimefun/miscellaneous/ice_cube.json → ...efun/slimefun/miscellaneous/ice_cube.json
diff --git a/...mefun/slimefun/miscellaneous/ketchup.json → ...mefun/slimefun/miscellaneous/ketchup.json b/...mefun/slimefun/miscellaneous/ketchup.json → ...mefun/slimefun/miscellaneous/ketchup.json
diff --git a/...slimefun/slimefun/miscellaneous/mayo.json → ...slimefun/slimefun/miscellaneous/mayo.json b/...slimefun/slimefun/miscellaneous/mayo.json → ...slimefun/slimefun/miscellaneous/mayo.json
diff --git a/...mefun/slimefun/miscellaneous/mustard.json → ...mefun/slimefun/miscellaneous/mustard.json b/...mefun/slimefun/miscellaneous/mustard.json → ...mefun/slimefun/miscellaneous/mustard.json
diff --git a/...scellaneous/organic_fertilizer/apple.json → ...scellaneous/organic_fertilizer/apple.json b/...scellaneous/organic_fertilizer/apple.json → ...scellaneous/organic_fertilizer/apple.json
diff --git a/...llaneous/organic_fertilizer/beetroot.json → ...llaneous/organic_fertilizer/beetroot.json b/...llaneous/organic_fertilizer/beetroot.json → ...llaneous/organic_fertilizer/beetroot.json
diff --git a/...ellaneous/organic_fertilizer/carrots.json → ...ellaneous/organic_fertilizer/carrots.json b/...ellaneous/organic_fertilizer/carrots.json → ...ellaneous/organic_fertilizer/carrots.json
diff --git a/...neous/organic_fertilizer/cocoa_beans.json → ...neous/organic_fertilizer/cocoa_beans.json b/...neous/organic_fertilizer/cocoa_beans.json → ...neous/organic_fertilizer/cocoa_beans.json
diff --git a/...aneous/organic_fertilizer/dried_kelp.json → ...aneous/organic_fertilizer/dried_kelp.json b/...aneous/organic_fertilizer/dried_kelp.json → ...aneous/organic_fertilizer/dried_kelp.json
diff --git a/...scellaneous/organic_fertilizer/melon.json → ...scellaneous/organic_fertilizer/melon.json b/...scellaneous/organic_fertilizer/melon.json → ...scellaneous/organic_fertilizer/melon.json
diff --git a/...iscellaneous/organic_fertilizer/none.json → ...iscellaneous/organic_fertilizer/none.json b/...iscellaneous/organic_fertilizer/none.json → ...iscellaneous/organic_fertilizer/none.json
diff --git a/...llaneous/organic_fertilizer/potatoes.json → ...llaneous/organic_fertilizer/potatoes.json b/...llaneous/organic_fertilizer/potatoes.json → ...llaneous/organic_fertilizer/potatoes.json
diff --git a/...scellaneous/organic_fertilizer/seeds.json → ...scellaneous/organic_fertilizer/seeds.json b/...scellaneous/organic_fertilizer/seeds.json → ...scellaneous/organic_fertilizer/seeds.json
diff --git a/...ous/organic_fertilizer/sweet_berries.json → ...ous/organic_fertilizer/sweet_berries.json b/...ous/organic_fertilizer/sweet_berries.json → ...ous/organic_fertilizer/sweet_berries.json
diff --git a/...scellaneous/organic_fertilizer/wheat.json → ...scellaneous/organic_fertilizer/wheat.json b/...scellaneous/organic_fertilizer/wheat.json → ...scellaneous/organic_fertilizer/wheat.json
diff --git a/...fun/miscellaneous/organic_food/apple.json → ...fun/miscellaneous/organic_food/apple.json b/...fun/miscellaneous/organic_food/apple.json → ...fun/miscellaneous/organic_food/apple.json
diff --git a/.../miscellaneous/organic_food/beetroot.json → .../miscellaneous/organic_food/beetroot.json b/.../miscellaneous/organic_food/beetroot.json → .../miscellaneous/organic_food/beetroot.json
diff --git a/...n/miscellaneous/organic_food/carrots.json → ...n/miscellaneous/organic_food/carrots.json b/...n/miscellaneous/organic_food/carrots.json → ...n/miscellaneous/organic_food/carrots.json
diff --git a/...scellaneous/organic_food/cocoa_beans.json → ...scellaneous/organic_food/cocoa_beans.json b/...scellaneous/organic_food/cocoa_beans.json → ...scellaneous/organic_food/cocoa_beans.json
diff --git a/...iscellaneous/organic_food/dried_kelp.json → ...iscellaneous/organic_food/dried_kelp.json b/...iscellaneous/organic_food/dried_kelp.json → ...iscellaneous/organic_food/dried_kelp.json
diff --git a/...fun/miscellaneous/organic_food/melon.json → ...fun/miscellaneous/organic_food/melon.json b/...fun/miscellaneous/organic_food/melon.json → ...fun/miscellaneous/organic_food/melon.json
diff --git a/...efun/miscellaneous/organic_food/none.json → ...efun/miscellaneous/organic_food/none.json b/...efun/miscellaneous/organic_food/none.json → ...efun/miscellaneous/organic_food/none.json