Merge remote-tracking branch 'upstream/master' into forkhausen

README.md

@@ -2,7 +2,7 @@
 An unofficial Minecraft-like game for Minetest. Forked from MineClone2 developed by Wuzzy 
 and contributors which is a fork of MineClone by davedevils. Not developed or endorsed by Mojang AB.
 
-Version: 0.65.1
+Version: 0.65.2
 
 ## Differences to MineClone 2
 So far some minor fixes that I also sent upstream to Wuzzy for inclusion and some yet unmerged features from others:
@@ -269,6 +269,8 @@ project by davedevils which fell under the same license.
 
 Mods credit:
 See `README.txt` or `README.md` in each mod directory for information about other authors.
+For mods that do not have such a file, the license is the source code license
+of MineClone 2 and the author is Wuzzy.
 
 ### License of media (textures and sounds)
 No non-free licenses are used anywhere.

mods/CORE/walkover/README.md

@@ -1,11 +1,11 @@
-WalkOver
+Walkover
 --------
 
-Some mode developers have shown an interest in having an on_walk_over event. This is useful for pressure-plates and the like.
+Some mode developers have shown an interest in having an `on_walk_over` event. This is useful for pressure-plates and the like.
 
 See this issue - https://github.com/minetest/minetest/issues/247
 
-I have implemented a server_side version in lua using globalstep which people might find useful. Of course this would better implemented via a client-based "on walk over", but it is sufficient for my needs now.
+I have implemented a server-side version in Lua using globalstep which people might find useful. Of course this would better implemented via a client-based "on walk over", but it is sufficient for my needs now.
 
 Example Usage
 -------------
@@ -19,3 +19,6 @@ Example Usage
     })
 
  
+Credits
+-------
+Mod created by lordfingle, licensed under Apache License 2.0.

mods/ENTITIES/mcl_boats/README.txt

@@ -10,8 +10,7 @@ License of boat model:
 GNU GPLv3 <https://www.gnu.org/licenses/gpl-3.0.html>
 
 ## Textures
-All textures are from the Faithful texture pack for Minecraft.
-See the main MineClone 2 license to learn more.
+See the main MineClone 2 README.md file to learn more.
 
 ## Code
 Code based on Minetest Game, licensed under the MIT License (MIT).

mods/ENTITIES/mcl_minecarts/README.txt

@@ -3,12 +3,6 @@ mcl_minecarts
 Based on the mod "boost_carts" by Krock.
 Target: Run smoothly and do not use too much CPU.
 
-TODO:
-- Minecraft-like physics
-- Add activator rail
-- Add more rail textures
-- Add loaded minecarts
-
 License of source code:
 -----------------------
 MIT License
@@ -23,10 +17,5 @@ Authors/licenses of media files:
 Minecart model:
   22i (GPLv3)
 
-Wuzzy (based on Pixel Perfection 1.11, MIT License):
-  carts_rail_crossing_pwr.png
-  carts_rail_curved_pwr.png
-  carts_rail_t_junction_pwr.png
-
-Other texture files (CC BY-SA 3.0:
+Texture files (CC BY-SA 3.0):
   XSSheep

mods/ENTITIES/mcl_mobs/api.lua

@@ -933,14 +933,25 @@ local do_env_damage = function(self)
 	and (nodef.groups.disable_suffocation ~= 1)
 	and (nodef.groups.opaque == 1) then
 
-		-- 2 damage per second
-		-- TODO: Deal this damage once every 1/2 second
-		self.health = self.health - 2
+		-- Short grace period before starting to take suffocation damage.
+		-- This is different from players, who take damage instantly.
+		-- This has been done because mobs might briefly be inside solid nodes
+		-- when e.g. climbing up stairs.
+		-- This is a bit hacky because it assumes that do_env_damage
+		-- is called roughly every second only.
+		self.suffocation_timer = self.suffocation_timer + 1
+		if self.suffocation_timer >= 3 then
+			-- 2 damage per second
+			-- TODO: Deal this damage once every 1/2 second
+			self.health = self.health - 2
 
-		if check_for_death(self, "suffocation", {type = "environment",
-				pos = pos, node = self.standing_in}) then
-			return true
+			if check_for_death(self, "suffocation", {type = "environment",
+					pos = pos, node = self.standing_in}) then
+				return true
+			end
 		end
+	else
+		self.suffocation_timer = 0
 	end
 
 	return check_for_death(self, "", {type = "unknown"})
@@ -3349,7 +3360,7 @@ minetest.register_entity(name, {
 	replace_offset = def.replace_offset or 0,
 	on_replace = def.on_replace,
 	timer = 0,
-	env_damage_timer = 0, -- only used when state = "attack"
+	env_damage_timer = 0,
 	tamed = false,
 	pause_timer = 0,
 	horny = false,
@@ -3396,6 +3407,7 @@ minetest.register_entity(name, {
 	shoot_arrow = def.shoot_arrow,
         sounds_child = def.sounds_child,
 	explosion_strength = def.explosion_strength,
+	suffocation_timer = 0,
 	-- End of MCL2 extensions
 
 	on_spawn = def.on_spawn,

mods/ENVIRONMENT/mcl_weather/README.md

@@ -1,6 +1,6 @@
 `mcl_weather`
 =======================
-Weather mod for MineClone 2. Forked from `weather_pack`.
+Weather mod for MineClone 2. Forked from the `weather_pack` mod by xeranas.
 
 Weathers included
 -----------------------

mods/ITEMS/REDSTONE/mesecons_torch/init.lua

@@ -176,6 +176,10 @@ mcl_torches.register_torch("mesecon_torch_on", S("Redstone Torch"),
 	{dig_immediate=3, dig_by_water=1, redstone_torch=1, mesecon_ignore_opaque_dig=1},
 	mcl_sounds.node_sound_wood_defaults(),
 	{
+		on_destruct = function(pos, oldnode)
+			local node = minetest.get_node(pos)
+			torch_action_on(pos, node)
+		end,
 		mesecons = {
 			receptor = {
 				state = mesecon.state.on,

mods/ITEMS/mcl_banners/README.txt

@@ -1,6 +1,6 @@
 License of code: WTFPL
 
-License of textures: See README.me in top directory of MineClone 2.
+License of textures: See README.md in top directory of MineClone 2.
 
 License of models: GPLv3 (https://www.gnu.org/licenses/gpl-3.0.html)
 Models author: 22i.

mods/ITEMS/mcl_doors/api_doors.lua

@@ -360,6 +360,7 @@ function mcl_doors:register_door(name, def)
 
 		mesecons = { effector = {
 			action_on = on_mesecons_signal_open_top,
+			rules = mesecon.rules.flat,
 		}},
 
 		on_rotate = function(pos, node, user, mode, param2)
@@ -478,6 +479,7 @@ function mcl_doors:register_door(name, def)
 
 		mesecons = { effector = {
 			action_off = on_mesecons_signal_close_top,
+			rules = mesecon.rules.flat,
 		}},
 
 		on_rotate = function(pos, node, user, mode, param2)

mods/ITEMS/mcl_doors/depends.txt

@@ -2,3 +2,4 @@ mcl_core
 mcl_sounds
 doc?
 screwdriver?
+mesecons

mods/ITEMS/mcl_fire/README.txt

@@ -30,3 +30,5 @@ http://www.freesound.org/people/Dynamicell/sounds/17548/
 Benboncan (CC BY 3.0)
 https://www.freesound.org/people/Benboncan/sounds/66457/
   fire_flint_and_steel.ogg
+
+Other sound files by Perttu Ahola (celeron55) <celeron55@gmail.com> (CC BY-SA 3.0).

mods/ITEMS/mcl_furnaces/README.md

@@ -9,4 +9,4 @@ Modified by Wuzzy.
 
 License of media
 ----------------
-MIT License
+See the main MineClone 2 README.md file.

mods/ITEMS/mcl_heads/README.txt

@@ -1,4 +0,0 @@
-All textures from Faithful Vanilla texture pack.
-
-The mcl_heads_* texture were created by kingoscargames,
-based on aforementioned texture pack.

mods/ITEMS/mcl_jukebox/README.md

@@ -1,22 +1,34 @@
-Jukebox mod for MineClone 2.
+# Jukebox mod for MineClone 2.
 
----
+Based on the `jdukebox` mod by Jordach. This adds a jukebox block and
+music disc. Just place a music disc in a jukebox and music starts
+to play. And that's it!
 
-Licenced as GPLv3.
+## Track list
 
-Based on the jdukebox mod by Jordach.
-Music by Jordach, HeroOfTheWinds and Junichi Masuda
-(see in-game item tooltip for details).
+`mcl_jukebox_track_1.ogg`: “The Evil Sister (Jordach's Mix)” by SoundHelix (CC0)
+`mcl_jukebox_track_2.ogg`: “The Energetic Rat (Jordach's Mix)” by SoundHelix (CC0)
+`mcl_jukebox_track_3.ogg`: “Eastern Feeling” by Jordach (CC0)
+`mcl_jukebox_track_4.ogg`: “Minetest” by Jordach (CC0)
+`mcl_jukebox_track_5.ogg`: “Credit Roll (Jordach's HD Mix)” by Junichi Masuda (CC0)
+`mcl_jukebox_track_6.ogg`: “Winter Feeling" by Tom Peter (CC BY-SA 3.0)
+`mcl_jukebox_track_7.ogg`: “Synthgroove (Jordach's Mix)” by HeroOfTheWinds (CC0)
+`mcl_jukebox_track_8.ogg`: “The Clueless Frog (Jordach's Mix)” by SoundHelix (CC0)
 
-`mcl_jukebox_track_6.ogg`
-“Winter Feeling”, by Tom Peter
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) <http://creativecommons.org/licenses/by-sa/3.0/>
-Source: <https://opengameart.org/content/winter-feeling>
+Note: 9 tracks are included. 3 music disc textures are currently unused.
 
+### Sources
 
----
+* “Winter Feeling”: <https://opengameart.org/content/winter-feeling>
+* Other tracks: <https://github.com/Jordach/jdukebox/>
 
-Textures from Faithful texture pack.
+### License
 
-9 tracks are included.
-3 music disc textures are currently unused.
+Code licenced as GPLv3. Music under individual licenses (see abbreviations
+above). Texture license: See main MineClone 2 README.md file.
+
+See here for the full license texts:
+
+* CC0: <https://creativecommons.org/publicdomain/zero/1.0/>
+* CC BY-SA 3.0: <http://creativecommons.org/licenses/by-sa/3.0/>
+* GPLv3: <https://www.gnu.org/licenses/gpl-3.0.html>

mods/ITEMS/mcl_portals/README.md

@@ -8,7 +8,7 @@ End portal: Build an upright frame of red nether brick blocks, 4 blocks wide and
 Created by maikerumine and Wuzzy.
 Code license: MIT License (see `LICENSE`).
 
-Texture license: See main MineClone 2 directory.
+Texture license: See README.md in main MineClone 2 directory.
 
 License of sound: [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)
 Authors: [FreqMan](https://freesound.org/people/FreqMan/) and Wuzzy

mods/ITEMS/mcl_potions/README.txt

@@ -1,5 +1,5 @@
 License information:
 
-* Code: WTFPL
-* Textures: From Faithful 32×32 texture pack (see main MineClone 2 license notes)
+* Code: MIT License
+* Textures: See main MineClone 2 README.md file
 * Sounds: CC0

mods/ITEMS/mcl_signs/README.txt

@@ -6,7 +6,7 @@ License of code and font: MIT License
 Font source: 04.jp.org, some modifications and additions were made (added support for Latin-1 Supplement)
 Original font license text states: “YOU MAY USE THEM AS YOU LIKE” (in about.gif file distributed with the font)
 
-License of textures: See README.me in top directory of MineClone 2.
+License of textures: See README.md in top directory of MineClone 2.
 
 License of models: GPLv3 (https://www.gnu.org/licenses/gpl-3.0.html)
 Models author: 22i.

mods/PLAYER/mcl_player/README.txt

@@ -21,4 +21,4 @@ Authors of media files
 MirceaKitsune (CC BY-SA 3.0):
   character.b3d
 
-Textures from Faithful 1.11 resource pack (see main readme file)
+Textures: See main MineClone 2 README.md file.