From b93503872ba5e08cb2c81aaf1e9e8eaf903e2fce Mon Sep 17 00:00:00 2001 From: Led Mitz Date: Fri, 28 Jul 2023 02:11:33 +0000 Subject: Added HoraK's items from an MR with a conflict --- .../items/generic/crystalized-dragon-blood.png | Bin 0 -> 1650 bytes graphics/items/generic/golden-tooth.png | Bin 0 -> 457 bytes graphics/items/generic/pink-flower-seed.png | Bin 0 -> 383 bytes items.xml | 23 ++++++++++++++++++--- license.md | 3 +++ 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 graphics/items/generic/crystalized-dragon-blood.png create mode 100644 graphics/items/generic/golden-tooth.png create mode 100644 graphics/items/generic/pink-flower-seed.png diff --git a/graphics/items/generic/crystalized-dragon-blood.png b/graphics/items/generic/crystalized-dragon-blood.png new file mode 100644 index 00000000..355dbf22 Binary files /dev/null and b/graphics/items/generic/crystalized-dragon-blood.png differ diff --git a/graphics/items/generic/golden-tooth.png b/graphics/items/generic/golden-tooth.png new file mode 100644 index 00000000..e02d3ba9 Binary files /dev/null and b/graphics/items/generic/golden-tooth.png differ diff --git a/graphics/items/generic/pink-flower-seed.png b/graphics/items/generic/pink-flower-seed.png new file mode 100644 index 00000000..6f2c0d44 Binary files /dev/null and b/graphics/items/generic/pink-flower-seed.png differ diff --git a/items.xml b/items.xml index bd5ad6be..dde607c4 100644 --- a/items.xml +++ b/items.xml @@ -218,14 +218,31 @@ description="Can be sold for a considerable amount of money." type="generic" weight="40" /> - + + weight="2"/> + + diff --git a/license.md b/license.md index c25cf7e3..7099ef99 100644 --- a/license.md +++ b/license.md @@ -398,6 +398,7 @@ File | Artists | Licenses `graphics/items/generic/coal.png` | Enchilado, Meway, Enchilado | GPLv2, CC BY-SA 3.0 `graphics/items/generic/coinbag.png` | :grey_question:, Enchilado | GPLv2 `graphics/items/generic/crystal.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0 +`graphics/items/generic/crystalized-dragon-blood.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 `graphics/items/generic/dark-easter-egg.png` | :grey_question:, Enchilado | GPLv2 `graphics/items/generic/dark-petal.png` | Enchilado | GPLv2, CC BY-SA 3.0 `graphics/items/generic/doll.png` | Lizandra, Enchilado | GPLv2, CC BY-SA 3.0 @@ -414,6 +415,7 @@ File | Artists | Licenses `graphics/items/generic/gempowder.png` | Enchilado | GPLv2, CC BY-SA 3.0 `graphics/items/generic/gemstone-a.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0 `graphics/items/generic/gemstone-b.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0 +`graphics/items/generic/golden-tooth.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 `graphics/items/generic/grassliner.png` | Salmondine, Enchilado | GPLv2 `graphics/items/generic/grassseeds.png` | Coolkid782, Enchilado | GPLv2, CC BY-SA 3.0 `graphics/items/generic/grub-slime.png` | Enchilado | GPLv2, CC BY-SA 3.0 @@ -441,6 +443,7 @@ File | Artists | Licenses `graphics/items/generic/patch-leather.png` | :grey_question:, Enchilado | GPLv2 `graphics/items/generic/pearl.png` | Fate, Enchilado | GPLv2, CC BY-SA 3.0 `graphics/items/generic/petal.png` | :grey_question:, Enchilado | GPLv2 +`graphics/items/generic/pink-flower-seed.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 `graphics/items/generic/pinkantennae.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0 `graphics/items/generic/plushmouboo.png` | Enchilado | GPLv2, CC BY-SA 3.0 `graphics/items/generic/powder.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0 -- cgit v1.2.3-70-g09d2