From 7f2e6d7ee31cdff444304562047f6270e5b97eb1 Mon Sep 17 00:00:00 2001 From: Phil Morrell Date: Wed, 5 Sep 2018 18:42:16 +0100 Subject: [PATCH] run undiff.sh * update stairs/README.txt.diff * exclude mapgen.lua/trees.lua as unsure whether diff or mod is right --- diff/stairs.diff/README.txt.diff | 4 +++- mods/stairs/README.txt | 29 +++++++++++------------------ mods/stairs/README.txt.diff | 31 +++++++++++++++++++++++++++++++ mods/ts_furniture/README.txt.diff | 13 +++++++++++++ 4 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 mods/stairs/README.txt.diff create mode 100644 mods/ts_furniture/README.txt.diff diff --git a/diff/stairs.diff/README.txt.diff b/diff/stairs.diff/README.txt.diff index 96fab35..d4fb192 100644 --- a/diff/stairs.diff/README.txt.diff +++ b/diff/stairs.diff/README.txt.diff @@ -1,4 +1,4 @@ -1,16c1,11 +1,18c1,11 < Minetest Game mod: stairs < ========================= < See license.txt for license information. @@ -13,6 +13,8 @@ < ------------------------- < Jean-Patrick G. (kilbith) (CC BY-SA 3.0): < stairs_stair.obj +< GreenXenith (CC BY-SA 3.0) +< stairs_stair_inner.obj stairs_stair_outer.obj < < --- diff --git a/mods/stairs/README.txt b/mods/stairs/README.txt index f2b5b74..425c514 100644 --- a/mods/stairs/README.txt +++ b/mods/stairs/README.txt @@ -1,18 +1,11 @@ -Minetest Game mod: stairs -========================= -See license.txt for license information. - -Authors of source code ----------------------- -Originally by Kahrl (LGPL 2.1) and -celeron55, Perttu Ahola (LGPL 2.1) -Various Minetest developers and contributors (LGPL 2.1) - -Authors of media (models) -------------------------- -Jean-Patrick G. (kilbith) (CC BY-SA 3.0): - stairs_stair.obj -GreenXenith (CC BY-SA 3.0) - stairs_stair_inner.obj stairs_stair_outer.obj - - +Stairs +===================================================================== +Main: Kahrl & celeron55, various +Lisc: LGPL 2.1 +3Dmo: CC BY-SA 3.0 + killbith + stairs_stair.obj + GreenXenith + stairs_stair_inner.obj + stairs_stair_outer.obj +Link: https://github.com/minetest/minetest_game diff --git a/mods/stairs/README.txt.diff b/mods/stairs/README.txt.diff new file mode 100644 index 0000000..d4fb192 --- /dev/null +++ b/mods/stairs/README.txt.diff @@ -0,0 +1,31 @@ +1,18c1,11 +< Minetest Game mod: stairs +< ========================= +< See license.txt for license information. +< +< Authors of source code +< ---------------------- +< Originally by Kahrl (LGPL 2.1) and +< celeron55, Perttu Ahola (LGPL 2.1) +< Various Minetest developers and contributors (LGPL 2.1) +< +< Authors of media (models) +< ------------------------- +< Jean-Patrick G. (kilbith) (CC BY-SA 3.0): +< stairs_stair.obj +< GreenXenith (CC BY-SA 3.0) +< stairs_stair_inner.obj stairs_stair_outer.obj +< +< +--- +> Stairs +> ===================================================================== +> Main: Kahrl & celeron55, various +> Lisc: LGPL 2.1 +> 3Dmo: CC BY-SA 3.0 +> killbith +> stairs_stair.obj +> GreenXenith +> stairs_stair_inner.obj +> stairs_stair_outer.obj +> Link: https://github.com/minetest/minetest_game diff --git a/mods/ts_furniture/README.txt.diff b/mods/ts_furniture/README.txt.diff new file mode 100644 index 0000000..1d71988 --- /dev/null +++ b/mods/ts_furniture/README.txt.diff @@ -0,0 +1,13 @@ +1,6c1,5 +< ts_furniture +< ============ +< +< This mod adds basic furniture (Chairs, Tables, Small Tables, Tiny Tables, Benches). +< It was made by Thomas-S. +< It is published under the CC0 license. +--- +> Ts_Furniture +> ===================================================================== +> Main: Thomas-S +> Lisc: CC0 +> Link: https://github.com/minetest-mods/ts_furniture