From 1342444b5869ddba531fbe96edf32bd2d8ad8750 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 12 Sep 2020 23:49:27 -0300 Subject: Whenever possible, prefer GPLv3 over any other license. Immediately followed by CC BY-SA 4.0 --- LICENSE | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 4a70a2e2..5cb8765b 100644 --- a/LICENSE +++ b/LICENSE @@ -2,6 +2,9 @@ IMPORTANT: Unless otherwise stated, all unlisted resources are GPL v3. If you believe some file license is wrong give a shout at our Discord and we'll have it replaced within 30 days. (Link: discord.gg/BQNTe68) +GPLv3 is strictly preferred over all other licenses, immediately followed by +CC BY-SA 4.0 Unported. + Formal DMCA Complains: Please fill the standard form and submit to admin@tmw2.org The same 30-days rule still apply. @@ -45,7 +48,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE A full list of contributors should, in theory, be available at: https://gitlab.com/TMW2/Docs/wikis/Contributors ---------------------------------------------------------------------------------------------------------------------------------- +--------------------------------------------------------------------------------- # Folder path/to/the/licensed/work.something (Author) (License) (Contributors/Authors/Co-Authors/Sources/etc.) @@ -122,13 +125,13 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/items/error.png (Reid) (CC BY-SA 3.0) (-) ### Equipments #### Ammo - graphics/items/equipment/ammo/arrow.png (Irukard) (CC BY-SA 3.0) (-) - graphics/items/equipment/ammo/bonearrow.png (Adarias) (CC BY-SA 3.0) (-) + graphics/items/equipment/ammo/arrow.png (Irukard) (GPL 3.0/CC BY-SA 3.0) (-) + graphics/items/equipment/ammo/bonearrow.png (Adarias) (GPL 3.0) (-) graphics/items/equipment/ammo/cursedarrow.png (lof) (GPLv2) (-) - graphics/items/equipment/ammo/ironarrow.png (Irukard) (CC BY-SA 3.0) (-) + graphics/items/equipment/ammo/ironarrow.png (Irukard) (GPL 3.0/CC BY-SA 3.0) (-) graphics/items/equipment/ammo/mortararrow.png (Salmondine) (GPLv2) (TMW Org) graphics/items/equipment/ammo/poisonarrow.png (Saulc) (CC BY-SA 3.0) (-) - graphics/items/equipment/ammo/roundstone.png (wushin, tux9th) (CC BY-SA 3.0) (-) + graphics/items/equipment/ammo/roundstone.png (wushin, tux9th) (GPL 3.0/CC BY-SA 3.0) (-) graphics/items/equipment/ammo/thornarrow.png (lof) (GPLv2) (-) graphics/items/equipment/ammo/tolchiarrow.png (Saulc) (CC BY-SA 3.0) (-) graphics/items/equipment/ammo/trainingarrow.png (Reid) (CC BY-SA 3.0) (-) @@ -1537,8 +1540,8 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/sprites/equipment/legs/miniskirt-female.png (jak1) (GPLv2) (Saulc) graphics/sprites/equipment/legs/miniskirt-male.png (jak1) (GPLv2) (Saulc) graphics/sprites/equipment/legs/pirateshorts.png (Saulc) (CC BY-SA 3.0) (Saulc) - graphics/sprites/equipment/legs/shorts-female.png (Modanung) (CC BY-SA 3.0) (-) - graphics/sprites/equipment/legs/shorts-male.png (Modanung) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/legs/shorts-female.png (Modanung) (GPL 3.0/CC BY-SA 3.0) (-) + graphics/sprites/equipment/legs/shorts-male.png (Modanung) (GPL 3.0/CC BY-SA 3.0) (-) graphics/sprites/equipment/legs/silkpants-female.png (LuH) (GPLv2) (Saulc) graphics/sprites/equipment/legs/silkpants-male.png (LuH) (GPLv2) (Saulc) graphics/sprites/equipment/legs/terranitepants-female.png (Kr0n05931) (GPLv2) (Saulc) @@ -1562,12 +1565,12 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/sprites/equipment/override/mouboo.png (Yuuki) (GPLv2) (Reid, seeds) #### Shields graphics/sprites/equipment/shields/barrel.png (Reid) (CC BY-SA 3.0) (-) - graphics/sprites/equipment/shields/bladeshield.png (Irukard) (CC BY-SA 3.0) (Ernando) + graphics/sprites/equipment/shields/bladeshield.png (Irukard) (GPL 3.0/CC BY-SA 3.0) (Ernando) graphics/sprites/equipment/shields/braknar.png (?) (GPLv2) (TMW-Br) graphics/sprites/equipment/shields/britshield.png (?) (GPLv2) (TMW-Br) graphics/sprites/equipment/shields/buckler.png (?) (GPLv2) (TMW-Br) graphics/sprites/equipment/shields/leather.png (?) (GPLv2) (TMW-Br) - graphics/sprites/equipment/shields/wooden.png (Enchilado) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/shields/wooden.png (Enchilado) (GPL 3.0/CC BY-SA 3.0) (-) graphics/sprites/equipment/shields/candorbola.png (Saulc) (GPLv2) (-) graphics/sprites/equipment/shields/dragon.png (?) (GPLv2) (TMW-Br) graphics/sprites/equipment/shields/knight.png (?) (GPLv2) (TMW-Br) -- cgit v1.2.3-70-g09d2