Merge branch 'master' of https://github.com/Ombridride/minetest-minetestforfun-server

minetestforfun_game/mods/boats/init.lua

@@ -228,7 +228,7 @@ boats.register_boat({
 	controls = {
 		up = 0.25,
 		down = 0.25,
-		rotate = 2
+		rotate = 4
 	},
 	description = "Expert race boat"
 })

minetestforfun_game/mods/default/crafting.lua

@@ -548,6 +548,34 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "default:gravel",
+	recipe = {
+		{"default:cobble"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:sand",
+	recipe = {
+		{"default:desert_sand"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:desert_sand",
+	recipe = {
+		{"default:sand"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:sand",
+	recipe = {
+		{"default:gravel"},
+	}
+})
+
 minetest.register_craft({
 	type = "cooking",
 	output = "default:stone",

minetestforfun_game/mods/default/nodes.lua

@@ -994,7 +994,7 @@ minetest.register_node("default:sand_flowing", {
 			animation={type = "vertical_frames", aspect_w= 16, aspect_h = 16, length = 0.6}
 		},
 	},
-	alpha = 160,
+	alpha = 255,
 	paramtype = "light",
 	paramtype2 = "flowingliquid",
 	walkable = false,
@@ -1007,7 +1007,7 @@ minetest.register_node("default:sand_flowing", {
 	liquid_alternative_flowing = "default:sand_flowing",
 	liquid_alternative_source = "default:sand_source",
 	liquid_viscosity = 20,
-	post_effect_color = {a = 220, r = 187, g = 187, b = 0},
+	post_effect_color = {a = 250, r = 0, g = 0, b = 0},
 	groups = {liquid = 3, not_in_creative_inventory = 1},
 })
 
@@ -1015,9 +1015,7 @@ minetest.register_node("default:sand_source", {
 	description = "Sand Source",
 	inventory_image = minetest.inventorycube("default_sand.png"),
 	drawtype = "liquid",
-	tiles = {
+	tiles = {"default_sand.png"},
-		{name = "default_sand_source_animated.png", animation={type = "vertical_frames", aspect_w= 16, aspect_h = 16, length = 1.5}}
-	},
 	special_tiles = {
 		-- New-style water source material (mostly unused)
 		{
@@ -1026,7 +1024,7 @@ minetest.register_node("default:sand_source", {
 			backface_culling = false,
 		}
 	},
-	alpha = 160,
+	alpha = 255,
 	paramtype = "light",
 	walkable = false,
 	pointable = false,
@@ -1039,7 +1037,7 @@ minetest.register_node("default:sand_source", {
 	liquid_alternative_source = "default:sand_source",
 	liquid_viscosity = 20,
 	liquid_renewable = false,
-	post_effect_color = {a = 220, r = 187, g = 187, b = 0},
+	post_effect_color = {a = 250, r = 0, g = 0, b = 0},
 	groups = {liquid = 3},
 })