From 684a1bc50ad70501f26138b861a07ead8a2a53ed Mon Sep 17 00:00:00 2001 From: Micksha Date: Sat, 18 Jan 2020 01:34:45 +0000 Subject: Add compensation items when merging Legacy to rEvolt. Part 1 only. --- LICENSE | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 649ba8af..2a9603f3 100644 --- a/LICENSE +++ b/LICENSE @@ -79,17 +79,24 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/head/bandithood.png (Micksha) (CC-BY-SA 3.0) (-) graphics/items/equipment/head/beaniecopter.png (Alige, Black Don) (GPLv2) (Milla, Veryape) graphics/items/equipment/head/bowlerhat.png (ChefChelios) (CC BY-SA 3.0) (-) + graphics/items/equipment/head/bowlerhat-brown.png (ChefChelios) (CC BY-SA 3.0) (-) graphics/items/equipment/head/brimmedfeatherhat.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/head/brimmedflowerhat.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/head/brimmedhat.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/head/candlehelmet.png (Skipy) (GPLv2) (-) + graphics/items/equipment/head/cashiershade.png (LEGACY) (GPLv2) (-) + graphics/items/equipment/head/catears.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/fairyhat.png (Goku) (GPLv2) (-) graphics/items/equipment/head/fancyhat.png (Crush) (CC BY-SA 3.0) (-) + graphics/items/equipment/head/funkyhat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/infantryhelmet.png (Black Don) (GPLv2) (-) + graphics/items/equipment/head/moonshroomhat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/nohmask.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/pinkiehat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/pumpkinhat.png (Modanung) (CC BY-SA 3.0) (-) graphics/items/equipment/head/rosehat.png (Nami, skipy) (GPLv2) (Alige, Micksha) + graphics/items/equipment/head/santabeardhat.png (LEGACY) (GPLv2) (-) + graphics/items/equipment/head/santahat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/tophat.png (QOAL) (GPLv2) (-) graphics/items/equipment/head/warlordhelmet.png (Black Don) (GPLv2) (-) ### Legs @@ -104,6 +111,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/neck/banditshawl.png (Micksha, Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/neck/shemagh.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/neck/copper-necklace.png (Micksha) (CC BY-SA 3.0) (-) + graphics/items/equipment/neck/eyepatch.png (LEGACY) (CC BY-SA 3.0) (-) ### Shields graphics/items/equipment/shields/barrel.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/shields/leather.png (Len) (CC BY-SA 3.0) (Reid) @@ -120,6 +128,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/weapons/piouslayer.png (Reid) (CC BY-SA 3.0) (Enchilado) graphics/items/equipment/weapons/scythe.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/equipment/weapons/setzer.png (LEGACY) (GPLv2) (-) + graphics/items/equipment/weapons/sharpknife.png (EJlol) (CC BY-SA 3.0) (Reid, Micksha) graphics/items/equipment/weapons/shortbow.png (LEGACY) (CC BY-SA 3.0,GPLv2) (Micksha) graphics/items/equipment/weapons/traininggladius.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/weapons/wand.png (Micksha) (CC BY-SA 3.0) (-) @@ -128,7 +137,6 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/weapons/pickaxe.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/equipment/weapons/torch.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/equipment/weapons/wand.png (Micksha) (CC BY-SA 3.0) (-) - ## Generic graphics/items/generic/adventurersoul.png (Micksha) (CC BY-SA 3.0) (idea by TMW-BR?) graphics/items/generic/bottle-empty.png (FotherJ, Enchilado) (CC BY-SA 3.0,GPLv2) (Micksha) @@ -243,6 +251,40 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/usable/shovel.png (Alige, Reid) (CC BY-SA 3.0) (-) graphics/items/usable/urchinmeat.png (Alige) (CC BY-SA 3.0) (Reid) graphics/items/usable/wine.png (Jak1) (CC BY-SA 3.0) (Reid) +## Merge + graphics/items/merge/blackpearl.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/bloodstone.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/bottle-sand.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/brainstem.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/christmasbox-closed.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/christmasbox-open.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/christmasbulb.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/clover.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/dark-petal.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/doll.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/easterbasket.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/easteregg.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/fakefangs.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/flawed-lens.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/flighttalisman.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/jellybeans.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/kidbook.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/leatherball.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/lollipop.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/plushmouboo.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/redstocking.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/reinboo-stick.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/rubberbat.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/santacookie.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/santaglobe.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/scissors.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/silverbell.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/snowmanglobe.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/strange-coin.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/tongue.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/wrapping-paper-dotted.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/wrapping-paper-striped.png (LEGACY) (CC BY-SA 3.0) (-) + # Minimaps graphics/minimaps/000-0.png (Reid) (CC BY-SA 3.0) (-) @@ -438,19 +480,26 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/sprites/equipment/head/bandithood.png (Micksha) (CC BY-SA 3.0) (-) graphics/sprites/equipment/head/beaniecopter.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/bowlerhat.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/bowlerhat-brown.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/brimmedfeatherhat.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/head/brimmedflowerhat.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/head/brimmedhat.png (Reid) (CC BY-SA 3.0) (Reid) graphics/sprites/equipment/head/candlehelmet.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/cashiershade.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/catears.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/fairyhat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/fancyhat.png (Crush) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/head/funkyhat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/headmodel-male.png (Saulc) (GPLv2) (-) graphics/sprites/equipment/head/infantryhelmet.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/moonshroomhat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/nohmask.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/pinkiehat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/pumpkinhat.png (Modanung) (CC BY-SA 3.0) (-) graphics/sprites/equipment/head/purplemodel.png (Saulc) (GPLv2) (-) graphics/sprites/equipment/head/rosehat.png (LEGACY) (GPLv2) (Micksha) + graphics/sprites/equipment/head/santabeardhat.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/santahat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/tophat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/warlordhelmet.png (LEGACY) (GPLv2) (-) ### Legs @@ -470,8 +519,9 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/sprites/equipment/legs/trousers-male.png (Modanung, Reid) (CC BY-SA 3.0) (-) ### Neck graphics/sprites/equipment/neck/banditshawl.png (Reid) (CC BY-SA 3.0) (Micksha) - graphics/sprites/equipment/neck/shemagh.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/neck/copper-necklace.png (Micksha) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/neck/eyepatch.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/neck/shemagh.png (Reid) (CC BY-SA 3.0) (-) ### Shields graphics/sprites/equipment/shields/barrel.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/shields/leathershield.png (Micksha) (CC BY-SA 3.0) (-) -- cgit v1.2.3-60-g2f50