Auto disable smooth lighting when fullbright is active

diff --git a/clientmods/autofarm/init.lua b/clientmods/autofarm/init.lua
index 11830d183b14dc22ffc2ef1ea1e41677faafdd6b..3dff43416c845b66aad58155f2e6a549966949bd 100644 (file)
--- a/clientmods/autofarm/init.lua
+++ b/clientmods/autofarm/init.lua
@@ -8,4 +8,4 @@ local function loop()
        minetest.after(0.1, loop)
 end
 
-minetest.after(0.1, loop)
+minetest.register_on_connect(loop)

diff --git a/clientmods/destroyliquids/init.lua b/clientmods/destroyliquids/init.lua
index 5d7e2285e315cbb8afbab30af52e142e68e59348..711754167b58db0b021f7e84b4acc0bc595dffc2 100644 (file)
--- a/clientmods/destroyliquids/init.lua
+++ b/clientmods/destroyliquids/init.lua
@@ -1 +1,22 @@
 minetest.override_item("air", {liquids_pointable = true}) 
+local destroy_water = false
+
+local function loop()
+       if destroy_water then
+               local pos = minetest.find_node_near(minetest.localplayer:get_pos(), 5, "mcl_core:water_source", true)
+               if pos then
+                       minetest.place_node(pos)
+               end
+       end
+       minetest.after(0, loop)
+end
+
+minetest.after(1, loop)
+
+minetest.register_chatcommand("destroywater", {
+       param = "true|false",
+       description = "Turn destroy water on/off",
+       func = function(param)
+               destroy_water = minetest.is_yes(param)
+       end
+})

diff --git a/clientmods/mods.conf b/clientmods/mods.conf
index 657e3a0931103e1526baa2d8624cbef8d43ae3b9..22367f1b90003a9c22fca785dc081698df7656af 100644 (file)
--- a/clientmods/mods.conf
+++ b/clientmods/mods.conf
@@ -3,7 +3,7 @@ load_mod_buildbot = true
 load_mod_colour_chat = true
 load_mod_custom = true
 load_mod_echest = true
-load_mod_autofarm = true
 load_mod_commands = true
 load_mod_test = false
 load_mod_destroyliquids = true
+load_mod_autofarm = false

diff --git a/fonts/Arimo-Regular-old.ttf b/fonts/Arimo-Regular-old.ttf
new file mode 100644 (file)
index 0000000..9be443c
Binary files /dev/null and b/fonts/Arimo-Regular-old.ttf differ

diff --git a/fonts/Arimo-Regular.ttf b/fonts/Arimo-Regular.ttf
old mode 100644 (file)
new mode 100755 (executable)
index 9be443c..778d3a0
Binary files a/fonts/Arimo-Regular.ttf and b/fonts/Arimo-Regular.ttf differ

diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp
index ec896736665db992c670059714514d49c30e701e..c65f5492a4d2f7b1d0c3a6d26c22e9737eed0903 100644 (file)
--- a/src/client/mapblock_mesh.cpp
+++ b/src/client/mapblock_mesh.cpp
@@ -116,7 +116,7 @@ void MeshMakeData::setCrack(int crack_level, v3s16 crack_pos)
 
 void MeshMakeData::setSmoothLighting(bool smooth_lighting)
 {
-       m_smooth_lighting = smooth_lighting;
+       m_smooth_lighting = smooth_lighting && ! g_settings->getBool("fullbright");
 }
 
 /*