Skip to content

Commit

Permalink
License Update
Browse files Browse the repository at this point in the history 
No longer use stairs rotate and place
  • Loading branch information
@sirrobzeroone
sirrobzeroone committed Jun 16, 2022
1 parent 18de64d commit e930076
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 72 deletions.
82 changes: 41 additions & 41 deletions i_comboblock_letter.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


-- Give player elepower tome on initial logon
-- Give player comboblock letter on initial logon
minetest.register_on_newplayer(function(player)
player:get_inventory():add_item("main", "comboblock:help")
end)
Expand All @@ -16,43 +16,43 @@ minetest.register_craftitem("comboblock:help", {
})

comboblock.letter ="formspec_version[5]"..
"size[12.5,14.0]"..
"box[0,0;12.5,14.0;#181818]"..
"box[0.25,0.25;12,13.5;#ffeed4]"..
"image[4.25,0.75;4.25,0.8;comboblock_header.png]"..
"image[0.6,2.2;1.8,1.7;comboblock_help_1a.png]"..
"image[0.6,5.2;1.8,1.7;comboblock_help_1b.png]"..
"image[3,2.2;1.8,1.7;comboblock_help_2a.png]"..
"image[3,5.2;1.8,1.7;comboblock_help_2b.png]"..
"image[5.4,2.2;1.8,1.7;comboblock_help_3a.png]"..
"image[5.4,5.2;1.8,1.7;comboblock_help_3b.png]"..
"image[7.8,2.2;1.8,1.7;comboblock_help_4a.png]"..
"image[7.8,5.2;1.8,1.7;comboblock_help_4b.png]"..
"image[10.1,2.2;1.8,1.7;comboblock_help_5a.png]"..
"image[10.1,5.2;1.8,1.7;comboblock_help_5b.png]"..
"image[1.4,4.2;0.5,0.5;comboblock_arrow.png]"..
"image[3.8,4.2;0.5,0.5;comboblock_arrow.png]"..
"image[6.3,4.2;0.5,0.5;comboblock_arrow.png]"..
"image[8.8,4.2;0.5,0.5;comboblock_arrow.png]"..
"image[11.1,4.2;0.5,0.5;comboblock_arrow.png]"..
"image[1.25,9;1.8,1.7;comboblock_help_8.png]"..
"image[4.3,9;1.8,1.7;comboblock_help_9.png]"..
"image[8.5,8.6;2.5,2.5;comboblock_help_10.png]"..
"image[3.35,9.6;0.65,0.65;comboblock_plus.png]"..
"image[6.95,9.45;0.65,0.65;comboblock_equals.png]"..
"image[0.2,3;0.5,0.5;comboblock_paperedge.png]"..
"image[0.2,3.5;0.25,0.25;comboblock_paperedge.png^[transformFY]"..
"image[0.2,11.5;0.65,0.65;comboblock_paperedge.png^[transformFY]"..
"image[0.2,11.25;0.3,0.4;comboblock_paperedge.png]"..
"image[11.85,5;0.6,0.6;comboblock_paperedge.png^[transformFX]"..
"image[12,5.3;0.3,0.7;comboblock_paperedge.png^[transformFX]"..
"image[12,0.5;0.5,0.4;comboblock_paperedge.png^[transformFX]"..
"image[12.1,0.35;0.3,0.3;comboblock_paperedge.png^[transformFX]"..
"image[12,12;0.3,0.5;comboblock_paperedge.png^[transformFXFY]"..
"image[11,13.5;0.5,0.3;comboblock_paperedge.png^[transformR90]"..
"image[11.25,13.5;0.5,0.6;comboblock_paperedge.png^[transformR90]"..
"image[4.25,13.5;1.25,0.4;comboblock_paperedge.png^[transformR90]"..
"image[4.00,13.6;0.75,0.25;comboblock_paperedge.png^[transformR90FX]"..
"image[2,0.25;0.85,0.25;comboblock_paperedge.png^[transformR270]"..
"image[9.5,0.25;0.4,0.35;comboblock_paperedge.png^[transformR270]"..
"image[9.75,0.25;0.7,0.15;comboblock_paperedge.png^[transformR270FX]"
"size[12.5,14.0]"..
"box[0,0;12.5,14.0;#181818]"..
"box[0.25,0.25;12,13.5;#ffeed4]"..
"image[4.25,0.75;4.25,0.8;comboblock_header.png]"..
"image[0.6,2.2;1.8,1.7;comboblock_help_1a.png]"..
"image[0.6,5.2;1.8,1.7;comboblock_help_1b.png]"..
"image[3,2.2;1.8,1.7;comboblock_help_2a.png]"..
"image[3,5.2;1.8,1.7;comboblock_help_2b.png]"..
"image[5.4,2.2;1.8,1.7;comboblock_help_3a.png]"..
"image[5.4,5.2;1.8,1.7;comboblock_help_3b.png]"..
"image[7.8,2.2;1.8,1.7;comboblock_help_4a.png]"..
"image[7.8,5.2;1.8,1.7;comboblock_help_4b.png]"..
"image[10.1,2.2;1.8,1.7;comboblock_help_5a.png]"..
"image[10.1,5.2;1.8,1.7;comboblock_help_5b.png]"..
"image[1.4,4.2;0.5,0.5;comboblock_arrow.png]"..
"image[3.8,4.2;0.5,0.5;comboblock_arrow.png]"..
"image[6.3,4.2;0.5,0.5;comboblock_arrow.png]"..
"image[8.8,4.2;0.5,0.5;comboblock_arrow.png]"..
"image[11.1,4.2;0.5,0.5;comboblock_arrow.png]"..
"image[1.25,9;1.8,1.7;comboblock_help_8.png]"..
"image[4.3,9;1.8,1.7;comboblock_help_9.png]"..
"image[8.5,8.6;2.5,2.5;comboblock_help_10.png]"..
"image[3.35,9.6;0.65,0.65;comboblock_plus.png]"..
"image[6.95,9.45;0.65,0.65;comboblock_equals.png]"..
"image[0.2,3;0.5,0.5;comboblock_paperedge.png]"..
"image[0.2,3.5;0.25,0.25;comboblock_paperedge.png^[transformFY]"..
"image[0.2,11.5;0.65,0.65;comboblock_paperedge.png^[transformFY]"..
"image[0.2,11.25;0.3,0.4;comboblock_paperedge.png]"..
"image[11.85,5;0.6,0.6;comboblock_paperedge.png^[transformFX]"..
"image[12,5.3;0.3,0.7;comboblock_paperedge.png^[transformFX]"..
"image[12,0.5;0.5,0.4;comboblock_paperedge.png^[transformFX]"..
"image[12.1,0.35;0.3,0.3;comboblock_paperedge.png^[transformFX]"..
"image[12,12;0.3,0.5;comboblock_paperedge.png^[transformFXFY]"..
"image[11,13.5;0.5,0.3;comboblock_paperedge.png^[transformR90]"..
"image[11.25,13.5;0.5,0.6;comboblock_paperedge.png^[transformR90]"..
"image[4.25,13.5;1.25,0.4;comboblock_paperedge.png^[transformR90]"..
"image[4.00,13.6;0.75,0.25;comboblock_paperedge.png^[transformR90FX]"..
"image[2,0.25;0.85,0.25;comboblock_paperedge.png^[transformR270]"..
"image[9.5,0.25;0.4,0.35;comboblock_paperedge.png^[transformR270]"..
"image[9.75,0.25;0.7,0.15;comboblock_paperedge.png^[transformR270FX]"
33 changes: 2 additions & 31 deletions license.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@
-- \/ \/ \/ \/ \/ \/ --
-------------------------------------------------------------------------------------

Comboblock is licensed under unlicence except for the function
"rotate and place" which has been copied unchanged from the Stairs mod
inside the Minetest Game and is under LGPL 2.1

To the best of my understanding this dosen't create a conflict between
these two licence as I am treating the function "rotate and place" as
a shared library component as per LGPL 2.1. However Im no legal expert
so happy to adjust if needed.
Comboblock is licensed under unlicence

license:
=======================================================================
Expand All @@ -41,26 +34,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

For more information, please refer to <http://unlicense.org>


=======================================================================
=======================================================================
=======================================================================
The Function "rotate and place" found in the stairs mod of the minetest game
has been included unaltered and is under the below LGPL 2.1 Licence. This function
has been clearly labelled inside init.lua

GNU Lesser General Public License, version 2.1
Copyright (C) 2011-2017 Kahrl <[email protected]>
Copyright (C) 2011-2017 celeron55, Perttu Ahola <[email protected]>
Copyright (C) 2012-2017 Various Minetest developers and contributors

This program is free software; you can redistribute it and/or modify it under the terms
of the GNU Lesser General Public License as published by the Free Software Foundation;
either version 2.1 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 Lesser General Public License for more details:
https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
For more information, please refer to <http://unlicense.org>

0 comments on commit e930076

Please sign in to comment.