Merge branch 'master' of github.com:Ombridride/minetest-minetestforfun-server

2025-06-28 06:11:47 +02:00 · 2015-06-27 19:11:53 +02:00
parent c7e8162f07 0816951ffe
commit 283b6043b0
30 changed files with 598 additions and 10 deletions
--- a/minetestforfun_game/mods/default/furnace.lua
+++ b/minetestforfun_game/mods/default/furnace.lua
@ -18,6 +18,10 @@ local function active_formspec(fuel_percent, item_percent)
 		"list[current_name;dst;4.75,0.96;2,2;]"..
 		"list[current_player;main;0,4.25;8,1;]"..
 		"list[current_player;main;0,5.5;8,3;8]"..
+		"listring[current_name;dst]"..
+		"listring[current_player;main]"..
+		"listring[current_name;src]"..
+		"listring[current_player;main]"..
 		default.get_hotbar_bg(0, 4.25)
 	return formspec
 end
--- a/minetestforfun_game/mods/default/nodes.lua
+++ b/minetestforfun_game/mods/default/nodes.lua
@ -1824,6 +1824,7 @@ minetest.register_node("default:chest_locked", {
 	on_blast = function() end,
 })

+
 default.bookshelf_formspec =
 	"size[8,7;]" ..
 	default.gui_slots ..
--- a/minetestforfun_game/mods/default/sounds/default_place_node_hard.1.ogg
+++ b/minetestforfun_game/mods/default/sounds/default_place_node_hard.1.ogg