summaryrefslogtreecommitdiff
path: root/license.md
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-07-28 02:11:33 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-07-28 02:11:33 +0000
commitb93503872ba5e08cb2c81aaf1e9e8eaf903e2fce (patch)
treea21dd8c7fdef25655352a24dabec47c8ae6695e5 /license.md
parenta30bb4a2b0ccf1b2e5b54addd906ea059f6a4de4 (diff)
downloadclientdata-b93503872ba5e08cb2c81aaf1e9e8eaf903e2fce.tar.gz
clientdata-b93503872ba5e08cb2c81aaf1e9e8eaf903e2fce.tar.bz2
clientdata-b93503872ba5e08cb2c81aaf1e9e8eaf903e2fce.tar.xz
clientdata-b93503872ba5e08cb2c81aaf1e9e8eaf903e2fce.zip
Added HoraK's items from an MR with a conflict
Diffstat (limited to 'license.md')
-rw-r--r--license.md3
1 files changed, 3 insertions, 0 deletions
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