Merge branch 'master' into boom

mt-mods · Oct 2, 2023 · 71ef649 · 71ef649
2 parents a3f02ac + e25588c
commit 71ef649
Show file tree

Hide file tree

Showing 32 changed files with 69 additions and 1,445 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
@@ -5,16 +5,16 @@ Requires Minetest 5.0+
 
 This modpack provides mods with dynamic display. Mods are:
 
-- **[display_api](https://github.com/pyrollo/display_modpack/tree/master/display_api)**: A library for adding display entities to nodes;
-- **[font_api](https://github.com/pyrollo/display_modpack/tree/master/font_api)**: A library for displaying fonts on entities;
-- **[signs_api](https://github.com/pyrollo/display_modpack/tree/master/signs_api)**: A library for the easy creation of signs;
-- **[font_metro](https://github.com/pyrollo/display_modpack/tree/master/font_metro)**: A font mod used as default font (includes uppercase, lowercase and accentuated latin letters, usual signs, cyrillic and greek letters)
-
-- **[boards](https://github.com/pyrollo/display_modpack/tree/master/boards)**: A mod providing school boards (includes *tiny cursive font*, a handwriting style font);
-- **[ontime_clocks](https://github.com/pyrollo/display_modpack/tree/master/ontime_clocks)**: A mod providing clocks which display the ingame time;
-- **[signs](https://github.com/pyrollo/display_modpack/tree/master/signs)**: A mod providing signs and direction signs displaying text;
-- **[signs_road](https://github.com/pyrollo/display_modpack/tree/master/signs_road)**: A mod providing road signs displaying text;
-- **[steles](https://github.com/pyrollo/display_modpack/tree/master/steles)**: A mod providing stone steles with text;
+- **[display_api](https://github.com/mt-mods/display_modpack/tree/master/display_api)**: A library for adding display entities to nodes;
+- **[font_api](https://github.com/mt-mods/display_modpack/tree/master/font_api)**: A library for displaying fonts on entities;
+- **[signs_api](https://github.com/mt-mods/display_modpack/tree/master/signs_api)**: A library for the easy creation of signs;
+- **[font_metro](https://github.com/mt-mods/display_modpack/tree/master/font_metro)**: A font mod used as default font (includes uppercase, lowercase and accentuated latin letters, usual signs, cyrillic and greek letters)
+
+- **[boards](https://github.com/mt-mods/display_modpack/tree/master/boards)**: A mod providing school boards (includes *tiny cursive font*, a handwriting style font);
+- **[ontime_clocks](https://github.com/mt-mods/display_modpack/tree/master/ontime_clocks)**: A mod providing clocks which display the ingame time;
+- **[signs](https://github.com/mt-mods/display_modpack/tree/master/signs)**: A mod providing signs and direction signs displaying text;
+- **[signs_road](https://github.com/mt-mods/display_modpack/tree/master/signs_road)**: A mod providing road signs displaying text;
+- **[steles](https://github.com/mt-mods/display_modpack/tree/master/steles)**: A mod providing stone steles with text;
 
 For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=19365) at the Minetest forums.
 

diff --git a/_config.yml b/_config.yml
diff --git a/boards/LICENSE.txt b/boards/LICENSE.txt
diff --git a/boards/copyright.txt b/boards/copyright.txt
diff --git a/boards/init.lua b/boards/init.lua
@@ -33,10 +33,10 @@ local function set_formspec(pos)
 	local meta = minetest.get_meta(pos)
 	local display_text = minetest.formspec_escape(meta:get_string("display_text"))
 	meta:set_string("formspec",
-		"size[6,4]"..default.gui_bg..default.gui_bg_img..default.gui_slots..
-		"textarea[0.5,0.7;5.5,3;display_text;"..FS("Text")..";" .. display_text .. "]"..
-		"button_exit[3,3.5;2,1;ok;"..FS("Write").."]"..
-		"button_exit[1,3.5;2,1;wipe;"..FS("Wipe").."]")
+		"size[6,3.5]"..default.gui_bg..default.gui_bg_img..default.gui_slots..
+		"textarea[0.55,0.25;5.5,3;display_text;"..FS("Text")..";" .. display_text .. "]"..
+		"button_exit[1,2.75;2,1;ok;"..FS("Write").."]"..
+		"button[3,2.75;2,1;font;"..FS("Font").."]")
 end
 
 -- On boards, everyone is allowed to write and wipe
@@ -45,8 +45,9 @@ local function on_receive_fields(pos, formname, fields, player)
 		if fields.ok or fields.key_enter then
 			signs_api.set_display_text(pos, fields.display_text, fields.font)
 		end
-		if fields.wipe then
-			signs_api.set_display_text(pos, "", fields.font)
+		if fields.font then
+			signs_api.set_display_text(pos, fields.display_text)
+			font_api.show_font_list(player, pos)
 		end
 	end
 end

diff --git a/boards/locale/boards.de.tr b/boards/locale/boards.de.tr
@@ -1,6 +1,6 @@
 # textdomain: boards
-Black board=Schwarze Tafel
-Green board=Grüne Tafel
 Text=Text
 Write=Schreiben
-Wipe=Abwischen
+Font=Schriftart
+Black board=Schwarze Tafel
+Green board=Grüne Tafel
diff --git a/boards/locale/boards.fr.tr b/boards/locale/boards.fr.tr
@@ -1,6 +1,6 @@
 # textdomain: boards
-Black board=Tableau noir
-Green board=Tableau vert
 Text=Texte
 Write=Écrire
-Wipe=Effacer
+Font=Police
+Black board=Tableau noir
+Green board=Tableau vert
diff --git a/boards/locale/boards.ms.tr b/boards/locale/boards.ms.tr
@@ -1,6 +1,6 @@
 # textdomain: boards
-Black board=Papan hitam
-Green board=
 Text=
 Write=
-Wipe=
+Font=
+Black board=Papan hitam
+Green board=
diff --git a/boards/locale/template.txt b/boards/locale/template.txt
@@ -1,6 +1,6 @@
 # textdomain: boards
-Black board=
-Green board=
 Text=
 Write=
-Wipe=
+Font=
+Black board=
+Green board=
diff --git a/copyright.txt b/copyright.txt
@@ -0,0 +1,9 @@
+display_modpack (all mods):
+- Original author: Pierre-Yves Rollo (pyrollo) License: LGPL v3, font_metro LGPL v2.1
+- Many other contributors, see `git log`
+
+boards:
+- Font author: cyfry77 License: CC-BY-SA 3.0
+
+font_metro:
+- Font author: Christian Munk (CMunk) License: CC-BY-SA 3.0