teknomunk
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Fix some merging stuff

This commit is contained in:
AFCMS 2022-10-16 20:27:51 +02:00
parent ecb4c82600
commit 7d8a1e1e5f
Signed by untrusted user: AFCMS
GPG Key ID: 8720389A25B652E3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mods/HUD/mcl_inventory/creative.lua
View File

@ -429,9 +429,9 @@ function mcl_inventory.set_creative_formspec(player)
"tooltip[__mcl_doc;" .. F(S("Help")) .. "]", "tooltip[__mcl_doc;" .. F(S("Help")) .. "]",
-- Advancements button -- Advancements button
"image_button[11.575,3.3;1.1,1.1;mcl_achievements_button.png;__mcl_achievements;]" .. "image_button[11.575,3.325;1.1,1.1;mcl_achievements_button.png;__mcl_achievements;]",
--"style_type[image_button;border=;bgimg=;bgimg_pressed=]" .. --"style_type[image_button;border=;bgimg=;bgimg_pressed=]",
"tooltip[__mcl_achievements;" .. F(S("Advancements")) .. "]" .. "tooltip[__mcl_achievements;" .. F(S("Advancements")) .. "]",
-- Switch stack size button -- Switch stack size button
"image_button[11.575,4.575;1.1,1.1;default_apple.png;__switch_stack;]", "image_button[11.575,4.575;1.1,1.1;default_apple.png;__switch_stack;]",

6
mods/PLAYER/mcl_gamemode/init.lua
View File

@ -93,14 +93,14 @@ minetest.register_chatcommand("gamemode", {
if not p then if not p then
return false, S("Player not online") return false, S("Player not online")
end end
if args[1] ~= nil and not in_table(args[1], gamemodes) then if args[1] ~= nil and not in_table(args[1], mcl_gamemode.gamemodes) then
return false, S("Gamemode " .. args[1] .. " does not exist.") return false, S("Gamemode " .. args[1] .. " does not exist.")
elseif args[1] ~= nil then elseif args[1] ~= nil then
mcl_inventory.player_set_gamemode(p, args[1]) mcl_gamemode.set_gamemode(p, args[1])
end end
--Result message - show effective game mode --Result message - show effective game mode
local gm = p:get_meta():get_string("gamemode") local gm = p:get_meta():get_string("gamemode")
if gm == "" then gm = gamemodes[1] end if gm == "" then gm = mcl_gamemode.gamemodes[1] end
return true, S("Gamemode for player ") .. n .. S(": " .. gm) return true, S("Gamemode for player ") .. n .. S(": " .. gm)
end end
}) })