diff --git a/builtin/game/item.lua b/builtin/game/item.lua index e36745f9..3447a564 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -552,7 +552,7 @@ core.nodedef_default = { inventory_image = "", wield_image = "", wield_scale = {x=1,y=1,z=1}, - stack_max = 99, + stack_max = 64, usable = false, liquids_pointable = false, tool_capabilities = nil, @@ -616,7 +616,7 @@ core.craftitemdef_default = { inventory_image = "", wield_image = "", wield_scale = {x=1,y=1,z=1}, - stack_max = 99, + stack_max = 64, liquids_pointable = false, tool_capabilities = nil, @@ -654,7 +654,7 @@ core.noneitemdef_default = { -- This is used for the hand and unknown items inventory_image = "", wield_image = "", wield_scale = {x=1,y=1,z=1}, - stack_max = 99, + stack_max = 64, liquids_pointable = false, tool_capabilities = nil, diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index 42d8de88..5a0a4d3a 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -23,6 +23,7 @@ local multicraft_developers = { "Alexander Zavrin (Ransom.00)", "sfan5 ", "stujones11 Stuart Jones ", + "paramat", "And other people who helped make the world better!", } diff --git a/builtin/mainmenu/textures.lua b/builtin/mainmenu/textures.lua index 97a2f0aa..cd38b906 100644 --- a/builtin/mainmenu/textures.lua +++ b/builtin/mainmenu/textures.lua @@ -171,14 +171,7 @@ function mm_texture.set_game(identifier, gamedetails) end function mm_texture.set_dirt_bg() - if mm_texture.texturepack ~= nil then - local path = mm_texture.texturepack .. DIR_DELIM .."default_dirt.png" - if core.set_background("background", path, true, 128) then - return true - end - end - -- Use universal fallback texture in textures/base/pack local minimalpath = defaulttexturedir .. "bg.png" - core.set_background("background", minimalpath, true, 128) + core.set_background("background", minimalpath, true, 64) end diff --git a/src/drawscene.cpp b/src/drawscene.cpp index a3faf32b..5bb99b28 100644 --- a/src/drawscene.cpp +++ b/src/drawscene.cpp @@ -617,9 +617,9 @@ void draw_load_screen(const std::wstring &text, IrrlichtDevice* device, else { driver->beginScene(true, true, video::SColor(255, 0, 0, 0)); - video::ITexture *background_image = driver->getTexture((porting::path_share + "/textures/base/bg.png").c_str()); - draw2DImageFilterScaled(driver, background_image, - irr::core::rect(0, 0, screensize.X*2, screensize.Y*2), + video::ITexture *background_image = driver->getTexture((porting::path_share + "/textures/base/bg.png").c_str()); + driver->draw2DImage(background_image, + irr::core::rect(0, 0, screensize.X, screensize.Y), irr::core::rect(0, 0, screensize.X, screensize.Y), 0, 0, false); }