diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua index fc63c7216..64546b4c4 100644 --- a/builtin/game/falling.lua +++ b/builtin/game/falling.lua @@ -19,6 +19,7 @@ core.register_entity(":__builtin:falling_node", { node = {}, meta = {}, + timer = 0, set_node = function(self, node, meta) self.node = node @@ -125,6 +126,12 @@ core.register_entity(":__builtin:falling_node", { local npos = self.object:get_pos() self.object:set_pos(vector.round(npos)) end + -- Drop node if does not fall within 5 seconds + self.timer = self.timer + dtime + if self.timer > 5 then + core.add_item(pos, self.node) + self.object:remove() + end end }) diff --git a/builtin/game/item.lua b/builtin/game/item.lua index ce3314bbe..dd2de734e 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -530,7 +530,7 @@ function core.item_drop(itemstack, dropper, pos) end if dropper_is_player then p.y = p.y + 1.2 - if dropper:get_player_control().sneak then + if not dropper:get_player_control().sneak then cnt = 1 end end diff --git a/builtin/game/statbars.lua b/builtin/game/statbars.lua index 136abe911..52f361ad1 100644 --- a/builtin/game/statbars.lua +++ b/builtin/game/statbars.lua @@ -185,7 +185,13 @@ core.register_on_joinplayer(function(player) initialize_builtin_statbars(player) end) + +local time = 0 +local update_time = 0.5 core.register_globalstep(function(dtime) + time = time + dtime + if time > update_time then + local players = core.get_connected_players() for i = 1, #players do local player = players[i] @@ -218,4 +224,6 @@ core.register_globalstep(function(dtime) hud.change_item(player, "itemname", {text = description}) end end + time = 0 + end end) diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index fa3326532..0bb15330c 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -198,7 +198,7 @@ end -------------------------------------------------------------------------------- return { name = "local", - caption = fgettext("Single Player"), + caption = fgettext("Singleplayer"), cbf_formspec = get_formspec, cbf_button_handler = main_button_handler, on_change = on_change diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua index 1424c9b9c..a480f6582 100644 --- a/builtin/mainmenu/tab_online.lua +++ b/builtin/mainmenu/tab_online.lua @@ -37,7 +37,7 @@ local function get_formspec(tabview, name, tabdata) "image_button[5.52,-0.13;0.83,0.83;" .. core.formspec_escape(defaulttexturedir .. "search.png") .. ";btn_mp_search;" .. "]" .. "image_button[6.26,-0.13;0.83,0.83;" .. core.formspec_escape(defaulttexturedir .. "refresh.png") - .. ";btn_mp_refresh;" .. "]" .. + .. ";btn_mp_refresh;;;true]" .. -- Address / Port "label[7.1,-0.3;" .. fgettext("Address:") .. "]" .. @@ -63,7 +63,7 @@ local function get_formspec(tabview, name, tabdata) if tabdata.fav_selected and fav_selected then if gamedata.fav then retval = retval .. "image_button[7.1,4.91;0.83,0.83;" .. core.formspec_escape(defaulttexturedir .. "trash.png") - .. ";btn_delete_favorite;" .. "]" + .. ";btn_delete_favorite;;;true]" end if fav_selected.description then retval = retval .. "textarea[7.5,2.3;4.8,2.9;;" .. @@ -368,7 +368,7 @@ end -------------------------------------------------------------------------------- return { name = "online", - caption = fgettext("Play Online"), + caption = fgettext("Multiplayer"), cbf_formspec = get_formspec, cbf_button_handler = main_button_handler, on_change = on_change diff --git a/po/MultiCraft.pot b/po/MultiCraft.pot index acc4570ea..ffddf5cbe 100644 --- a/po/MultiCraft.pot +++ b/po/MultiCraft.pot @@ -514,7 +514,7 @@ msgid "PvP enabled" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_settings.lua diff --git a/po/be/MultiCraft.po b/po/be/MultiCraft.po index 263b05236..52e5c1241 100644 --- a/po/be/MultiCraft.po +++ b/po/be/MultiCraft.po @@ -514,7 +514,7 @@ msgid "Ping" msgstr "Пінг" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "Граць анлайн" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/ca/MultiCraft.po b/po/ca/MultiCraft.po index 67d6a00bb..7177e8d53 100644 --- a/po/ca/MultiCraft.po +++ b/po/ca/MultiCraft.po @@ -529,7 +529,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/cs/MultiCraft.po b/po/cs/MultiCraft.po index 5dd2eda07..ed88fe844 100644 --- a/po/cs/MultiCraft.po +++ b/po/cs/MultiCraft.po @@ -525,7 +525,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "Jméno hráče" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/da/MultiCraft.po b/po/da/MultiCraft.po index eda77999f..700ab91c6 100644 --- a/po/da/MultiCraft.po +++ b/po/da/MultiCraft.po @@ -528,7 +528,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "Spillerens navn" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/de/MultiCraft.po b/po/de/MultiCraft.po index 0e7d61bd5..f2fef9287 100644 --- a/po/de/MultiCraft.po +++ b/po/de/MultiCraft.po @@ -523,7 +523,7 @@ msgid "Ping" msgstr "Latenz" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "Online spielen" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/dv/minetest.po b/po/dv/MultiCraft.po similarity index 99% rename from po/dv/minetest.po rename to po/dv/MultiCraft.po index 65a4f2fb6..faca3fab6 100644 --- a/po/dv/minetest.po +++ b/po/dv/MultiCraft.po @@ -515,7 +515,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/eo/MultiCraft.po b/po/eo/MultiCraft.po index 4222d9a8d..5f3a5ef76 100644 --- a/po/eo/MultiCraft.po +++ b/po/eo/MultiCraft.po @@ -536,7 +536,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "Ludanta nomo trolongas." #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/es/MultiCraft.po b/po/es/MultiCraft.po index a3318190c..faa762f99 100644 --- a/po/es/MultiCraft.po +++ b/po/es/MultiCraft.po @@ -533,7 +533,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "Nombre del jugador" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/et/MultiCraft.po b/po/et/MultiCraft.po index 78ef7aa14..e784e6aa2 100644 --- a/po/et/MultiCraft.po +++ b/po/et/MultiCraft.po @@ -522,7 +522,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/fr/MultiCraft.po b/po/fr/MultiCraft.po index 7a4a9f831..c28b8bc6f 100644 --- a/po/fr/MultiCraft.po +++ b/po/fr/MultiCraft.po @@ -521,7 +521,7 @@ msgid "Ping" msgstr "Ping" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "Jouer en ligne" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/he/MultiCraft.po b/po/he/MultiCraft.po index a1e7cf6aa..90c02f29f 100644 --- a/po/he/MultiCraft.po +++ b/po/he/MultiCraft.po @@ -513,7 +513,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/hu/MultiCraft.po b/po/hu/MultiCraft.po index 96218a658..7a50dbb7c 100644 --- a/po/hu/MultiCraft.po +++ b/po/hu/MultiCraft.po @@ -524,7 +524,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "Játékos neve" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/id/MultiCraft.po b/po/id/MultiCraft.po index e6a72bec9..01cfff120 100644 --- a/po/id/MultiCraft.po +++ b/po/id/MultiCraft.po @@ -516,7 +516,7 @@ msgid "Ping" msgstr "Ping" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "Main Daring" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/it/MultiCraft.po b/po/it/MultiCraft.po index 73b75ad56..b7831bf95 100644 --- a/po/it/MultiCraft.po +++ b/po/it/MultiCraft.po @@ -528,7 +528,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "Nome del giocatore" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/ja/MultiCraft.po b/po/ja/MultiCraft.po index fbb581cca..d21d78ce6 100644 --- a/po/ja/MultiCraft.po +++ b/po/ja/MultiCraft.po @@ -510,7 +510,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "オンラインプレイ" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/jbo/MultiCraft.po b/po/jbo/MultiCraft.po index 1960b2913..230afd069 100644 --- a/po/jbo/MultiCraft.po +++ b/po/jbo/MultiCraft.po @@ -519,7 +519,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/ko/MultiCraft.po b/po/ko/MultiCraft.po index aba7a0b68..4cf52fc74 100644 --- a/po/ko/MultiCraft.po +++ b/po/ko/MultiCraft.po @@ -519,7 +519,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "플레이어 이름" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/ky/MultiCraft.po b/po/ky/MultiCraft.po index ff9e55845..269931b69 100644 --- a/po/ky/MultiCraft.po +++ b/po/ky/MultiCraft.po @@ -529,7 +529,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/lt/MultiCraft.po b/po/lt/MultiCraft.po index 6b602bb86..88ab1f96e 100644 --- a/po/lt/MultiCraft.po +++ b/po/lt/MultiCraft.po @@ -526,7 +526,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/ms/minetest.po b/po/ms/MultiCraft.po similarity index 99% rename from po/ms/minetest.po rename to po/ms/MultiCraft.po index 82a38557f..8971c84e4 100644 --- a/po/ms/minetest.po +++ b/po/ms/MultiCraft.po @@ -515,7 +515,7 @@ msgid "Ping" msgstr "Ping" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "Main Dalam Talian" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/nb/MultiCraft.po b/po/nb/MultiCraft.po index b8d57d935..d98937a9e 100644 --- a/po/nb/MultiCraft.po +++ b/po/nb/MultiCraft.po @@ -519,7 +519,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/nl/MultiCraft.po b/po/nl/MultiCraft.po index bb49fc13c..4fb04e73d 100644 --- a/po/nl/MultiCraft.po +++ b/po/nl/MultiCraft.po @@ -532,7 +532,7 @@ msgstr "Ping" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "Online Spelen" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/pl/MultiCraft.po b/po/pl/MultiCraft.po index e8609ea7d..c5833ee82 100644 --- a/po/pl/MultiCraft.po +++ b/po/pl/MultiCraft.po @@ -528,7 +528,7 @@ msgstr "Ping" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "Gra przez sieć" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/pt/MultiCraft.po b/po/pt/MultiCraft.po index 4d64d4516..0a4c14f55 100644 --- a/po/pt/MultiCraft.po +++ b/po/pt/MultiCraft.po @@ -526,7 +526,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/pt_BR/MultiCraft.po b/po/pt_BR/MultiCraft.po index 845b9b174..1a2e89e52 100644 --- a/po/pt_BR/MultiCraft.po +++ b/po/pt_BR/MultiCraft.po @@ -530,7 +530,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "Nome do Jogador" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/ro/MultiCraft.po b/po/ro/MultiCraft.po index 42f597b1e..7b2e5becd 100644 --- a/po/ro/MultiCraft.po +++ b/po/ro/MultiCraft.po @@ -532,7 +532,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/ru/MultiCraft.po b/po/ru/MultiCraft.po index 94df38cc5..066b7d273 100644 --- a/po/ru/MultiCraft.po +++ b/po/ru/MultiCraft.po @@ -419,8 +419,8 @@ msgid "Host Server" msgstr "Запустить сервер" #: builtin/mainmenu/tab_local.lua -msgid "Single Player" -msgstr "Одиночная" +msgid "Singleplayer" +msgstr "Одиночная игра" #: builtin/mainmenu/tab_local.lua msgid "Name/Password" @@ -515,8 +515,8 @@ msgid "Ping" msgstr "Пинг" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" -msgstr "Играть онлайн" +msgid "Multiplayer" +msgstr "Мультиплеер" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" diff --git a/po/sl/minetest.po b/po/sl/MultiCraft.po similarity index 99% rename from po/sl/minetest.po rename to po/sl/MultiCraft.po index 1f7e81f93..6bc8f54f0 100644 --- a/po/sl/minetest.po +++ b/po/sl/MultiCraft.po @@ -519,7 +519,7 @@ msgid "PvP enabled" msgstr "PvP omogočeno" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "Igraj preko spleta" #: builtin/mainmenu/tab_settings.lua diff --git a/po/sr_Cyrl/MultiCraft.po b/po/sr_Cyrl/MultiCraft.po index 8eef1ddf2..a8ce772b5 100644 --- a/po/sr_Cyrl/MultiCraft.po +++ b/po/sr_Cyrl/MultiCraft.po @@ -524,7 +524,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/sv/minetest.po b/po/sv/MultiCraft.po similarity index 99% rename from po/sv/minetest.po rename to po/sv/MultiCraft.po index bdca445a0..2eff25c52 100644 --- a/po/sv/minetest.po +++ b/po/sv/MultiCraft.po @@ -520,7 +520,7 @@ msgid "Ping" msgstr "" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "Spela online" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/sw/MultiCraft.po b/po/sw/MultiCraft.po index 4b42e800c..d350d6e72 100644 --- a/po/sw/MultiCraft.po +++ b/po/sw/MultiCraft.po @@ -515,7 +515,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "Jina la mchezaji" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/tr/MultiCraft.po b/po/tr/MultiCraft.po index a69e60062..1efaf4da4 100644 --- a/po/tr/MultiCraft.po +++ b/po/tr/MultiCraft.po @@ -514,7 +514,7 @@ msgid "Ping" msgstr "Ping" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" +msgid "Multiplayer" msgstr "Çevrim İçi Oyna" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/uk/MultiCraft.po b/po/uk/MultiCraft.po index b9d7427d4..04079c213 100644 --- a/po/uk/MultiCraft.po +++ b/po/uk/MultiCraft.po @@ -518,8 +518,8 @@ msgid "Ping" msgstr "Пінг" #: builtin/mainmenu/tab_online.lua -msgid "Play Online" -msgstr "Мережа" +msgid "Multiplayer" +msgstr "Мультиплеєр" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua msgid "PvP enabled" diff --git a/po/zh_CN/MultiCraft.po b/po/zh_CN/MultiCraft.po index 99571b557..11ac544a9 100644 --- a/po/zh_CN/MultiCraft.po +++ b/po/zh_CN/MultiCraft.po @@ -518,7 +518,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "玩家名称" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua diff --git a/po/zh_TW/MultiCraft.po b/po/zh_TW/MultiCraft.po index 1c1c544b2..4f637297d 100644 --- a/po/zh_TW/MultiCraft.po +++ b/po/zh_TW/MultiCraft.po @@ -521,7 +521,7 @@ msgstr "" #: builtin/mainmenu/tab_online.lua #, fuzzy -msgid "Play Online" +msgid "Multiplayer" msgstr "玩家名稱" #: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua