From 1a0e979b0c0a50befc49d4d1561ce7704456d600 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 11 May 2020 17:18:04 +0200 Subject: [PATCH] Update incomplete license information and credits --- README.md | 2 ++ mods/CORE/walkover/README.md | 9 ++++-- mods/ENTITIES/mcl_boats/README.txt | 3 +- mods/ENTITIES/mcl_minecarts/README.txt | 13 +-------- mods/ENVIRONMENT/mcl_weather/README.md | 2 +- mods/ITEMS/mcl_banners/README.txt | 2 +- mods/ITEMS/mcl_fire/README.txt | 2 ++ mods/ITEMS/mcl_furnaces/README.md | 2 +- mods/ITEMS/mcl_heads/README.txt | 4 --- mods/ITEMS/mcl_jukebox/README.md | 40 +++++++++++++++++--------- mods/ITEMS/mcl_portals/README.md | 2 +- mods/ITEMS/mcl_potions/README.txt | 4 +-- mods/ITEMS/mcl_signs/README.txt | 2 +- mods/PLAYER/mcl_player/README.txt | 2 +- 14 files changed, 46 insertions(+), 43 deletions(-) delete mode 100644 mods/ITEMS/mcl_heads/README.txt diff --git a/README.md b/README.md index 0fb9d2b51..0a2c76bc8 100644 --- a/README.md +++ b/README.md @@ -256,6 +256,8 @@ project by davedevils which fell under the same license. Mods credit: See `README.txt` or `README.md` in each mod directory for information about other authors. +For mods that do not have such a file, the license is the source code license +of MineClone 2 and the author is Wuzzy. ### License of media (textures and sounds) No non-free licenses are used anywhere. diff --git a/mods/CORE/walkover/README.md b/mods/CORE/walkover/README.md index 2b78b0b0a..d3922ee7b 100644 --- a/mods/CORE/walkover/README.md +++ b/mods/CORE/walkover/README.md @@ -1,11 +1,11 @@ -WalkOver +Walkover -------- -Some mode developers have shown an interest in having an on_walk_over event. This is useful for pressure-plates and the like. +Some mode developers have shown an interest in having an `on_walk_over` event. This is useful for pressure-plates and the like. See this issue - https://github.com/minetest/minetest/issues/247 -I have implemented a server_side version in lua using globalstep which people might find useful. Of course this would better implemented via a client-based "on walk over", but it is sufficient for my needs now. +I have implemented a server-side version in Lua using globalstep which people might find useful. Of course this would better implemented via a client-based "on walk over", but it is sufficient for my needs now. Example Usage ------------- @@ -19,3 +19,6 @@ Example Usage }) +Credits +------- +Mod created by lordfingle, licensed under Apache License 2.0. diff --git a/mods/ENTITIES/mcl_boats/README.txt b/mods/ENTITIES/mcl_boats/README.txt index 6d218f275..195a2241a 100644 --- a/mods/ENTITIES/mcl_boats/README.txt +++ b/mods/ENTITIES/mcl_boats/README.txt @@ -10,8 +10,7 @@ License of boat model: GNU GPLv3 ## Textures -All textures are from the Faithful texture pack for Minecraft. -See the main MineClone 2 license to learn more. +See the main MineClone 2 README.md file to learn more. ## Code Code based on Minetest Game, licensed under the MIT License (MIT). diff --git a/mods/ENTITIES/mcl_minecarts/README.txt b/mods/ENTITIES/mcl_minecarts/README.txt index 881e2a58f..112cbd308 100644 --- a/mods/ENTITIES/mcl_minecarts/README.txt +++ b/mods/ENTITIES/mcl_minecarts/README.txt @@ -3,12 +3,6 @@ mcl_minecarts Based on the mod "boost_carts" by Krock. Target: Run smoothly and do not use too much CPU. -TODO: -- Minecraft-like physics -- Add activator rail -- Add more rail textures -- Add loaded minecarts - License of source code: ----------------------- MIT License @@ -23,10 +17,5 @@ Authors/licenses of media files: Minecart model: 22i (GPLv3) -Wuzzy (based on Pixel Perfection 1.11, MIT License): - carts_rail_crossing_pwr.png - carts_rail_curved_pwr.png - carts_rail_t_junction_pwr.png - -Other texture files (CC BY-SA 3.0: +Texture files (CC BY-SA 3.0): XSSheep diff --git a/mods/ENVIRONMENT/mcl_weather/README.md b/mods/ENVIRONMENT/mcl_weather/README.md index 837a13d31..08f748dfb 100644 --- a/mods/ENVIRONMENT/mcl_weather/README.md +++ b/mods/ENVIRONMENT/mcl_weather/README.md @@ -1,6 +1,6 @@ `mcl_weather` ======================= -Weather mod for MineClone 2. Forked from `weather_pack`. +Weather mod for MineClone 2. Forked from the `weather_pack` mod by xeranas. Weathers included ----------------------- diff --git a/mods/ITEMS/mcl_banners/README.txt b/mods/ITEMS/mcl_banners/README.txt index 330f46d62..4de3ce439 100644 --- a/mods/ITEMS/mcl_banners/README.txt +++ b/mods/ITEMS/mcl_banners/README.txt @@ -1,6 +1,6 @@ License of code: WTFPL -License of textures: See README.me in top directory of MineClone 2. +License of textures: See README.md in top directory of MineClone 2. License of models: GPLv3 (https://www.gnu.org/licenses/gpl-3.0.html) Models author: 22i. diff --git a/mods/ITEMS/mcl_fire/README.txt b/mods/ITEMS/mcl_fire/README.txt index 1b32a4a05..af46528a5 100644 --- a/mods/ITEMS/mcl_fire/README.txt +++ b/mods/ITEMS/mcl_fire/README.txt @@ -30,3 +30,5 @@ http://www.freesound.org/people/Dynamicell/sounds/17548/ Benboncan (CC BY 3.0) https://www.freesound.org/people/Benboncan/sounds/66457/ fire_flint_and_steel.ogg + +Other sound files by Perttu Ahola (celeron55) (CC BY-SA 3.0). diff --git a/mods/ITEMS/mcl_furnaces/README.md b/mods/ITEMS/mcl_furnaces/README.md index 7bdcae469..c7282124b 100644 --- a/mods/ITEMS/mcl_furnaces/README.md +++ b/mods/ITEMS/mcl_furnaces/README.md @@ -9,4 +9,4 @@ Modified by Wuzzy. License of media ---------------- -MIT License +See the main MineClone 2 README.md file. diff --git a/mods/ITEMS/mcl_heads/README.txt b/mods/ITEMS/mcl_heads/README.txt deleted file mode 100644 index 96eb30d8d..000000000 --- a/mods/ITEMS/mcl_heads/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -All textures from Faithful Vanilla texture pack. - -The mcl_heads_* texture were created by kingoscargames, -based on aforementioned texture pack. diff --git a/mods/ITEMS/mcl_jukebox/README.md b/mods/ITEMS/mcl_jukebox/README.md index 7703e4d98..bc261270a 100644 --- a/mods/ITEMS/mcl_jukebox/README.md +++ b/mods/ITEMS/mcl_jukebox/README.md @@ -1,22 +1,34 @@ -Jukebox mod for MineClone 2. +# Jukebox mod for MineClone 2. ---- +Based on the `jdukebox` mod by Jordach. This adds a jukebox block and +music disc. Just place a music disc in a jukebox and music starts +to play. And that's it! -Licenced as GPLv3. +## Track list -Based on the jdukebox mod by Jordach. -Music by Jordach, HeroOfTheWinds and Junichi Masuda -(see in-game item tooltip for details). +`mcl_jukebox_track_1.ogg`: “The Evil Sister (Jordach's Mix)” by SoundHelix (CC0) +`mcl_jukebox_track_2.ogg`: “The Energetic Rat (Jordach's Mix)” by SoundHelix (CC0) +`mcl_jukebox_track_3.ogg`: “Eastern Feeling” by Jordach (CC0) +`mcl_jukebox_track_4.ogg`: “Minetest” by Jordach (CC0) +`mcl_jukebox_track_5.ogg`: “Credit Roll (Jordach's HD Mix)” by Junichi Masuda (CC0) +`mcl_jukebox_track_6.ogg`: “Winter Feeling" by Tom Peter (CC BY-SA 3.0) +`mcl_jukebox_track_7.ogg`: “Synthgroove (Jordach's Mix)” by HeroOfTheWinds (CC0) +`mcl_jukebox_track_8.ogg`: “The Clueless Frog (Jordach's Mix)” by SoundHelix (CC0) -`mcl_jukebox_track_6.ogg` -“Winter Feeling”, by Tom Peter -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Source: +Note: 9 tracks are included. 3 music disc textures are currently unused. +### Sources ---- +* “Winter Feeling”: +* Other tracks: -Textures from Faithful texture pack. +### License -9 tracks are included. -3 music disc textures are currently unused. +Code licenced as GPLv3. Music under individual licenses (see abbreviations +above). Texture license: See main MineClone 2 README.md file. + +See here for the full license texts: + +* CC0: +* CC BY-SA 3.0: +* GPLv3: diff --git a/mods/ITEMS/mcl_portals/README.md b/mods/ITEMS/mcl_portals/README.md index 77c5c0efa..560030e8d 100644 --- a/mods/ITEMS/mcl_portals/README.md +++ b/mods/ITEMS/mcl_portals/README.md @@ -8,7 +8,7 @@ End portal: Build an upright frame of red nether brick blocks, 4 blocks wide and Created by maikerumine and Wuzzy. Code license: MIT License (see `LICENSE`). -Texture license: See main MineClone 2 directory. +Texture license: See README.md in main MineClone 2 directory. License of sound: [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/) Authors: [FreqMan](https://freesound.org/people/FreqMan/) and Wuzzy diff --git a/mods/ITEMS/mcl_potions/README.txt b/mods/ITEMS/mcl_potions/README.txt index 0fa49a9eb..7ebe4ba6c 100644 --- a/mods/ITEMS/mcl_potions/README.txt +++ b/mods/ITEMS/mcl_potions/README.txt @@ -1,5 +1,5 @@ License information: -* Code: WTFPL -* Textures: From Faithful 32×32 texture pack (see main MineClone 2 license notes) +* Code: MIT License +* Textures: See main MineClone 2 README.md file * Sounds: CC0 diff --git a/mods/ITEMS/mcl_signs/README.txt b/mods/ITEMS/mcl_signs/README.txt index 780875561..ee161fc95 100644 --- a/mods/ITEMS/mcl_signs/README.txt +++ b/mods/ITEMS/mcl_signs/README.txt @@ -6,7 +6,7 @@ License of code and font: MIT License Font source: 04.jp.org, some modifications and additions were made (added support for Latin-1 Supplement) Original font license text states: “YOU MAY USE THEM AS YOU LIKE” (in about.gif file distributed with the font) -License of textures: See README.me in top directory of MineClone 2. +License of textures: See README.md in top directory of MineClone 2. License of models: GPLv3 (https://www.gnu.org/licenses/gpl-3.0.html) Models author: 22i. diff --git a/mods/PLAYER/mcl_player/README.txt b/mods/PLAYER/mcl_player/README.txt index 8db9c631d..637a25684 100644 --- a/mods/PLAYER/mcl_player/README.txt +++ b/mods/PLAYER/mcl_player/README.txt @@ -21,4 +21,4 @@ Authors of media files MirceaKitsune (CC BY-SA 3.0): character.b3d -Textures from Faithful 1.11 resource pack (see main readme file) +Textures: See main MineClone 2 README.md file.