Merge branch 'master' of gitlab.com:daretmavi/bucket-lite

CHANGELOG

@@ -7,7 +7,6 @@ Added settings:
 	
 Some code cleanup
 
-<<<<<<< HEAD
 Support for other mods defining bucket with own water
 	- all materials are supported
 	- like for water_life muddy water

README.md

@@ -9,6 +9,8 @@ Fork of **Minetest Game mod: bucket**
 - If "bucket water" gets in contact with normal water or river water, then the bucket water changes to this type.
 - If "bucket lava" gets in contact with water, or default lava, the bucket lava changes to default type - this can result in lava flooding. Just don't mess up with lava :)
 - liquid can be taken from flowing liquid - you don't have to look for source
+- more buckettypes added (wood, stone, steel, bronze, mese, diamond, gold)
+- default bucker for aliases is steel
 
 **Working with other mods:**
 
@@ -32,6 +34,10 @@ This mod changes it to just one block
 ![Image](screenshot_new.png)
 Minetest: https://www.minetest.net/
 
+Diferent bucket types:
+
+![Image](screenshot_buckets.png)
+
 -----
 
 **Minetest Game mod: bucket**

init.lua

@@ -157,10 +157,6 @@ end
 
 local function register_full_bucket(source, flowing, itemname, inventory_image, name,
 		groups, force_renew, giving_back)
-	-- for compatibility - if not defined, then default empty bucket is used
-	if giving_back == nil then
-		giving_back = "bucket:bucket_empty"
-	end
 	minetest.register_craftitem(itemname, {
 		description = name,
 		inventory_image = inventory_image,