From 113ae7a2bd3f2751c1c60322a8b3a02461fec174 Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Sun, 30 Jun 2013 23:43:01 +0200
Subject: Update license file for Nami's graphics, since he agreed to dual
licensing.
---
license.txt | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/license.txt b/license.txt
index 6d350f88..493b141f 100644
--- a/license.txt
+++ b/license.txt
@@ -139,7 +139,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/items/equipment/head/cap.png (Black Don) (GPLv2)
graphics/items/equipment/head/captain_hat.png (Black Don) (GPLv2)
graphics/items/equipment/head/catears.png (Angeliex) (GPLv2)
- graphics/items/equipment/head/chefhat.png (Nami) (GPLv2)
+ graphics/items/equipment/head/chefhat.png (Nami) (GPLv2), (CC BY-SA 3.0)
graphics/items/equipment/head/christmastree.png (????) (GPLv2)
graphics/items/equipment/head/circlet.png (VictorSan) (GPLv2)
graphics/items/equipment/head/cowboyblack.png (Black Don) (GPLv2)
@@ -285,17 +285,17 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/items/equipment/weapon/sword-sword.png (Irukard) (GPLv2), (CC BY-SA 3.0)
## Generic
graphics/items/generic/animal-bones.png (Leela) (GPLv2)
- graphics/items/generic/antlers.png (Nami) (GPLv2)
+ graphics/items/generic/antlers.png (Nami) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/bandit-hood.png (????) (GPLv2)
graphics/items/generic/batteeth.png (Crush) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/batwing.png (Crush) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/bent-needle.png (????) (GPLv2)
graphics/items/generic/blackpearl.png (????, Fate) (GPLv2)
- graphics/items/generic/blanket.png (Nami) (GPLv2)
+ graphics/items/generic/blanket.png (Nami) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/bluepresentbox.png (????) (GPLv2)
graphics/items/generic/bone.png (Yosuhara) (GPLv2)
graphics/items/generic/bottle-empty.png (FotherJ) (GPLv2), (CC BY-SA 3.0)
- graphics/items/generic/bottle-ice.png (FotherJ, Nami) (GPLv2)
+ graphics/items/generic/bottle-ice.png (FotherJ, Nami) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/bottle-sand.png (FotherJ) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/broken-fourleaf-amulet.png (Alige, Fate) (GPLv2)
graphics/items/generic/brokendoll.png (Enchilado) (GPLv2), (CC BY-SA 3.0)
@@ -327,7 +327,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/items/generic/fabric.png (Crush) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/fakefangs.png (????) (GPLv2)
graphics/items/generic/flawed-lens.png (Skipy) (GPLv2)
- graphics/items/generic/flighttalisman.png (Nami) (GPLv2)
+ graphics/items/generic/flighttalisman.png (Nami) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/frozen-yeti-tear.png (ChefChelios) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/gempowder.png (Enchilado) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/gemstone-a.png (Crush) (GPLv2), (CC BY-SA 3.0)
@@ -351,7 +351,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/items/generic/lazurite-heart.png (V0id) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/lazurite-shard.png (V0id) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/leatherball.png (Lizandra, Salmondine) (GPLv2)
- graphics/items/generic/leathersuitcase.png (Nami) (GPLv2)
+ graphics/items/generic/leathersuitcase.png (Nami) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/lockpicks.png (????) (GPLv2)
graphics/items/generic/maggotslime.png (????) (GPLv2)
graphics/items/generic/mylarin-dust.png (????, FotherJ, Salmondine) (GPLv2)
@@ -365,7 +365,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/items/generic/purplepresentbox.png (????) (GPLv2)
graphics/items/generic/rags-rotten.png (FotherJ) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/rawlog.png (????) (GPLv2)
- graphics/items/generic/rawtalisman.png (Nami) (GPLv2)
+ graphics/items/generic/rawtalisman.png (Nami) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/realisticbrain.png (Skipy) (GPLv2)
graphics/items/generic/redstocking.png (????) (GPLv2)
graphics/items/generic/reedbundle.png (Salmondine) (GPLv2)
@@ -405,16 +405,16 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/items/generic/whitefur.png (Crush) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/whitepresentbox.png (????) (GPLv2)
graphics/items/generic/wolvern-pelt.png (Len) (GPLv2), (CC BY-SA 3.0)
- graphics/items/generic/wolvern-tooth.png (Alige, Nami) (GPLv2)
+ graphics/items/generic/wolvern-tooth.png (Alige, Nami) (GPLv2), (CC BY-SA 3.0)
graphics/items/generic/wooden-mouboo.png (????) (GPLv2)
graphics/items/generic/wrapping-paper-dotted.png (Lizandra) (GPLv2)
graphics/items/generic/wrapping-paper-striped.png (Lizandra) (GPLv2)
graphics/items/generic/yellowpresentbox.png (????) (GPLv2)
- graphics/items/generic/yeti-claw.png (Nami) (GPLv2)
+ graphics/items/generic/yeti-claw.png (Nami) (GPLv2), (CC BY-SA 3.0)
## Use
### Food
graphics/items/use/food/acorn.png (Meway) (GPLv2), (CC BY-SA 3.0)
- graphics/items/use/food/acornroasted.png (Nami, V0id) (GPLv2)
+ graphics/items/use/food/acornroasted.png (Nami, V0id) (GPLv2), (CC BY-SA 3.0)
graphics/items/use/food/apple.png (????) (GPLv2)
graphics/items/use/food/beer.png (????) (GPLv2)
graphics/items/use/food/bigcake.png (Freeyorp101, Kr0n05931) (GPLv2)
@@ -444,7 +444,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/items/use/food/orange.png (EJlol) (GPLv2), (CC BY-SA 3.0)
graphics/items/use/food/orangecupcake.png (????) (GPLv2)
graphics/items/use/food/pear.png (????) (GPLv2)
- graphics/items/use/food/pickled_beets.png (Nami) (GPLv2)
+ graphics/items/use/food/pickled_beets.png (Nami) (GPLv2), (CC BY-SA 3.0)
graphics/items/use/food/plum.png (Alige, Meway) (GPLv2), (CC BY-SA 3.0)
graphics/items/use/food/roastedmaggot.png (????) (GPLv2)
graphics/items/use/food/shock-candy.png (Kekskiller) (GPLv2)
@@ -646,7 +646,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/sprites/equipment/head/cap.png (Black Don) (GPLv2)
graphics/sprites/equipment/head/captain-hat.png (Black Don) (GPLv2)
graphics/sprites/equipment/head/catears.png (Angeliex, Octalot) (GPLv2)
- graphics/sprites/equipment/head/chefhat.png (Nami) (GPLv2)
+ graphics/sprites/equipment/head/chefhat.png (Nami) (GPLv2), (CC BY-SA 3.0)
graphics/sprites/equipment/head/christmastree.png (????) (GPLv2)
graphics/sprites/equipment/head/circlet.png (VictorSan) (GPLv2)
graphics/sprites/equipment/head/cowboyblack.png (Black Don) (GPLv2)
@@ -828,7 +828,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/sprites/npcs/christmas_npcs.png (????, Alige, Lizandra, Salmondine) (GPLv2)
graphics/sprites/npcs/evil-obelisk.png (Alige, ChefChelios, Leela) (GPLv2)
graphics/sprites/npcs/furnace.png (Salmondine) (GPLv2)
- graphics/sprites/npcs/hugenpcs.png (ChefChelios, Nami) (GPLv2)
+ graphics/sprites/npcs/hugenpcs.png (ChefChelios, Nami) (GPLv2), (CC BY-SA 3.0)
graphics/sprites/npcs/npc-annualeaster.png (????) (GPLv2)
graphics/sprites/npcs/npc-beerguyghost.png (Reid, Skipy) (GPLv2)
graphics/sprites/npcs/npc-chronos.png (Lien) (GPLv2)
@@ -860,14 +860,14 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/sprites/npcs/saboteur.png (Wombat) (GPLv2)
graphics/sprites/npcs/sages.png (Alige, Nami, Salmondine) (GPLv2)
graphics/sprites/npcs/shapeshifter.png (Alige, Modanung) (GPLv2), (CC BY-SA 3.0)
- graphics/sprites/npcs/sittingsage.png (Alige, Nami) (GPLv2)
+ graphics/sprites/npcs/sittingsage.png (Alige, Nami) (GPLv2), (CC BY-SA 3.0)
graphics/sprites/npcs/soulmenhirs.png (Alige, Lien) (GPLv2)
graphics/sprites/npcs/thermin_npcs.png (Lien, Nami, Salmondine, Varuna) (GPLv2)
# Tilesets
graphics/tiles/arena.png (????) (GPLv2)
graphics/tiles/barbarians-outdoor.png (Salmondine) (GPLv2)
- graphics/tiles/barbarians-yurt_x4.png (Alige, Meway, Nami) (GPLv2)
+ graphics/tiles/barbarians-yurt_x4.png (Alige, Meway, Nami) (GPLv2), (CC BY-SA 3.0)
graphics/tiles/castle-1.png (Alige, EJlol, Irukard, Len, MerlinX420) (GPLv2)
graphics/tiles/castle-2.png (Alige, EJlol, Irukard, IvanMorve Len, MerlinX420) (GPLv2)
graphics/tiles/cave_ani_wetwall.png (Octalot) (GPLv2)
--
cgit v1.2.3-70-g09d2