Merge branch 'pfau/smöl_fixes' into 'master'

Fix item images, cleanup debug items folder See merge request veloren/veloren!1212
2024-08-30 18:12:32 +00:00 · 2020-07-16 02:46:10 +00:00 · 2020-07-16 02:46:10 +00:00 · d43950e2f5
commit d43950e2f5
parent d9209bed9d 4facf1e3f3
8 changed files with 6 additions and 41 deletions
--- a/assets/common/items/debug/empty_vial.ron
+++ b/assets/common/items/debug/empty_vial.ron
@ -1,7 +0,0 @@
-Item(
-    name: "Empty Vial",
-    description: "Can be filled with fluids.",
-    kind: Ingredient(
-        kind: EmptyVial,
-    )
-)
--- a/assets/common/items/debug/leather_scraps.ron
+++ b/assets/common/items/debug/leather_scraps.ron
@ -1,7 +0,0 @@
-Item(
-    name: "Leather Scraps",
-    description: "Used to craft various items.",
-    kind: Ingredient(
-        kind: LeatherScraps,
-    )
-)
--- a/assets/common/items/debug/shiny_gem.ron
+++ b/assets/common/items/debug/shiny_gem.ron
@ -1,7 +0,0 @@
-Item(
-    name: "Shiny Gem",
-    description: "It's so shiny!",
-    kind: Ingredient(
-        kind: ShinyGem,
-    )
-)
--- a/assets/common/items/debug/stones.ron
+++ b/assets/common/items/debug/stones.ron
@ -1,7 +0,0 @@
-Item(
-    name: "Stones",
-    description: "Pebbles from the ground.",
-    kind: Ingredient(
-        kind: Stones,
-    )
-)
--- a/assets/common/items/debug/twigs.ron
+++ b/assets/common/items/debug/twigs.ron
@ -1,7 +0,0 @@
-Item(
-    name: "Twigs",
-    description: "Dry.",
-    kind: Ingredient(
-        kind: Twigs,
-    )
-)
--- a/assets/voxygen/element/icons/item_apple.png
+++ b/assets/voxygen/element/icons/item_apple.png
--- a/assets/voxygen/element/icons/item_cheese.png
+++ b/assets/voxygen/element/icons/item_cheese.png
--- a/assets/voxygen/element/icons/item_coconut.png
+++ b/assets/voxygen/element/icons/item_coconut.png