Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

move some "japanese" files to their proper sub-mods
fixes #24
2025-06-28 12:56:01 +02:00 · 2020-06-16 22:26:41 +02:00 · 2020-06-04 12:32:10 -04:00 · 2020-02-09 21:38:24 +01:00 · 2019-12-22 13:26:45 +01:00 · 2019-05-26 19:11:29 +02:00
14 changed files with 20 additions and 1 deletions
--- a/building_blocks/init.lua
+++ b/building_blocks/init.lua
@ -5,3 +5,6 @@ dofile(modpath.."/alias.lua")
 dofile(modpath.."/node_stairs.lua")
 dofile(modpath.."/others.lua")
 dofile(modpath.."/recipes.lua")
+
+minetest.log("action", "[building_blocks] loaded.")
+
--- a/computer/init.lua
+++ b/computer/init.lua
@ -97,3 +97,5 @@ dofile(MODPATH.."/computers.lua")
 dofile(MODPATH.."/printers.lua")
 dofile(MODPATH.."/recipes.lua")
 dofile(MODPATH.."/tetris.lua")
+
+minetest.log("action", "[computer] loaded.")
--- a/fake_fire/init.lua
+++ b/fake_fire/init.lua
@ -313,3 +313,5 @@ minetest.register_lbm({
 		fire_particles_on(pos)
 	end
 })
+
+minetest.log("action", "[fake_fire] loaded.")
--- a/homedecor_3d_extras/init.lua
+++ b/homedecor_3d_extras/init.lua
@ -121,3 +121,6 @@ if minetest.get_modpath("doors") then
 	end

 end
+
+minetest.log("action", "[homedecor_3d_extra] loaded.")
+
--- a/homedecor_common/init.lua
+++ b/homedecor_common/init.lua
@ -77,6 +77,6 @@ dofile(modpath.."/mt_game_beds_functions.lua")
 dofile(modpath.."/sit.lua")
 dofile(modpath.."/crafts.lua")

-if minetest.settings:get_bool("log_mod") then
+if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "[HomeDecor API] " .. S("Loaded!"))
 end
--- a/homedecor_doors_and_gates/textures/homedecor_japanese_paper.png
+++ b/homedecor_doors_and_gates/textures/homedecor_japanese_paper.png
--- a/homedecor_lighting/init.lua
+++ b/homedecor_lighting/init.lua
@ -1895,3 +1895,4 @@ if minetest.get_modpath("darkage") then
 	end
 end

+minetest.log("action", "[homedecor_lightning] loaded.")
--- a/homedecor_doors_and_gates/models/homedecor_wall_japanese_bottom.obj
+++ b/homedecor_doors_and_gates/models/homedecor_wall_japanese_bottom.obj
--- a/homedecor_doors_and_gates/models/homedecor_wall_japanese_middle.obj
+++ b/homedecor_doors_and_gates/models/homedecor_wall_japanese_middle.obj
--- a/homedecor_doors_and_gates/models/homedecor_wall_japanese_top.obj
+++ b/homedecor_doors_and_gates/models/homedecor_wall_japanese_top.obj
--- a/homedecor_seating/init.lua
+++ b/homedecor_seating/init.lua
@ -76,3 +76,5 @@ dofile(modpath.."/longsofas.lua")
 dofile(modpath.."/sofas.lua")
 dofile(modpath.."/armchairs.lua")
 dofile(modpath.."/misc.lua")
+
+minetest.log("action", "[homedecor_seating] loaded.")
--- a/inbox/init.lua
+++ b/inbox/init.lua
@ -126,3 +126,5 @@ function inbox.get_inbox_insert_formspec(pos)
 		"listring[]"
 	return formspec
 end
+
+minetest.log("action", "[inbox] loaded.")
--- a/itemframes/init.lua
+++ b/itemframes/init.lua
@ -300,3 +300,5 @@ if minetest.get_modpath("mesecons_mvps") then
 	mesecon.register_mvps_stopper("itemframes:frame")
 	mesecon.register_mvps_stopper("itemframes:pedestal")
 end
+
+minetest.log("action", "[itemframes] loaded.")
--- a/plasmascreen/init.lua
+++ b/plasmascreen/init.lua
@ -186,3 +186,5 @@ minetest.register_craft({
 		{'group:stick', 'default:coal_lump', 'group:stick'},
 	}
 })
+
+minetest.log("action", "[plasmascreen] loaded.")
Author	SHA1	Message	Date
sys4	5612f4c884	Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev	2020-06-16 22:26:41 +02:00
VanessaE	5aecf5f2c7	move some "japanese" files to their proper sub-mods fixes #24	2020-06-04 12:32:10 -04:00
sys4	7bcfbbca3a	Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev	2020-02-09 21:38:24 +01:00
sys4	e372ccb4d8	Merge branch 'master' of yunohost:mtcontrib/homedecor_modpack into nalc-1.2-dev	2019-12-22 13:26:45 +01:00
sys4	5c6a994698	Merge branch 'nalc-1.2' of yunohost:nalc/homedecor_modpack into nalc-1.2	2019-05-26 19:11:29 +02:00
sys4	1eec6e3615	Merge branch 'master' into nalc-1.2	2019-05-26 19:07:00 +02:00
sys4	0753606eb0	Merge branch 'master' into nalc-1.2	2019-05-25 15:36:01 +02:00
sys4	778b5493c7	Merge branch 'master' into nalc-1.2	2019-05-09 22:11:30 +02:00
sys4	fb0ca9a15c	Supprime 2 dossiers non supprimés par le merge précédent	2019-05-04 20:45:50 +02:00
sys4	1520d27a73	Merge branch 'master' into nalc-1.2	2019-05-04 19:25:15 +02:00
sys4	5d4c64d3b2	Corrige problème de stack des lampes dans inventaire après récolte. L'auteur du mod a oublié de définir la variable drop des objets concernés : - homedecor:glowlight_half, - homedecor:glowlight_quarter, - homedecor:glowlight_small_cube, - homedecor:standing_lamp_off, - homedecor:desk_lamp.	2019-04-07 14:04:00 +02:00
sys4-fr	4eb9ffb088	Ajoute messages de chargement des mods dans le journal "action"	2018-12-25 17:41:16 +01:00