diff --git a/mods/craftingpack/crafting/creative.lua b/mods/craftingpack/crafting/creative.lua index acc34490a0..76e83d4b55 100644 --- a/mods/craftingpack/crafting/creative.lua +++ b/mods/craftingpack/crafting/creative.lua @@ -186,24 +186,23 @@ crafting.set_creative_formspec = function(player, start_i, pagenum, show, page) "background[-0.19,-0.25;10.5,9.87;crafting_inventory_creative.png]".. "label[-5,-5;"..name.."]".. "image[" .. offset[name] .. ";1.5,1.44;crafting_creative_active.png"..hoch[name].."]".. - "image_button[-0.1,0;1,1;"..bg["blocks"].."^crafting_creative_build.png;build;]".. --build blocks - "image_button[1.15,0;1,1;"..bg["deco"].."^crafting_creative_deko.png;deco;]".. --decoration blocks - "image_button[2.415,0;1,1;"..bg["redstone"].."^crafting_creative_redstone.png;redstone;]".. --redstone - "image_button[3.693,0;1,1;"..bg["rail"].."^crafting_creative_rail.png;rail;]".. --transportation - "image_button[4.93,0;1,1;"..bg["misc"].."^crafting_creative_misc.png;misc;]".. --miscellaneous - "image_button[9.19,0;1,1;"..bg["nix"].."^crafting_creative_all.png;default;]".. --search + "image_button[-0.1,0;1,1;"..bg["blocks"].."^default_brick.png;build;]".. --build blocks + "image_button[1.15,0;1,1;"..bg["deco"].."^flower_peony.png;deco;]".. --decoration blocks + "image_button[2.415,0;1,1;"..bg["redstone"].."^mesecons_redstone_dust.png;redstone;]".. --redstone + "image_button[3.693,0;1,1;"..bg["rail"].."^carts_rail_pwr.png;rail;]".. --transportation + "image_button[4.93,0;1,1;"..bg["misc"].."^bucket_lava.png;misc;]".. --miscellaneous + "image_button[9.19,0;1,1;"..bg["nix"].."^default_sign.png;default;]".. --search "image[0,1;5,0.75;fnt_"..name..".png]".. "list[current_player;main;0,7;9,1;]".. main_list.. "image_button[9.03,1.74;0.85,0.6;crafting_creative_up.png;creative_prev;]".. "image[9.04," .. tostring(slider_pos) .. ";0.75,"..tostring(slider_height) .. ";crafting_slider.png]".. "image_button[9.03,6.15;0.85,0.6;crafting_creative_down.png;creative_next;]".. - "image_button[-0.1,8.28;1,1;"..bg["food"].."^crafting_food.png;food;]".. --foodstuff - "image_button[1.15,8.28;1,1;"..bg["tools"].."^crafting_creative_tool.png;tools;]".. --tools - "image_button[2.415,8.28;1,1;"..bg["combat"].."^crafting_creative_sword.png;combat;]".. --combat - "image_button[3.693,8.28;1,1;"..bg["matr"].."^crafting_creative_matr.png;matr;]".. --brewing - --"image_button[4.93,8.28;1,1;"..bg["brew"].."^crafting_creative_matr.png;matr;]".. --materials^ - "image_button[9.19,8.28;1,1;"..bg["inv"].."^crafting_creative_inv.png;inv;]".. --inventory + "image_button[-0.1,8.28;1,1;"..bg["food"].."^default_apple.png;food;]".. --foodstuff + "image_button[1.15,8.28;1,1;"..bg["tools"].."^default_tool_steelaxe.png;tools;]".. --tools + "image_button[2.415,8.28;1,1;"..bg["combat"].."^default_tool_goldsword.png;combat;]".. --combat + "image_button[3.693,8.28;1,1;"..bg["matr"].."^default_stick.png;matr;]".. --brewing + "image_button[9.19,8.28;1,1;"..bg["inv"].."^default_chest_front.png;inv;]".. --inventory "list[detached:creative_trash;main;9,7;1,1;]".. "image[9,7;1,1;crafting_creative_trash.png]".. listrings diff --git a/mods/craftingpack/crafting/textures/crafting_creative_all.png b/mods/craftingpack/crafting/textures/crafting_creative_all.png deleted file mode 100644 index 2a67b84346..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_all.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_build.png b/mods/craftingpack/crafting/textures/crafting_creative_build.png deleted file mode 100644 index 6220ae862c..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_build.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_deko.png b/mods/craftingpack/crafting/textures/crafting_creative_deko.png deleted file mode 100644 index 2111740a3a..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_deko.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_down.png b/mods/craftingpack/crafting/textures/crafting_creative_down.png deleted file mode 100644 index 212f687a40..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_down.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_inv.png b/mods/craftingpack/crafting/textures/crafting_creative_inv.png deleted file mode 100644 index d2d6a91fa5..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_inv.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_matr.png b/mods/craftingpack/crafting/textures/crafting_creative_matr.png deleted file mode 100644 index f2683c4a06..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_matr.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_misc.png b/mods/craftingpack/crafting/textures/crafting_creative_misc.png deleted file mode 100644 index bb71c62159..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_misc.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_rail.png b/mods/craftingpack/crafting/textures/crafting_creative_rail.png deleted file mode 100644 index 0d4c505dbf..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_rail.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_redstone.png b/mods/craftingpack/crafting/textures/crafting_creative_redstone.png deleted file mode 100644 index 2a8c256fcf..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_redstone.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_sword.png b/mods/craftingpack/crafting/textures/crafting_creative_sword.png deleted file mode 100644 index c2426c4c05..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_sword.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_tool.png b/mods/craftingpack/crafting/textures/crafting_creative_tool.png deleted file mode 100644 index 1b9ef14fee..0000000000 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_tool.png and /dev/null differ diff --git a/mods/craftingpack/crafting/textures/crafting_creative_trash.png b/mods/craftingpack/crafting/textures/crafting_creative_trash.png index 63d5e19c3e..286f5b92cf 100644 Binary files a/mods/craftingpack/crafting/textures/crafting_creative_trash.png and b/mods/craftingpack/crafting/textures/crafting_creative_trash.png differ diff --git a/mods/default/textures/default_redstone_dust.png b/mods/redstone/mesecons/textures/mesecons_redstone_dust.png similarity index 100% rename from mods/default/textures/default_redstone_dust.png rename to mods/redstone/mesecons/textures/mesecons_redstone_dust.png diff --git a/mods/redstone/mesecons/wires.lua b/mods/redstone/mesecons/wires.lua index 7e9bbaefb8..8c9a5f7d0c 100644 --- a/mods/redstone/mesecons/wires.lua +++ b/mods/redstone/mesecons/wires.lua @@ -102,8 +102,8 @@ for zmy=0, 1 do is_ground_content = false, -- inventory_image = "wires_inv.png", -- wield_image = "wires_inv.png", - inventory_image = "default_redstone_dust.png", - wield_image = "default_redstone_dust.png", + inventory_image = "mesecons_redstone_dust.png", + wield_image = "mesecons_redstone_dust.png", paramtype = "light", paramtype2 = "facedir", sunlight_propagates = true,