diff options
author | Led Mitz <smoothshifter@tuta.io> | 2023-07-28 02:11:33 +0000 |
---|---|---|
committer | Led Mitz <smoothshifter@tuta.io> | 2023-07-28 02:11:33 +0000 |
commit | b93503872ba5e08cb2c81aaf1e9e8eaf903e2fce (patch) | |
tree | a21dd8c7fdef25655352a24dabec47c8ae6695e5 /license.md | |
parent | a30bb4a2b0ccf1b2e5b54addd906ea059f6a4de4 (diff) | |
download | clientdata-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.md | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |