diff --git a/licenses/mods/xdecor/LICENSE b/licenses/mods/xdecor/LICENSE index a026df4..7483d9f 100644 --- a/licenses/mods/xdecor/LICENSE +++ b/licenses/mods/xdecor/LICENSE @@ -1,21 +1,30 @@ ┌──────────────────────────────────────────────────────────────────────┐ -│ Copyright (c) 2015-2017 kilbith <jeanpatrick.guerrero@gmail.com> │ +│ Copyright (c) 2015-2021 kilbith <jeanpatrick.guerrero@gmail.com> │ +│ │ +│ Code: Modified BSD License │ +│ Textures: CC0 (credits: Gambit, kilbith, Cisoun) │ +│ │ +│ Textures (radio and speaker) by │ +│ MCL <temp1@cubesoftware.xyz> (CC BY 4.0 Int'l) │ +│ │ +│ Textures (hanging candle) by │ +│ Wuzzy (CC0) │ +│ │ +│ Textures (rooster) by │ +│ sirrobzeroone (CC0) │ │ │ -│ Code: BSD │ -│ Textures: WTFPL (credits: Gambit, kilbith, Cisoun) │ -│ Textures (radio, speaker, hanging candle, rooster) by │ - gigomaf <bartiko2@poczta.fm> (CC BY-NC 3.0) │ │ Sounds: │ -│ - xdecor_boiling_water.ogg - by Audionautics - CC BY-SA │ +│ - xdecor_boiling_water.ogg - by Audionautics - CC BY 3.0 │ │ freesound.org/people/Audionautics/sounds/133901/ │ -│ - xdecor_enchanting.ogg - by Timbre - CC BY-SA-NC │ -│ freesound.org/people/Timbre/sounds/221683/ │ │ - xdecor_bouncy.ogg - by Blender Foundation - CC BY 3.0 │ │ opengameart.org/content/funny-comic-cartoon-bounce-sound │ +│ - xdecor_enchanting.ogg - by Kostas17, edit by Wuzzy - CC BY 3.0 │ +│ freesound.org/people/Kostas17/sounds/542825/ │ └──────────────────────────────────────────────────────────────────────┘ +-- Modified BSD License -- -Copyright (c) 1998, Regents of the University of California +Copyright (c) 2015-2021 kilbith <jeanpatrick.guerrero@gmail.com> All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -25,17 +34,26 @@ modification, are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the University of California, Berkeley nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. +* Neither the name of the copyright holder nor the names of contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-- End of Modified BSD License -- + +## References for other licenses: + +* CC BY 3.0: http://creativecommons.org/licenses/by/3.0/ +* CC BY 4.0: http://creativecommons.org/licenses/by/4.0/ +* CC0: https://creativecommons.org/publicdomain/zero/1.0/ diff --git a/licenses/mods/xdecor/README.md b/licenses/mods/xdecor/README.md index 05340a2..18dd1d7 100644 --- a/licenses/mods/xdecor/README.md +++ b/licenses/mods/xdecor/README.md @@ -1,3 +1,51 @@ +## X-Decor-libre [`xdecor`] ## + +This is a libre version (free software, free media) of the X-Decor mod for Minetest. +It is the same as X-Decor, except with all the non-free files replaced. + +### Background + +X-Decor is a popular mod in Minetest but it is (as the time of writing this text) +non-free software, there are various files under proprietary licenses. + +The purpose of this repository is to provide the community a fully-free fork of +X-Decor with clearly documented licenses. + +No other changes (e.g. bugfixes, features, etc.) will be made in X-Decor-libre. + +### List of replaced files + +This is the list of non-free files in the original X-Decor mod +(as of commit 8b614b3513f2719d5975c883180c011cb7428c8d) +that X-Decor-libre replaces: + +* `textures/xdecor_candle_hanging.png` +* `textures/xdecor_radio_back.png` +* `textures/xdecor_radio_front.png` +* `textures/xdecor_radio_side.png` +* `textures/xdecor_radio_top.png` +* `textures/xdecor_rooster.png` +* `textures/xdecor_speaker_back.png` +* `textures/xdecor_speaker_front.png` +* `textures/xdecor_speaker_side.png` +* `textures/xdecor_speaker_top.png` +* `sounds/xdecor_enchanting.ogg` + +(see `LICENSE` file for licensing). + +### Technical information +X-Decor-libre is a fork of X-Decor, from <https://github.com/minetest-mods/xdecor>, +forked at Git commit ID 8b614b3513f2719d5975c883180c011cb7428c8d. + +Note the technical mod name of X-Decor-libre is the same as for X-Decor: `xdecor`. +This is because this mod is meant to be a drop-in-replacement. + +--- + +The original readme text follows: + +--- + ## X-Decor ## [![ContentDB](https://content.minetest.net/packages/jp/xdecor/shields/downloads/)](https://content.minetest.net/packages/jp/xdecor/) diff --git a/mods/piredo_terrain/textures/xdecor_candle_hanging.png b/mods/piredo_terrain/textures/xdecor_candle_hanging.png index b8595a7..04869c7 100644 Binary files a/mods/piredo_terrain/textures/xdecor_candle_hanging.png and b/mods/piredo_terrain/textures/xdecor_candle_hanging.png differ