diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index aec5d79ee..5bfeef3eb 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -24,7 +24,6 @@ tab_credits = { local logofile = defaulttexturedir .. "logo.png" return "vertlabel[0,-0.25;CREDITS]" .. "image[-0.3,-0.31;" .. core.formspec_escape(defaulttexturedir .. "bg.png") .. "]".. - "image[-0.3,-0.96;" .. core.formspec_escape(defaulttexturedir .. "bg_tab_credits.png") .. "]".. "label[0.5,3;Minetest " .. core.get_version() .. "]" .. "label[0.5,3.3;http://minetest.net]" .. "image[0.5,1;" .. core.formspec_escape(logofile) .. "]" .. diff --git a/builtin/mainmenu/tab_mods.lua b/builtin/mainmenu/tab_mods.lua index 8dab0148c..2598ca298 100644 --- a/builtin/mainmenu/tab_mods.lua +++ b/builtin/mainmenu/tab_mods.lua @@ -34,8 +34,7 @@ local function get_formspec(tabview, name, tabdata) ";" .. tabdata.selected_mod .. "]" retval = retval .. - "image[-0.3,-0.31;" .. core.formspec_escape(defaulttexturedir .. "bg.png") .. "]".. - "image[-0.3,-0.96;" .. core.formspec_escape(defaulttexturedir .. "bg_tab_mods.png") .. "]".. + "image[-0.3,-0.31;" .. core.formspec_escape(defaulttexturedir .. "bg.png") .. "]".. "label[0.8,4.2;" .. fgettext("Add mod:") .. "]" .. -- TODO Disabled due to upcoming release 0.4.8 and irrlicht messing up localization -- "button[0.75,4.85;1.8,0.5;btn_mod_mgr_install_local;".. fgettext("Local install") .. "]" .. diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua index f2b0f0ee9..19cdcf045 100644 --- a/builtin/mainmenu/tab_multiplayer.lua +++ b/builtin/mainmenu/tab_multiplayer.lua @@ -22,7 +22,6 @@ local function get_formspec(tabview, name, tabdata) local retval = "vertlabel[0,-0.25;".. fgettext("CLIENT") .. "]" .. "image[-0.3,-0.31;" .. core.formspec_escape(defaulttexturedir .. "bg.png") .. "]".. - "image[-0.3,-0.96;" .. core.formspec_escape(defaulttexturedir .. "bg_tab_client.png") .. "]".. "label[1,-0.25;".. fgettext("Favorites:") .. "]".. "label[1,4.25;".. fgettext("Address/Port") .. "]".. "label[9,2.75;".. fgettext("Name/Password") .. "]" .. diff --git a/builtin/mainmenu/tab_server.lua b/builtin/mainmenu/tab_server.lua index b99ea44d6..d33ea5a12 100644 --- a/builtin/mainmenu/tab_server.lua +++ b/builtin/mainmenu/tab_server.lua @@ -23,8 +23,7 @@ local function get_formspec(tabview, name, tabdata) ) local retval = - "image[-0.3,-0.31;" .. core.formspec_escape(defaulttexturedir .. "bg.png") .. "]".. - "image[-0.3,-0.96;" .. core.formspec_escape(defaulttexturedir .. "bg_tab_server.png") .. "]".. + "image[-0.3,-0.31;" .. core.formspec_escape(defaulttexturedir .. "bg.png") .. "]".. "button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" .. "button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" .. "button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" .. diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index 4e450fdfa..6e9e49144 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -131,7 +131,6 @@ local function formspec(tabview, name, tabdata) local tab_string = "image[-0.3,-0.31;" .. core.formspec_escape(defaulttexturedir .. "bg.png") .. "]".. - "image[-0.3,-0.96;" .. core.formspec_escape(defaulttexturedir .. "bg_tab_settings.png") .. "]".. "vertlabel[0,-0.25;" .. fgettext("SETTINGS") .. "]" .. "box[0.75,0;3.25,4;#999999]" .. "checkbox[1,0;cb_smooth_lighting;".. fgettext("Smooth Lighting") diff --git a/builtin/mainmenu/tab_singleplayer.lua b/builtin/mainmenu/tab_singleplayer.lua index a6ef06293..bc1f6e764 100644 --- a/builtin/mainmenu/tab_singleplayer.lua +++ b/builtin/mainmenu/tab_singleplayer.lua @@ -84,7 +84,6 @@ local function get_formspec(tabview, name, tabdata) retval = retval .. "image[-0.3,-0.31;" .. core.formspec_escape(defaulttexturedir .. "bg.png") .. "]".. "image[-0.3,5.65;" .. core.formspec_escape(defaulttexturedir .. "bg_game.png") .. "]".. - "image[-0.3,-0.96;" .. core.formspec_escape(defaulttexturedir .. "bg_tab_singleplayer.png") .. "]".. "button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" .. "button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" .. "button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" .. diff --git a/builtin/mainmenu/tab_texturepacks.lua b/builtin/mainmenu/tab_texturepacks.lua index 87fa0af52..4c7e220cb 100644 --- a/builtin/mainmenu/tab_texturepacks.lua +++ b/builtin/mainmenu/tab_texturepacks.lua @@ -46,7 +46,6 @@ local function get_formspec(tabview, name, tabdata) local retval = "image[-0.3,-0.31;" .. core.formspec_escape(defaulttexturedir .. "bg.png") .. "]".. - "image[-0.3,-0.96;" .. core.formspec_escape(defaulttexturedir .. "bg_tab_textures.png") .. "]".. "label[4,-0.25;".. fgettext("Select texture pack:") .. "]".. "vertlabel[0,-0.25;".. fgettext("TEXTURE PACKS") .. "]" .. "textlist[4,0.25;7.5,5.0;TPs;" diff --git a/textures/base/pack/bg.png b/textures/base/pack/bg.png index dcd6b60a9..e6ca5c427 100644 Binary files a/textures/base/pack/bg.png and b/textures/base/pack/bg.png differ diff --git a/textures/base/pack/bg2.png b/textures/base/pack/bg2.png deleted file mode 100644 index e6ca5c427..000000000 Binary files a/textures/base/pack/bg2.png and /dev/null differ diff --git a/textures/base/pack/bg2_game.png b/textures/base/pack/bg2_game.png deleted file mode 100644 index 09a9a2597..000000000 Binary files a/textures/base/pack/bg2_game.png and /dev/null differ diff --git a/textures/base/pack/bg2_tab_client.png b/textures/base/pack/bg2_tab_client.png deleted file mode 100644 index 49274e977..000000000 Binary files a/textures/base/pack/bg2_tab_client.png and /dev/null differ diff --git a/textures/base/pack/bg2_tab_credits.png b/textures/base/pack/bg2_tab_credits.png deleted file mode 100644 index 8e072094d..000000000 Binary files a/textures/base/pack/bg2_tab_credits.png and /dev/null differ diff --git a/textures/base/pack/bg2_tab_mods.png b/textures/base/pack/bg2_tab_mods.png deleted file mode 100644 index 5003da6b0..000000000 Binary files a/textures/base/pack/bg2_tab_mods.png and /dev/null differ diff --git a/textures/base/pack/bg2_tab_server.png b/textures/base/pack/bg2_tab_server.png deleted file mode 100644 index f1f568cba..000000000 Binary files a/textures/base/pack/bg2_tab_server.png and /dev/null differ diff --git a/textures/base/pack/bg2_tab_settings.png b/textures/base/pack/bg2_tab_settings.png deleted file mode 100644 index 3aacafc7e..000000000 Binary files a/textures/base/pack/bg2_tab_settings.png and /dev/null differ diff --git a/textures/base/pack/bg2_tab_singleplayer.png b/textures/base/pack/bg2_tab_singleplayer.png deleted file mode 100644 index 6e4a68a2c..000000000 Binary files a/textures/base/pack/bg2_tab_singleplayer.png and /dev/null differ diff --git a/textures/base/pack/bg2_tab_textures.png b/textures/base/pack/bg2_tab_textures.png deleted file mode 100644 index ee010f73c..000000000 Binary files a/textures/base/pack/bg2_tab_textures.png and /dev/null differ diff --git a/textures/base/pack/bg_game.png b/textures/base/pack/bg_game.png index 1a920c76d..09a9a2597 100644 Binary files a/textures/base/pack/bg_game.png and b/textures/base/pack/bg_game.png differ diff --git a/textures/base/pack/bg_tab_client.png b/textures/base/pack/bg_tab_client.png deleted file mode 100644 index b47e874ce..000000000 Binary files a/textures/base/pack/bg_tab_client.png and /dev/null differ diff --git a/textures/base/pack/bg_tab_credits.png b/textures/base/pack/bg_tab_credits.png deleted file mode 100644 index 2ac412e0f..000000000 Binary files a/textures/base/pack/bg_tab_credits.png and /dev/null differ diff --git a/textures/base/pack/bg_tab_mods.png b/textures/base/pack/bg_tab_mods.png deleted file mode 100644 index f6eb192c2..000000000 Binary files a/textures/base/pack/bg_tab_mods.png and /dev/null differ diff --git a/textures/base/pack/bg_tab_server.png b/textures/base/pack/bg_tab_server.png deleted file mode 100644 index 1e104e0f5..000000000 Binary files a/textures/base/pack/bg_tab_server.png and /dev/null differ diff --git a/textures/base/pack/bg_tab_settings.png b/textures/base/pack/bg_tab_settings.png deleted file mode 100644 index 8d2b2c1a0..000000000 Binary files a/textures/base/pack/bg_tab_settings.png and /dev/null differ diff --git a/textures/base/pack/bg_tab_singleplayer.png b/textures/base/pack/bg_tab_singleplayer.png deleted file mode 100644 index 650fc0690..000000000 Binary files a/textures/base/pack/bg_tab_singleplayer.png and /dev/null differ diff --git a/textures/base/pack/bg_tab_textures.png b/textures/base/pack/bg_tab_textures.png deleted file mode 100644 index 31c58645e..000000000 Binary files a/textures/base/pack/bg_tab_textures.png and /dev/null differ