diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index 183c9211..e373f649 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -23,7 +23,7 @@ tab_credits = { cbf_formspec = function (tabview, name, tabdata) local logofile = defaulttexturedir .. "smoke_puff.png" return "label[0.5,3.2;MultiCraft " .. core.get_version() .. "]" .. - "label[0.5,3.5;Open Sourse Project]" .. + "label[0.5,3.5;Open Source Project]" .. "image[0.5,1;" .. core.formspec_escape(logofile) .. "]" .. "tablecolumns[color;text]" .. "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 942a7ee7..92fbf157 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -285,7 +285,7 @@ void set_default_settings(Settings *settings) settings->setDefault("emergequeue_limit_total", "256"); settings->setDefault("emergequeue_limit_diskonly", "32"); settings->setDefault("emergequeue_limit_generate", "32"); - settings->setDefault("num_emerge_threads", "2"); + settings->setDefault("num_emerge_threads", "1"); settings->setDefault("secure.enable_security", "false"); settings->setDefault("secure.trusted_mods", ""); diff --git a/src/keycode.cpp b/src/keycode.cpp index 29ceae60..86b816ff 100644 --- a/src/keycode.cpp +++ b/src/keycode.cpp @@ -316,7 +316,7 @@ KeyPress::KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character) int written = wctomb(&m_name[0], Char); if(written < 0){ std::string hexstr = hex_encode((const char*)&Char, sizeof(Char)); - errorstream<<"KeyPress: Unexpected multibyte character "<