diff --git a/chains/textures/chains_brass.png b/chains/textures/chains_brass.png index e8f1f34f..89a5c221 100644 Binary files a/chains/textures/chains_brass.png and b/chains/textures/chains_brass.png differ diff --git a/homedecor/bathroom_sanitation.lua b/homedecor/bathroom_sanitation.lua index c95406a8..382687ca 100644 --- a/homedecor/bathroom_sanitation.lua +++ b/homedecor/bathroom_sanitation.lua @@ -120,10 +120,10 @@ homedecor.register("taps_brass", { description = S("Bathroom taps/faucet (brass)"), mesh = "homedecor_bathroom_faucet.obj", tiles = { - "homedecor_tile_brass2.png", - "homedecor_tile_brass2.png", + "homedecor_tile_brass.png", + "homedecor_tile_brass.png", "homedecor_white_metal.png", - "homedecor_tile_brass2.png" + "homedecor_tile_brass.png" }, inventory_image = "3dforniture_taps_brass_inv.png", wield_image = "3dforniture_taps_brass_inv.png", diff --git a/homedecor/clocks.lua b/homedecor/clocks.lua index 06cd7d46..cbb56fc1 100644 --- a/homedecor/clocks.lua +++ b/homedecor/clocks.lua @@ -81,7 +81,7 @@ homedecor.register("grandfather_clock", { "homedecor_grandfather_clock_face.png", "homedecor_grandfather_clock_wood.png", "homedecor_grandfather_clock_face_edge.png", - "homedecor_tile_brass2.png" + "homedecor_tile_brass.png" }, inventory_image = "homedecor_grandfather_clock_inv.png", groups = { snappy = 3 }, diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index 2bee15f0..25cfccc4 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -222,7 +222,7 @@ homedecor.register("candlestick_brass", { tiles = { "homedecor_candle_sides.png", {name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, - "homedecor_tile_brass2.png", + "homedecor_tile_brass.png", }, inventory_image = "homedecor_candlestick_brass_inv.png", selection_box = cs_cbox, @@ -266,7 +266,7 @@ homedecor.register("oil_lamp", { tiles = { "homedecor_oil_lamp_handles.png", "homedecor_oil_lamp_glass.png", - "homedecor_tile_brass2.png", + "homedecor_tile_brass.png", "homedecor_oil_lamp_base.png", "homedecor_oil_lamp_top.png", }, @@ -488,7 +488,7 @@ homedecor.register("ceiling_lamp", { description = S("Ceiling Lamp"), mesh = "homedecor_ceiling_lamp.obj", tiles = { - "homedecor_tile_brass2.png", + "homedecor_tile_brass.png", "homedecor_ceiling_lamp_glass.png", "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200", "homedecor_generic_brown_plastic.png", @@ -505,7 +505,7 @@ homedecor.register("ceiling_lamp_off", { description = S("Ceiling Lamp (off)"), mesh = "homedecor_ceiling_lamp.obj", tiles = { - "homedecor_tile_brass2.png", + "homedecor_tile_brass.png", "homedecor_ceiling_lamp_glass.png", "homedecor_table_standing_lamp_lightbulb.png", "homedecor_generic_brown_plastic.png", diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 3fd955e5..8d460c5b 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -62,7 +62,7 @@ end homedecor.register("pole_brass", { description = S("Brass Pole"), mesh = "homedecor_round_pole.obj", - tiles = {"homedecor_tile_brass2.png"}, + tiles = {"homedecor_tile_brass.png^homedecor_tile_horizlines_overlay.png",}, inventory_image = "homedecor_pole_brass_inv.png", wield_image = "homedecor_pole_brass_inv.png", selection_box = { @@ -437,7 +437,7 @@ homedecor.register("piano", { mesh = "homedecor_piano.obj", tiles = { "homedecor_piano_keys.png", - "homedecor_tile_brass2.png", + "homedecor_tile_brass.png", "homedecor_piano_wood.png" }, inventory_image = "homedecor_piano_inv.png", @@ -694,7 +694,7 @@ homedecor.banister_materials = { { "brass", "brass", "homedecor_white_wood.png", - "homedecor_tile_brass2.png", + "homedecor_tile_brass.png", "technic:brass_ingot", "group:stick", "", diff --git a/homedecor/textures/homedecor_tile_brass.png b/homedecor/textures/homedecor_tile_brass.png index 7743fa94..89a5c221 100644 Binary files a/homedecor/textures/homedecor_tile_brass.png and b/homedecor/textures/homedecor_tile_brass.png differ diff --git a/homedecor/textures/homedecor_tile_brass2.png b/homedecor/textures/homedecor_tile_brass2.png deleted file mode 100644 index e8f1f34f..00000000 Binary files a/homedecor/textures/homedecor_tile_brass2.png and /dev/null differ diff --git a/homedecor/textures/homedecor_tile_horizlines_overlay.png b/homedecor/textures/homedecor_tile_horizlines_overlay.png new file mode 100644 index 00000000..daf157ef Binary files /dev/null and b/homedecor/textures/homedecor_tile_horizlines_overlay.png differ diff --git a/homedecor/window_treatments.lua b/homedecor/window_treatments.lua index 73e67892..f4f20363 100644 --- a/homedecor/window_treatments.lua +++ b/homedecor/window_treatments.lua @@ -171,7 +171,7 @@ for c in ipairs(curtaincolors) do end local mats = { - { "brass", "Brass", "homedecor_tile_brass2.png" }, + { "brass", "Brass", "homedecor_tile_brass.png" }, { "wrought_iron", "Wrought iron", "homedecor_tile_wrought_iron2.png" }, { "wood", "Wooden", "default_wood.png" } }