Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

2020-06-20 15:47:46 +02:00
34 changed files with 1 additions and 1 deletions
--- a/moremesecons_adjustable_blinkyplant/textures/moremesecons_blinky_plant_off.png
+++ b/moremesecons_adjustable_blinkyplant/textures/moremesecons_blinky_plant_off.png
--- a/moremesecons_adjustable_blinkyplant/textures/moremesecons_blinky_plant_on.png
+++ b/moremesecons_adjustable_blinkyplant/textures/moremesecons_blinky_plant_on.png
--- a/moremesecons_adjustable_player_detector/textures/moremesecons_player_detector_off.png
+++ b/moremesecons_adjustable_player_detector/textures/moremesecons_player_detector_off.png
--- a/moremesecons_conductor_signalchanger/textures/moremesecons_conductor_signalchanger_off.png
+++ b/moremesecons_conductor_signalchanger/textures/moremesecons_conductor_signalchanger_off.png
--- a/moremesecons_conductor_signalchanger/textures/moremesecons_conductor_signalchanger_on.png
+++ b/moremesecons_conductor_signalchanger/textures/moremesecons_conductor_signalchanger_on.png
--- a/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_bottom.png
+++ b/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_bottom.png
--- a/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_overlay.png
+++ b/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_overlay.png
--- a/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_side_left.png
+++ b/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_side_left.png
--- a/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_side_right.png
+++ b/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_side_right.png
--- a/moremesecons_entity_detector/textures/moremesecons_entity_detector_off.png
+++ b/moremesecons_entity_detector/textures/moremesecons_entity_detector_off.png
--- a/moremesecons_igniter/textures/moremesecons_igniter.png
+++ b/moremesecons_igniter/textures/moremesecons_igniter.png
--- a/moremesecons_jammer/textures/moremesecons_jammer_off.png
+++ b/moremesecons_jammer/textures/moremesecons_jammer_off.png
--- a/moremesecons_jammer/textures/moremesecons_jammer_on.png
+++ b/moremesecons_jammer/textures/moremesecons_jammer_on.png
--- a/moremesecons_luablock/textures/moremesecons_luablock.png
+++ b/moremesecons_luablock/textures/moremesecons_luablock.png
--- a/moremesecons_luacontroller_tool/textures/moremesecons_luacontroller_tool.png
+++ b/moremesecons_luacontroller_tool/textures/moremesecons_luacontroller_tool.png
--- a/moremesecons_playerkiller/textures/moremesecons_playerkiller_side.png
+++ b/moremesecons_playerkiller/textures/moremesecons_playerkiller_side.png
--- a/moremesecons_playerkiller/textures/moremesecons_playerkiller_top.png
+++ b/moremesecons_playerkiller/textures/moremesecons_playerkiller_top.png
--- a/moremesecons_signalchanger/textures/moremesecons_signalchanger_off.png
+++ b/moremesecons_signalchanger/textures/moremesecons_signalchanger_off.png
--- a/moremesecons_signalchanger/textures/moremesecons_signalchanger_on.png
+++ b/moremesecons_signalchanger/textures/moremesecons_signalchanger_on.png
--- a/moremesecons_switchtorch/textures/moremesecons_switchtorch_off.png
+++ b/moremesecons_switchtorch/textures/moremesecons_switchtorch_off.png
--- a/moremesecons_switchtorch/textures/moremesecons_switchtorch_off_ceiling.png
+++ b/moremesecons_switchtorch/textures/moremesecons_switchtorch_off_ceiling.png
--- a/moremesecons_switchtorch/textures/moremesecons_switchtorch_off_side.png
+++ b/moremesecons_switchtorch/textures/moremesecons_switchtorch_off_side.png
--- a/moremesecons_switchtorch/textures/moremesecons_switchtorch_on.png
+++ b/moremesecons_switchtorch/textures/moremesecons_switchtorch_on.png
--- a/moremesecons_switchtorch/textures/moremesecons_switchtorch_on_ceiling.png
+++ b/moremesecons_switchtorch/textures/moremesecons_switchtorch_on_ceiling.png
--- a/moremesecons_switchtorch/textures/moremesecons_switchtorch_on_side.png
+++ b/moremesecons_switchtorch/textures/moremesecons_switchtorch_on_side.png
--- a/moremesecons_timegate/textures/moremesecons_timegate_ends_off.png
+++ b/moremesecons_timegate/textures/moremesecons_timegate_ends_off.png
--- a/moremesecons_timegate/textures/moremesecons_timegate_ends_on.png
+++ b/moremesecons_timegate/textures/moremesecons_timegate_ends_on.png
--- a/moremesecons_timegate/textures/moremesecons_timegate_off.png
+++ b/moremesecons_timegate/textures/moremesecons_timegate_off.png
--- a/moremesecons_timegate/textures/moremesecons_timegate_sides_off.png
+++ b/moremesecons_timegate/textures/moremesecons_timegate_sides_off.png
--- a/moremesecons_timegate/textures/moremesecons_timegate_sides_on.png
+++ b/moremesecons_timegate/textures/moremesecons_timegate_sides_on.png
--- a/moremesecons_utils/init.lua
+++ b/moremesecons_utils/init.lua
@ -378,5 +378,5 @@ local function do_test()
 	--~ data:iterAll()
 end

--~ do_test()
 minetest.log("action", "[moremesecons_utils] loaded.")
+--~ do_test()
--- a/moremesecons_wireless/textures/moremesecons_jammer_bottom.png
+++ b/moremesecons_wireless/textures/moremesecons_jammer_bottom.png
--- a/moremesecons_wireless/textures/moremesecons_wireless_off.png
+++ b/moremesecons_wireless/textures/moremesecons_wireless_off.png
--- a/moremesecons_wireless/textures/moremesecons_wireless_on.png
+++ b/moremesecons_wireless/textures/moremesecons_wireless_on.png