Merge pull request from NewbProgrammer101/master

Fix licensing errors
This commit is contained in:
D00Med 2017-11-12 07:15:15 +10:00 committed by GitHub
commit b24734e90e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 56 additions and 56 deletions
mods
3d_armor
3d_armor_stand
beds
boats
bones
bosses_farlands
bucket
carts
clawshot
compactblocks
craftguide
creative
decoblocks
default
doors
dye
fire
fireworks
flowers
flowers_plus
fruit
mapgen
mobs_farlands
mobs_npc
mobs_redo
screwdriver
simple_skins
stairs
stm_nodes
tnt
tools
vehicles
vessels
villages
weather
witchcraft
wool
workbench

@ -3,5 +3,5 @@
License Source Code: (C) 2012-2017 Stuart Jones - LGPL v2.1
License Textures: CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
License Textures: CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)

@ -12,11 +12,11 @@ License Textures:
3d_armor_stand.png
3d_armor_stand_locked.png
(C) CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
(C) CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
3d_armor_stand_feet.png
3d_armor_stand_head.png
3d_armor_stand_legs.png
3d_armor_stand_torso.png
(C) CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
(C) CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)

@ -28,7 +28,7 @@ https://opensource.org/licenses/MIT
Licenses of media (textures and models)
----------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
You are free to:
Share — copy and redistribute the material in any medium or format.
@ -56,4 +56,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -28,7 +28,7 @@ https://opensource.org/licenses/MIT
Licenses of media (textures and model)
--------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
You are free to:
Share — copy and redistribute the material in any medium or format.
@ -56,4 +56,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -28,7 +28,7 @@ https://opensource.org/licenses/MIT
Licenses of media (textures and models)
----------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
You are free to:
Share — copy and redistribute the material in any medium or format.

@ -4,7 +4,7 @@ License for Textures, Models
bosses_farlands_music.ogg:
8bit Dungeon Boss Kevin MacLeod (incompetech.com)
Licensed under Creative Commons: By Attribution 3.0 License
http://creativecommons.org/licenses/by/3.0/
https://creativecommons.org/licenses/by/3.0/
bosses_farlands_win.ogg:
http://www.freesound.org/people/LittleRobotSoundFactory/sounds/270402/
@ -12,7 +12,7 @@ Licensed under Creative Commons: By Attribution 3.0 License
https://creativecommons.org/licenses/by/3.0/
textures and modles:
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
and model animation:

@ -19,7 +19,7 @@ https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
Licenses of media (textures)
----------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
You are free to:
Share — copy and redistribute the material in any medium or format.
@ -47,4 +47,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -31,5 +31,5 @@ https://opensource.org/licenses/MIT
Licenses of media
-----------------
carts_cart_moving.*.ogg - http://www.freesound.org/people/YleArkisto/sounds/253159/ - YleArkisto - CC- BY-3.0
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
carts_cart_moving.*.ogg - http://www.freesound.org/people/YleArkisto/sounds/253159/ - YleArkisto - CC BY-SA 3.0
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)

@ -22,4 +22,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by D00Med and tobyplowy(aka toby109tt)(colour edits)
CC BY-SA 3.0 UNPORTED. Created by D00Med and tobyplowy(aka toby109tt)(colour edits)

@ -21,4 +21,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by toby109tt(aka tobyplowy)
CC BY-SA 3.0 UNPORTED. Created by toby109tt(aka tobyplowy)

@ -4,7 +4,7 @@
textures
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

@ -28,7 +28,7 @@ https://opensource.org/licenses/MIT
Licenses of media (textures)
----------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
You are free to:
Share — copy and redistribute the material in any medium or format.
@ -56,4 +56,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -21,4 +21,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by toby109tt(aka tobyplowy) and D00Med(decoblocks_floortile.png, decoblocks_glow.png, decoblocks_sandstone_wall*.png)
CC BY-SA 3.0 UNPORTED. Created by toby109tt(aka tobyplowy) and D00Med(decoblocks_floortile.png, decoblocks_glow.png, decoblocks_sandstone_wall*.png)

@ -19,7 +19,7 @@ https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-----------------------------------------------
Licenses of media (textures, sounds, and models)
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
-----------------------------------------------
Licenses of sounds
@ -75,7 +75,7 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/
-----------------------
@ -108,7 +108,7 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/4.0/
https://creativecommons.org/licenses/by-sa/4.0/
-----------------------
@ -142,7 +142,7 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/2.0/
https://creativecommons.org/licenses/by-sa/2.0/
-----------------------
@ -178,4 +178,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by/3.0/
https://creativecommons.org/licenses/by/3.0/

@ -72,7 +72,7 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/
-----------------------
@ -105,7 +105,7 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/4.0/
https://creativecommons.org/licenses/by-sa/4.0/
-----------------------
@ -139,7 +139,7 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by/3.0/
https://creativecommons.org/licenses/by/3.0/
-----------------------

@ -57,4 +57,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -51,7 +51,7 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/
-----------------------
@ -83,4 +83,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by/3.0/
https://creativecommons.org/licenses/by/3.0/

@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by toby109tt(aka tobyplowy)
CC BY-SA 3.0 UNPORTED. Created by toby109tt(aka tobyplowy)
firework.ogg - unknown author, "public domain", http://soundbible.com/1582-Bomb-Drop.html
firework_pop_*.ogg - by Osama Bin Laden, CC-BY 3.0, http://soundbible.com/1789-Loud-Bang.html
firework.ogg - unknown author, "public domain", https://soundbible.com/1582-Bomb-Drop.html
firework_pop_*.ogg - by Osama Bin Laden, CC BY-SA 3.0, https://soundbible.com/1789-Loud-Bang.html

@ -59,4 +59,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -21,4 +21,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by D00Med
CC BY-SA 3.0 UNPORTED. Created by D00Med

@ -21,4 +21,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by D00Med and toby109tt(aka tobyplowy)(fruit_berry_leaves.png, fruit_cactus_inv.png, fruit_coconut*.png, fruit_palmleaves_coconut.png)
CC BY-SA 3.0 UNPORTED. Created by D00Med and toby109tt(aka tobyplowy)(fruit_berry_leaves.png, fruit_cactus_inv.png, fruit_coconut*.png, fruit_palmleaves_coconut.png)

@ -21,5 +21,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by D00Med (mapgen_crystal*.png, mapgen_banana_plant.png, mapgen_lantana.png, mapgen_creeper.png, mapgen_spray.png,
mapgen_glow.png, mapgen_bamboo_small.png, mapgen_bamboo_leaves.png, mapgen_jungletree.png) tobyplowy(aka toby109tt) (all others)
CC BY-SA 3.0 UNPORTED. Created by D00Med (mapgen_crystal*.png, mapgen_banana_plant.png, mapgen_lantana.png, mapgen_creeper.png, mapgen_spray.png,
mapgen_glow.png, mapgen_bamboo_small.png, mapgen_bamboo_leaves.png, mapgen_jungletree.png) tobyplowy(aka toby109tt) (all others)

@ -20,4 +20,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by toby109tt(aka tobyplowy)(ammonite, bear, beetle, bird, chicken, dearmhara, donkey, elephant, horse, mammoth, mimic, pirana, pterodactyl, quagga, swamp lurker, trilobite, velociraptor, witch, zebra, zombies) and D00Med (whale, wasp, sheep, riverfish, badger + animation)
CC BY-SA 3.0 UNPORTED. Created by toby109tt(aka tobyplowy)(ammonite, bear, beetle, bird, chicken, dearmhara, donkey, elephant, horse, mammoth, mimic, pirana, pterodactyl, quagga, swamp lurker, trilobite, velociraptor, witch, zebra, zombies) and D00Med (whale, wasp, sheep, riverfish, badger + animation)

@ -24,4 +24,4 @@ THE SOFTWARE.
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)(models, textures) and D00Med (beacon texture, animation)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)(models, textures) and D00Med (beacon texture, animation)

@ -26,5 +26,5 @@ License for Textures, Models and Sounds
Original textures, sounds - see above
mobs_chicken_egg.png, mob_spawner.png, mobs_leather.png, mobs_meat.png, mobs_meat_raw.png, mobs_nametag.png, mobs_rotten_blood.png, mobs_zombie_flesh.png -
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)

@ -47,4 +47,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -24,4 +24,4 @@ THE SOFTWARE.
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt) and D00Med
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt) and D00Med

@ -48,4 +48,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -21,4 +21,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)(stm_nodes_boiler.png, stm_nodes_boiler_pipe.png, stm_nodes_boiler_top.ong) and D00Med
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)(stm_nodes_boiler.png, stm_nodes_boiler_pipe.png, stm_nodes_boiler_top.ong) and D00Med

@ -63,4 +63,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -21,4 +21,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)(tools_gameboy.png) and D00Med
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)(tools_gameboy.png) and D00Med

@ -23,5 +23,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt) and D00Med (vehicles_explosion.png, vehicles_splash.png)
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt) and D00Med (vehicles_explosion.png, vehicles_splash.png)

@ -49,4 +49,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -21,4 +21,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)(villages_book.png, villages_deed.png, villages_hobo_deed.png, villages_spanner.png) and D00Med
CC BY-SA 3.0 UNPORTED. Created by tobyplowy(aka toby109tt)(villages_book.png, villages_deed.png, villages_hobo_deed.png, villages_spanner.png) and D00Med

@ -21,4 +21,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by D00Med
CC BY-SA 3.0 UNPORTED. Created by D00Med

@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
License for Textures, Models and Sounds
---------------------------------------
CC-BY-SA 3.0 UNPORTED. Created by D00Med and toby109tt(aka tobyplowy) (witchcraft_sun_over.png, witchcraft_moon_over.png, witchcraft_potion_*.png, witchcraft_pot_top.png, witchcraft_pot_side.png, witchcraft_pot_bottom.png, withcraft_red_candle*.png, witchcraft_pentagram.png
CC BY-SA 3.0 UNPORTED. Created by D00Med and toby109tt(aka tobyplowy) (witchcraft_sun_over.png, witchcraft_moon_over.png, witchcraft_potion_*.png, witchcraft_pot_top.png, witchcraft_pot_side.png, witchcraft_pot_bottom.png, withcraft_red_candle*.png, witchcraft_pentagram.png
All splash potion bottles derived from
vessels_glass_bottle.png (by Authors)

@ -56,4 +56,4 @@ for your intended use. For example, other rights such as publicity, privacy, or
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
https://creativecommons.org/licenses/by-sa/3.0/

@ -672,11 +672,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
<https://www.gnu.org/philosophy/why-not-lgpl.html>.