From c0596129239f38b9d5208cdf34dd527f347616ed Mon Sep 17 00:00:00 2001 From: Maksim Gamarnik Date: Wed, 17 Feb 2016 01:48:31 +0200 Subject: [PATCH] Release | ver. 1.1.1 --- builtin/mainmenu/tab_credits.lua | 2 +- src/defaultsettings.cpp | 2 +- src/keycode.cpp | 2 +- textures/base/pack/down.png | Bin 508 -> 411 bytes textures/base/pack/inventory.png | Bin 435 -> 400 bytes 5 files changed, 3 insertions(+), 3 deletions(-) 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 "<&lqByJMeiow?_Lx5xVTso|mL4Ssv>2)XL~=U$I% zD6_>jPBF$k?0#lC{}g6izU_6;wn2s6LOWuuX!?n3(wi81i~{B=>rD-=o+jjz(A7AD zS;zYUSM#)u#fyb%m<-t^tP{>J;_`kX++o@A>iQ++nb8eR+UC78m_>ToZN>L*Pw?C? zbY07-kHA+~xZ@RD15r;Dq518D$y>S9-@fO8TVox(Wulodw7iV@A zZ86|F65BLw;~kxVBN`3|mRWmUo2Dpo=O_QpsJNs;8(rliaf^Wg$l&Sf=d#Wzp$Py( Cx1C@B literal 508 zcmeAS@N?(olHy`uVBq!ia0y~yV4MJCFJNH?k{9NvKLb*70X`wF|NsA=IB{ZSW#ybX zbK>IS>Y8d|V`GmVJqnZuN_|j~x(;MlFzsfc@X z{vaoV0uRduy_Z~f>sjKP?kmY~oMcly;KbtxxU3h}D=UFOdBSFUcXftl z2LaaZO*^s`b(h@c(2#jB-NR*O_<>Eqb$ZR`+8RJ$if?W!n4#moXYGo$Y%Xix_ZyTu zfWf@5CCkn)|MhOK00>Oz|7&HHsL--VBjWJ34O^G|pOuv0dhmoR6JtppW7V_ISNY>p zMW+N>?yLXYd`p%I1TKjMDDHc!XUz`g6_w9kSX6U6v`mZz1fEoxIY0fe%~=5q&L5i~ zDEf%~$Ulf(`NuEm=pFBOzp)R(7rmnYvDyjjs<1%qkINmwOe3wM|9Qb?f69B_m&?%B zD8TS;|JK#vTwLPQdPQWp59m7Z7fm?(BOanv=%Upe9v^0iYg!~uSo?faUB=G{0-g>^ xb|VS)S9y8)|NsBn+S=+GYXRBI zmoGna=FF{Iw?Kk!TF-&XI7)*2fXZiX21+~&c-U6Wz`!Wu>Eakt5tk&O!q36e;P$DZ zn|Z5gUsg(?p_zn~RP3DIsUmF+ZsOwN$;wL)E)cxXCwoUhfGLn+ZvRznKMU9c!TZRf&+}~ci5lIaP(l*P}Vkxsi-WN(`@o{-v?cT4cM4QL;Nnz}hH5a%SVlQyIrt&QFx|Jz!+S9Big>G9Zbi>eN%qyOn%9|Jc6b zmp$e2tJkP04ai*jr?OG!`-iL)=2w9a8?N4dxWB-`lKXeSKbbd&Km9ypvu4V2F_&QZ qAAcW(Jvzw|(%*K1DaT*@2b)ZrrBCpUrDuU*$KdJe=d#Wzp$P!&ouWzr literal 435 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+HI{z$e62US3|;Sj*Pd7AOD& z5C%{LD8798a-hin|NnV@?D_{}ag_x51q11ZnKL(UK66H)+kFbqNE1&N$B>F!Z|`2@ zZ88vGO9(4q4NqVNkx*or>ol30QDtQU=l%axt-s?Q&WgFrQxtD`c016l96pP$C)x9~ z)xV#t1-kGbzeT-}bbOd!%aVIQ*;2;1S~+3OwaZgj7#JLE8}8VMUOIe!=9Fv33Q9of zS4>NoUp^>R`N_Jp6zHtK47(hYn)6h=UjyZSGi_1a=x99&Bm)BtwG7YdOr~7}TJ(x7 z$8-nK&=t}NCEN@T{x#?;!&D*Bi=!DBzO(!I0X6jGF*4kd|BwpQgAPC@Fl;CT3cq4L z!pc>6@udFrRXq1CcOC@ld+?q?dM*P)ALoXLf(#4?j-@j+9A>_^%<;_fsZJM-K}LDH L`njxgN@xNA8gqYL