Merge branch 'master' into nalc-1.2

2019-05-26 19:07:00 +02:00
parent 778b5493c7 7cdfc3b49c
commit 1eec6e3615
65 changed files with 1290 additions and 811 deletions
--- a/homedecor_lighting/depends.txt
+++ b/homedecor_lighting/depends.txt
@ -6,3 +6,4 @@ creative
 moreblocks?
 building_blocks?
 darkage?
+mesecons?
--- a/homedecor_lighting/init.lua
+++ b/homedecor_lighting/init.lua
--- a/homedecor_lighting/textures/homedecor_glowlight_base.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_base.png
--- a/homedecor_lighting/textures/homedecor_glowlight_bottom.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_bottom.png
--- a/homedecor_lighting/textures/homedecor_glowlight_cube_sides.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_cube_sides.png
--- a/homedecor_lighting/textures/homedecor_glowlight_cube_sides_edges.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_cube_sides_edges.png
--- a/homedecor_lighting/textures/homedecor_glowlight_cube_sides_overlay.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_cube_sides_overlay.png
--- a/homedecor_lighting/textures/homedecor_glowlight_cube_tb.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_cube_tb.png
--- a/homedecor_lighting/textures/homedecor_glowlight_cube_tb_edges.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_cube_tb_edges.png
--- a/homedecor_lighting/textures/homedecor_glowlight_cube_tb_overlay.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_cube_tb_overlay.png
--- a/homedecor_lighting/textures/homedecor_glowlight_tb_edges.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_tb_edges.png
--- a/homedecor_lighting/textures/homedecor_glowlight_thick_sides.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thick_sides.png
--- a/homedecor_lighting/textures/homedecor_glowlight_thick_sides_edges.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thick_sides_edges.png
--- a/homedecor_lighting/textures/homedecor_glowlight_thick_sides_glare.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thick_sides_glare.png
--- a/homedecor_lighting/textures/homedecor_glowlight_thick_sides_overlay.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thick_sides_overlay.png
--- a/homedecor_lighting/textures/homedecor_glowlight_thin_sides.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thin_sides.png
--- a/homedecor_lighting/textures/homedecor_glowlight_thin_sides_edges.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thin_sides_edges.png
--- a/homedecor_lighting/textures/homedecor_glowlight_thin_sides_glare.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thin_sides_glare.png
--- a/homedecor_lighting/textures/homedecor_glowlight_thin_sides_overlay.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thin_sides_overlay.png
--- a/homedecor_lighting/textures/homedecor_glowlight_top.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_top.png
--- a/homedecor_lighting/textures/homedecor_glowlight_top_glare.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_top_glare.png
--- a/homedecor_lighting/textures/homedecor_lattice_lantern_large.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_large.png
--- a/homedecor_lighting/textures/homedecor_lattice_lantern_large_light.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_large_light.png
--- a/homedecor_lighting/textures/homedecor_lattice_lantern_large_overlay.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_large_overlay.png
--- a/homedecor_lighting/textures/homedecor_lattice_lantern_small_sides.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_small_sides.png
--- a/homedecor_lighting/textures/homedecor_lattice_lantern_small_sides_light.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_small_sides_light.png
--- a/homedecor_lighting/textures/homedecor_lattice_lantern_small_sides_overlay.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_small_sides_overlay.png
--- a/homedecor_lighting/textures/homedecor_lattice_lantern_small_tb.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_small_tb.png
--- a/homedecor_lighting/textures/homedecor_lattice_lantern_small_tb_light.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_small_tb_light.png
--- a/homedecor_lighting/textures/homedecor_lattice_lantern_small_tb_overlay.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_small_tb_overlay.png
--- a/homedecor_lighting/textures/homedecor_plasma_lamp_off.png
+++ b/homedecor_lighting/textures/homedecor_plasma_lamp_off.png
--- a/homedecor_lighting/textures/homedecor_rope_light_on_ceiling.png
+++ b/homedecor_lighting/textures/homedecor_rope_light_on_ceiling.png
--- a/homedecor_lighting/textures/homedecor_rope_light_on_floor.png
+++ b/homedecor_lighting/textures/homedecor_rope_light_on_floor.png
--- a/homedecor_lighting/textures/homedecor_table_generic_light_source_off.png
+++ b/homedecor_lighting/textures/homedecor_table_generic_light_source_off.png
--- a/homedecor_lighting/textures/homedecor_table_generic_light_source_on.png
+++ b/homedecor_lighting/textures/homedecor_table_generic_light_source_on.png