From 6c893010353b078cc8e1fb94ad445f4efc0e162f Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 15 Sep 2020 09:28:38 -0300 Subject: Micksha has agreed to dual license his work on ML to CC BY-SA 4.0 / GPLv3 Dully noted the work which was previously under 3.0 **CAN** be used as such. --- LICENSE | 120 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/LICENSE b/LICENSE index ae732ccc..e1cfd0e6 100644 --- a/LICENSE +++ b/LICENSE @@ -196,7 +196,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/items/equipment/charms/rubberducky.png (Salmondine) (GPLv2) (dangerDuck) #### Chest graphics/items/equipment/chest/assassinchest.png (Black Don) (GPLv2) (-) - graphics/items/equipment/chest/bathrobe.png (Micksha) (CC BY-SA 3.0) (-) + graphics/items/equipment/chest/bathrobe.png (Micksha) (CC BY-SA 4.0) (-) graphics/items/equipment/chest/bromenalchest.png (Skipy) (GPLv2) (-) graphics/items/equipment/chest/candorshirt.png (Saulc) (CC BY-SA 4.0) (-) graphics/items/equipment/chest/chainmail.png (Modanung) (GPL 3.0/CC BY-SA 3.0) (-) @@ -234,7 +234,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/items/equipment/feet/candorboots.png (Saulc) (CC BY-SA 3.0) (Enchilado) graphics/items/equipment/feet/cottonboots.png (?) (GPLv2) (TMW.org) graphics/items/equipment/feet/fursboots.png (Black Don) (GPLv2) (-) - graphics/items/equipment/feet/slippers.png (Micksha) (CC BY-SA 3.0) (-) + graphics/items/equipment/feet/slippers.png (Micksha) (CC BY-SA 4.0) (-) graphics/items/equipment/feet/squirrelboots.png (Saulc) (CC BY-SA 4.0) (-) graphics/items/equipment/feet/tulimsharguardboots.png (Saulc) (CC BY-SA 4.0) (-) graphics/items/equipment/feet/warlordboots.png (Lizandra) (GPLv2) (-) @@ -392,7 +392,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/items/equipment/head/yetimask.png (Skipy) (GPLv2) (-) #### Legs graphics/items/equipment/legs/assassinpants.png (Black Don) (GPLv2) (-) - graphics/items/equipment/legs/bandittrousers.png (Micksha) (CC-BY-SA 3.0) (-) + graphics/items/equipment/legs/bandittrousers.png (Micksha) (CC-BY-SA 4.0) (-) graphics/items/equipment/legs/bromenalpants.png (Skipy) (GPLv2) (-) graphics/items/equipment/legs/candorshorts.png (Saulc) (CC BY-SA 4.0) (-) graphics/items/equipment/legs/chainmailskirt.png (Saulc) (GPLv2) (Skipy) @@ -732,7 +732,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/items/usable/boxofchocolates.png (?) (GPL 2.0 or later) (TMW Org.) graphics/items/usable/bugleg.png (Enchilado) (GPLv2) (-) graphics/items/usable/cardboard.png (TMW-Br v2) (?) (-) - graphics/items/usable/coffee.png (Micksha) (CC BY-SA 3.0) (jesusalva) + graphics/items/usable/coffee.png (Micksha) (CC BY-SA 4.0) (jesusalva) graphics/items/usable/croconut.png (Hal9000) (CC BY-SA 3.0) (-) graphics/items/usable/curshroom.png (Reid) (CC BY-SA 3.0) (-) graphics/items/usable/drops.png (Reid) (CC BY-SA 3.0) (-) @@ -1135,7 +1135,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/minimaps/042-11.png (Jesusalva) (GPLv3) (-) graphics/minimaps/boss.png (Jesusalva) (GPLv3) (-) graphics/minimaps/botcheck.png (Jesusalva) (GPLv3) (-) - graphics/minimaps/guilds.png (Jesusalva) (CC BY SA 3.0) (Micksha) + graphics/minimaps/guilds.png (Jesusalva) (CC BY SA 4.0) (Micksha) graphics/minimaps/piou_1.png (seeds) (CC BY-SA 3.0) (-) graphics/minimaps/piou_2.png (seeds) (CC BY-SA 3.0) (-) graphics/minimaps/piou_3.png (seeds) (CC BY-SA 3.0) (-) @@ -1317,7 +1317,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/sprites/accessories/water-splash.png (Reid) (CC BY-SA 3.0) (-) ### Effects graphics/sprites/effects/blaze.png (Crush) (GPLv2, CC BY-SA 3.0) (Micksha) - graphics/sprites/effects/fire.png (Micksha) (CC BY-SA 3.0) (-) + graphics/sprites/effects/fire.png (Micksha) (CC BY-SA 4.0) (-) graphics/sprites/effects/queststatus.png (Reid, Jesusalva) (CC BY-SA 3.0) (-) ### Equipments #### Chest @@ -1394,8 +1394,8 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/sprites/equipment/feet/cottonboots-female.png (Saulc) (CC BY-SA 3.0) (-) graphics/sprites/equipment/feet/fursboots-female.png (Black Don) (GPLv2) (Saulc) graphics/sprites/equipment/feet/fursboots-male.png (Black Don) (GPLv2) (Saulc) - graphics/sprites/equipment/feet/slippers-female.png (Micksha) (CC BY-SA 3.0) (-) - graphics/sprites/equipment/feet/slippers-male.png (Micksha) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/feet/slippers-female.png (Micksha) (CC BY-SA 4.0) (-) + graphics/sprites/equipment/feet/slippers-male.png (Micksha) (CC BY-SA 4.0) (-) graphics/sprites/equipment/feet/warlordboots-female.png (LEGACY) (GPLv2) (Micksha) graphics/sprites/equipment/feet/warlordboots-male.png (LEGACY) (GPLv2) (Micksha) #### Hands @@ -1649,20 +1649,20 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/sprites/heads/ukar-female-default.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc) graphics/sprites/heads/ukar-male-default.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc) ### Icons - graphics/sprites/icons/apotion_blink.png (Micksha) (CC BY-SA 3.0) (-) - graphics/sprites/icons/apotion_drink.png (Micksha) (CC BY-SA 3.0) (-) + graphics/sprites/icons/apotion_blink.png (Micksha) (CC BY-SA 4.0) (-) + graphics/sprites/icons/apotion_drink.png (Micksha) (CC BY-SA 4.0) (-) graphics/sprites/icons/blind.png (Fate, Jesusalva) (CC BY-SA 3.0) (-) graphics/sprites/icons/bpotionsprite.png (Saulc) (CC BY-SA 3.0) (?) - graphics/sprites/icons/bpotion_blink.png (Micksha) (CC BY-SA 3.0) (-) - graphics/sprites/icons/bpotion_drink.png (Micksha) (CC BY-SA 3.0) (-) + graphics/sprites/icons/bpotion_blink.png (Micksha) (CC BY-SA 4.0) (-) + graphics/sprites/icons/bpotion_drink.png (Micksha) (CC BY-SA 4.0) (-) graphics/sprites/icons/concentration.png (Enchilado) (CC BY-SA 3.0) (-) graphics/sprites/icons/curse.png (FotherJ) (GPLv2) (TMW.org) - graphics/sprites/icons/cpotion_blink.png (Micksha) (CC BY-SA 3.0) (-) - graphics/sprites/icons/cpotion_drink.png (Micksha) (CC BY-SA 3.0) (-) - graphics/sprites/icons/dpotion_blink.png (Micksha) (CC BY-SA 3.0) (-) - graphics/sprites/icons/dpotion_drink.png (Micksha) (CC BY-SA 3.0) (-) - graphics/sprites/icons/epotion_blink.png (Micksha) (CC BY-SA 3.0) (-) - graphics/sprites/icons/epotion_drink.png (Micksha) (CC BY-SA 3.0) (-) + graphics/sprites/icons/cpotion_blink.png (Micksha) (CC BY-SA 4.0) (-) + graphics/sprites/icons/cpotion_drink.png (Micksha) (CC BY-SA 4.0) (-) + graphics/sprites/icons/dpotion_blink.png (Micksha) (CC BY-SA 4.0) (-) + graphics/sprites/icons/dpotion_drink.png (Micksha) (CC BY-SA 4.0) (-) + graphics/sprites/icons/epotion_blink.png (Micksha) (CC BY-SA 4.0) (-) + graphics/sprites/icons/epotion_drink.png (Micksha) (CC BY-SA 4.0) (-) graphics/sprites/icons/feather.png (?) (?) (TMW.org) graphics/sprites/icons/healing.png (Coolkid782) (CC BY-SA 3.0) (-) graphics/sprites/icons/hide.png (Fate) (CC BY-SA 3.0) (-) @@ -1811,7 +1811,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/sprites/monsters/terranite.png (Kr0n05931) (GPLv2) (mishana) graphics/sprites/monsters/tipiou.png (Bagzie) (CC BY-SA 3.0) (-) graphics/sprites/monsters/tortuga.png (Coolkid782) (CC BY-SA 3.0) (Reid) - graphics/sprites/monsters/tower.png (Micksha) (CC BY-SA 3.0) (-) + graphics/sprites/monsters/tower.png (Micksha) (CC BY-SA 4.0) (-) graphics/sprites/monsters/troll.png (FotherJ) (GPLv2, CC BY-SA 3.0) (LoF) graphics/sprites/monsters/vampirebat.png (Meway) (GPLv2) (-) graphics/sprites/monsters/warlordskull.png (Saulc) (CC BY-SA 3.0) (Modanung) @@ -2180,7 +2180,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/tilesets/evol/artis-house.png (IvanMorve, Reid) (CC BY-SA 3.0) (-) graphics/tilesets/evol/artis-indoor.png (Reid, Saweres) (CC BY-SA 3.0) (IvanMorve, Lien) graphics/tilesets/evol/artis-indoor-cellar.png (Hal9000, Reid) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/artis-indoor-cellar-jail-x1x3.png (Micksha) (CC BY-SA 3.0) (-) + graphics/tilesets/evol/artis-indoor-cellar-jail-x1x3.png (Micksha) (CC BY-SA 4.0) (-) graphics/tilesets/evol/artis-indoor-fringe.png (Crush, Saweres) (CC BY-SA 3.0) (Reid, Yosuhara) graphics/tilesets/evol/artis-indoor-x1x2.png (Hal9000, Reid) (CC BY-SA 3.0) (-) graphics/tilesets/evol/artis-indoor-x1x3.png (Reid, Nard) (CC BY-SA 3.0) (Bagzie) @@ -2198,38 +2198,38 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/tilesets/evol/artis-windows.png (IvanMorve, Reid) (CC BY-SA 3.0) (Mikko) graphics/tilesets/evol/box.png (Crush, Len, Modanung, Reid, Yosuhara) (CC BY-SA 3.0) (Alige, Enchilado, Saweres) graphics/tilesets/evol/box-x1x2.png (Len, Reid, Saweres) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/cave.png (Micksha) (CC BY-SA 3.0) (-) + graphics/tilesets/evol/cave.png (Micksha) (CC BY-SA 4.0) (-) graphics/tilesets/evol/candle-x1x2.png (evol, Reid?) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/dark_tileset.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/dark-tileset-accessory.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/dark-tileset-accessory-x1x2.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/dark-tileset-accessory-x1x3.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/fire.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/fire-cauldron.png (Micksha) (CC BY-SA 3.0) (-) + graphics/tilesets/evol/dark_tileset.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/dark-tileset-accessory.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/dark-tileset-accessory-x1x2.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/dark-tileset-accessory-x1x3.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/fire.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/fire-cauldron.png (Micksha) (CC BY-SA 4.0) (-) graphics/tilesets/evol/ground.png (Bagzie, IvanMorve, Len, Reid) (CC BY-SA 3.0) (Crush) - graphics/tilesets/evol/guard-x2x2.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-accessory.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-accessory-x1x2.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-cave-accessory.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-cave-accessory-x1x2.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-cave-accessory-x1x3.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-cave-accessory-x1x4.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-ground.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-indoor.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-indoor-accessory.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-indoor-x1x3.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns-teacup-vapor.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/hurns_wood_lab.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/lava.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/light-flickering-x1x4.png (Micksha) (CC BY-SA 3.0) (-) + graphics/tilesets/evol/guard-x2x2.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-accessory.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-accessory-x1x2.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-cave-accessory.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-cave-accessory-x1x2.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-cave-accessory-x1x3.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-cave-accessory-x1x4.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-ground.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-indoor.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-indoor-accessory.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-indoor-x1x3.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns-teacup-vapor.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/hurns_wood_lab.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/lava.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/light-flickering-x1x4.png (Micksha) (CC BY-SA 4.0) (-) graphics/tilesets/evol/shadow.png (Reid) (CC BY-SA 3.0) (Hal9000) graphics/tilesets/evol/sunlight-x1x5.png (Reid) (CC BY-SA 3.0) (Hal9000) graphics/tilesets/evol/swamp-accessory-x1x2.png (LEGACY) (CC BY-SA 3.0) (Mickhsa) - graphics/tilesets/evol/swamp-house.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/tree-x1x3.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/tree-x1x4.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/tree-x1x5.png (Micksha) (CC BY-SA 3.0) (-) - graphics/tilesets/evol/waterfall.png (Micksha) (CC BY-SA 3.0) (-) + graphics/tilesets/evol/swamp-house.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/tree-x1x3.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/tree-x1x4.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/tree-x1x5.png (Micksha) (CC BY-SA 4.0) (-) + graphics/tilesets/evol/waterfall.png (Micksha) (CC BY-SA 4.0) (-) ### SoT Tileset graphics/tilesets/sot/barrel.png (Lanea Zimmerman) (GPL 3.0/CC-BY-SA 3.0) (Source of Tales) @@ -2456,21 +2456,21 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors maps/027-3.tmx (Donald G. Horn) (CC BY-SA 3.0) (jesusalva) maps/027-4.tmx (Donald G. Horn) (CC BY-SA 3.0) (jesusalva) maps/024-16.tmx (jesusalva) (GPLv2) (-) - maps/042-0.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-1.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-2.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-3.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-4.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-5.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-6.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-7.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-8.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-9.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-10.tmx (Micksha) (CC BY-SA 3.0) (-) - maps/042-11.tmx (Micksha) (CC BY-SA 3.0) (-) + maps/042-0.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-1.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-2.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-3.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-4.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-5.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-6.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-7.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-8.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-9.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-10.tmx (Micksha) (CC BY-SA 4.0) (-) + maps/042-11.tmx (Micksha) (CC BY-SA 4.0) (-) maps/boss.tmx (jesusalva) (CC BY-SA 3.0) (-) maps/botcheck.tmx (jesusalva) (CC BY-SA 3.0) (-) - maps/guilds.tmx (Micksha) (CC BY-SA 3.0) (-) + maps/guilds.tmx (Micksha) (CC BY-SA 4.0) (-) maps/maze0.tmx (jesusalva) (GPLv3) (-) maps/maze1.tmx (jesusalva) (GPLv3) (-) maps/maze2.tmx (jesusalva) (GPLv3) (-) -- cgit v1.2.3-60-g2f50