Merge https://git.tchncs.de/Illuna-Minetest/illuna into HEAD

nodes.lua

@@ -421,3 +421,37 @@ for i = 1, 16 do
 	local name = name[i]
     minetest.override_item("wool:"..name, {sounds = illuna.node_sound_wool()})
 end
+
+minetest.register_node("illuna:hardwood_sink", {
+        description = "Illuna Hardwood Sinking",
+        tiles = {"building_blocks_hardwood.png"},
+        liquid_viscosity = 15,
+        liquidtype = "source",
+        liquid_alternative_flowing = "illuna:hardwood_sink",
+        liquid_alternative_source = "illuna:hardwood_sink",
+        liquid_renewable = false,
+        liquid_range = 0,
+        drowning = 1,
+        walkable = false,
+        climbable = false,
+        post_effect_color = {r = 35, g = 21, b = 15, a = 245},
+        groups = {crumbly = 3, sand = 1, liquid = 3, disable_jump = 1},
+        sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("illuna:junglewood_sink", {
+        description = "Illuna Junglewood Sinking",
+        tiles = {"default_junglewood.png"},
+        liquid_viscosity = 15,
+        liquidtype = "source",
+        liquid_alternative_flowing = "illuna:junglewood_sink",
+        liquid_alternative_source = "illuna:junglewood_sink",
+        liquid_renewable = false,
+        liquid_range = 0,
+        drowning = 1,
+        walkable = false,
+        climbable = false,
+        post_effect_color = {r = 35, g = 21, b = 15, a = 245},
+        groups = {crumbly = 3, sand = 1, liquid = 3, disable_jump = 1},
+        sounds = default.node_sound_wood_defaults(),
+})

shop.lua

@@ -40,7 +40,6 @@ illuna.update=function(pos,stat)
 	end
 end
 
-
 minetest.register_entity("illuna:item",{
 	hp_max = 1,
 	visual="wielditem",
@@ -77,7 +76,6 @@ minetest.register_entity("illuna:item",{
 	end,
 })
 
-
 illuna.showform=function(pos,player,re)
 	local meta=minetest.get_meta(pos)
 	local creative=meta:get_int("creative")