Merge pull request #139 from dacmot/update_moarmour_license

Update moarmour license
minetest-whynot · Oct 19, 2022 · cdb6941 · cdb6941
2 parents 26f48dc + 1f80e32
commit cdb6941
Show file tree

Hide file tree

Showing 10 changed files with 812 additions and 347 deletions.
diff --git a/builder/mods_src/player/moarmour b/builder/mods_src/player/moarmour
diff --git a/mod_sources.txt b/mod_sources.txt
@@ -236,7 +236,7 @@ origin https://codeberg.org/Wuzzy/minetest_hudbars.git (fetch)
 Mod: player/hudbars
 
 origin https://github.com/dacmot/moarmour (fetch)
-* 252369262d95edfa9be0f4b0291baacd158733c5 Update README.md
+* 7fe7a1ac15a19a2befd9faa1de8de8ad7857cd23 Update armour.lua
 Mod: player/moarmour
 
 origin https://github.com/minetest-mods/playeranim (fetch)

diff --git a/mods/player/moarmour/COPYING.md b/mods/player/moarmour/COPYING.md
diff --git a/mods/player/moarmour/LICENSE b/mods/player/moarmour/LICENSE
diff --git a/mods/player/moarmour/README.md b/mods/player/moarmour/README.md
@@ -1,18 +1,36 @@
 ![luacheck](https://github.com/dacmot/moarmour/actions/workflows/luacheck.yml/badge.svg)
 
-# MOAR! ARMOURS!
+MOAR! ARMOURS!
+================
 
 (yes, that's how it's spelled!)
 
 ![MOAR! ARMOURS!](https://raw.githubusercontent.com/dacmot/moarmour/master/screenshot_20180211_181156.png)
 
-Forked from [armor_addon](https://forum.minetest.net/viewtopic.php?t=18403) to bring it into the new decade! MT v5 translation support, French translation, and a modified craft chain to be able to use both dead player bones (MTG's bones) and the bonemeal-mod bones found while digging dirt to create the skeletal armour!
+Forked from [armor_addon](https://forum.minetest.net/viewtopic.php?t=18403) ([Github](https://github.com/Chemguy99/armor_addon)) to bring it into the new decade! MT v5 translation support, French translation, and a modified craft chain to be able to use both dead player bones (MTG's bones) and the bonemeal-mod bones found while digging dirt to create the skeletal armour!
 
 Download from within the game's content DB ([website](https://content.minetest.net/packages/Duvalon/moarmour/)), or [GitHub](https://github.com/dacmot/moarmour/releases).
 
-**License:** [GPL 2.0](https://github.com/dacmot/moarmour/blob/master/LICENSE)
+License
+-------
+
+Copyright (C) 2020-2022  Olivier Dragon</br>
+Copyright (C) 2017-2018  ChemGuy99 aka Chem871
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+
+Dependencies
+------------
 
-Dependencies:
 - default mod (found in minetest_game)
 - 3d_armor ([ContenDB](https://content.minetest.net/packages/stu/3d_armor/), [forums](https://forum.minetest.net/viewtopic.php?t=4654))
 
@@ -37,7 +55,8 @@ Optional dependencies (for **MOAR! ARMOURS!**)
 
 Bugs can be reported directly in GitHub issues. Pull requests welcome.
 
-# Installation
+Installation
+------------
 
 Unzip the archive, rename the folder to moarmour and
 place it in minetest/mods/

diff --git a/mods/player/moarmour/armour.lua b/mods/player/moarmour/armour.lua
@@ -1,3 +1,25 @@
+--------------------------------------------------------------------------------
+--
+--  Minetest -- moarmour -- Adds many new armours types
+--  Copyright (C) 2020-2022  Olivier Dragon
+--  Copyright (C) 2017-2018  ChemGuy99 aka Chem871
+--  And contributers (see Git logs)
+--
+--  This program is free software: you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation, either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+--
+--------------------------------------------------------------------------------
+
 local S = moarmour.get_translator
 
 -- Armours --

diff --git a/mods/player/moarmour/crafts.lua b/mods/player/moarmour/crafts.lua
@@ -1,3 +1,25 @@
+--------------------------------------------------------------------------------
+--
+--  Minetest -- moarmour -- Adds many new armours types
+--  Copyright (C) 2020-2022  Olivier Dragon
+--  Copyright (C) 2017-2018  ChemGuy99 aka Chem871
+--  And contributers (see Git logs)
+--
+--  This program is free software: you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation, either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+--
+--------------------------------------------------------------------------------
+
 local S = moarmour.get_translator
 
 local craft_ingreds = {

diff --git a/mods/player/moarmour/init.lua b/mods/player/moarmour/init.lua
@@ -1,3 +1,25 @@
+--------------------------------------------------------------------------------
+--
+--  Minetest -- moarmour -- Adds many new armours types
+--  Copyright (C) 2020-2022  Olivier Dragon
+--  Copyright (C) 2017-2018  ChemGuy99 aka Chem871
+--  And contributers (see Git logs)
+--
+--  This program is free software: you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation, either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+--
+--------------------------------------------------------------------------------
+
 local S = minetest.get_translator(minetest.get_current_modname())
 local moarmour_path = minetest.get_modpath(minetest.get_current_modname())
 

diff --git a/mods/player/moarmour/make_edible.lua b/mods/player/moarmour/make_edible.lua
@@ -1,3 +1,25 @@
+--------------------------------------------------------------------------------
+--
+--  Minetest -- moarmour -- Adds many new armours types
+--  Copyright (C) 2020-2022  Olivier Dragon
+--  Copyright (C) 2017-2018  ChemGuy99 aka Chem871
+--  And contributers (see Git logs)
+--
+--  This program is free software: you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation, either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+--
+--------------------------------------------------------------------------------
+
 if minetest.get_modpath("waffles") then
 	-- A waffle block is 9 waffles, 8 stamina each. This is huge.
 	-- Let's just do 20 for all waffle armor peices.

diff --git a/mods/player/moarmour/nodes.lua b/mods/player/moarmour/nodes.lua
@@ -1,3 +1,25 @@
+--------------------------------------------------------------------------------
+--
+--  Minetest -- moarmour -- Adds many new armours types
+--  Copyright (C) 2020-2022  Olivier Dragon
+--  Copyright (C) 2017-2018  ChemGuy99 aka Chem871
+--  And contributers (see Git logs)
+--
+--  This program is free software: you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation, either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+--
+--------------------------------------------------------------------------------
+
 local S = moarmour.get_translator
 
 minetest.register_alias("armor_addon:ibrogblock", "moarmour:ibrogblock")
@@ -20,4 +42,4 @@ minetest.register_node("moarmour:waffleblock", {
   groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
   drop = 'moarmour:waffleblock',
   sounds = default.node_sound_wood_defaults(),
-})
+})
+675 −0		COPYING.md
+0 −339		LICENSE
+24 −5		README.md
+22 −0		armour.lua
+22 −0		crafts.lua
+22 −0		init.lua
+22 −0		make_edible.lua
+23 −1		nodes.lua