Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2

mods/HUD/mcl_achievements/init.lua

@@ -238,3 +238,20 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		awards.show_to(name, name, nil, false)
 	end
 end)
+
+
+awards.register_achievement("mcl:stoneAge", {
+	title		= S("Stone Age"),
+	description	= S("Mine a stone with new pickaxe."),
+	icon		= "default_cobble.png",
+})
+awards.register_achievement("mcl:hotStuff", {
+	title		= S("Hot Stuff"),
+	description	= S("Put lava in a bucket."),
+	icon		= "bucket_lava.png",
+})
+awards.register_achievement("mcl:obsidian", {
+	title		= S("Ice Bucket Challenge"),
+	description	= S("Obtain an obsidian block."),
+	icon		= "default_obsidian.png",
+})

mods/ITEMS/mcl_buckets/init.lua

@@ -207,6 +207,9 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", {
 			-- Fill bucket, but not in Creative Mode
 			if not minetest.is_creative_enabled(user:get_player_name()) then
 				new_bucket = ItemStack({name = liquiddef.itemname})
+				if liquiddef.itemname == "mcl_buckets:bucket_lava" and awards and awards.unlock and user and user:is_player() then
+					awards.unlock(user:get_player_name(), "mcl:hotStuff")
+				end
 			end
 
 			minetest.add_node(pointed_thing.under, {name="air"})

mods/ITEMS/mcl_core/nodes_base.lua

@@ -33,6 +33,11 @@ minetest.register_node("mcl_core:stone", {
 	_mcl_blast_resistance = 6,
 	_mcl_hardness = 1.5,
 	_mcl_silk_touch_drop = true,
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		if awards and awards.unlock and digger and digger:is_player() then
+			awards.unlock(digger:get_player_name(), "mcl:stoneAge")
+		end
+	end,
 })
 
 minetest.register_node("mcl_core:stone_with_coal", {
@@ -814,6 +819,11 @@ minetest.register_node("mcl_core:obsidian", {
 	groups = {pickaxey=5, building_block=1, material_stone=1},
 	_mcl_blast_resistance = 1200,
 	_mcl_hardness = 50,
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		if awards and awards.unlock and digger and digger:is_player() then
+			awards.unlock(digger:get_player_name(), "mcl:obsidian")
+		end
+	end,
 })
 
 minetest.register_node("mcl_core:ice", {

mods/ITEMS/mcl_portals/portal_nether.lua

@@ -381,6 +381,12 @@ local function finalize_teleport(obj, exit)
 	objpos = {x = floor(objpos.x+0.5), y = ceil(objpos.y), z = floor(objpos.z+0.5)}
 	if mcl_portals.get_node(objpos).name ~= PORTAL then return end
 
+	-- THIS IS A TEMPORATY CODE SECTION FOR COMPATIBILITY REASONS -- 1 of 2 -- TODO: Remove --
+	-- Old worlds have no exits indexed - adding the exit to return here:
+	add_exit(objpos)
+	-- TEMPORATY CODE SECTION ENDS HERE --
+
+
 	-- Enable teleportation cooloff for some seconds, to prevent back-and-forth teleportation
 	teleport_cooloff(obj)
 
@@ -436,7 +442,8 @@ local function ecb_scan_area_2(blockpos, action, calls_remaining, param)
 	local pos0, distance
 	local lava = get_lava_level(pos, pos1, pos2)
 
-	-- THIS IS A TEMPORATY CODE SECTION FOR COMPATIBILITY REASONS --
+	-- THIS IS A TEMPORATY CODE SECTION FOR COMPATIBILITY REASONS -- 2 of 2 -- TODO: Remove --
+	-- Find portals for old worlds (new worlds keep them all in the table):
 	local portals = find_nodes_in_area(pos1, pos2, {PORTAL})
 	if portals and #portals>0 then
 		for _, p in pairs(portals) do