Merge remote-tracking branch 'upstream/master'

Reviewed-on: nalc/riesenpilz#1

LICENSE.txt

@@ -1,9 +1,6 @@
-Sounds and textures
-	CC by 3.0
-Code
-	MIT
+------Mushrooms------
+— glowshroom and lavashroom from bas080's plants mod (WTFPL)
+— parasol mushroom from a mod called mushrooms (WTFPL)
+— "45" mushrooms from r01922090's mush45 mod (WTFPL)
 
-Some source information:
-— glowshroom and lavashroom from bas080's plants mod (originally WTFPL)
-— parasol mushroom from a mod called mushrooms (originally WTFPL)
-— "45" mushrooms from r01922090's mush45 mod (originally WTFPL)
+rest also WTFPL

README.md

@@ -12,14 +12,10 @@ If you got ideas or found bugs, please tell them to me.
 
 
 TODO:
-* Mapgen: Do not use a fixed table of tree nodes; instead use a more flexible
-  way to remove trees.
-* Add a settingtypes.txt
-* Make the growingtool craftable
-* Test if visual_scale is useful for the small mushroom nodes,
-  e.g. to make textures smaller or to use power-of-two sized textures.
-  Nodeboxes would need to be changed accordingly (maybe automatically).
-* Add new features:
-  * Add more giant mushrooms
-  * Add more content from the mushrooms mod
-  * Add a lava suit
+* add more giant mushrooms
+* finish supporting the mushrooms mod
+* add lava suit
+* use visual_scale → crop textures and change nodeboxes (maybe automatically)
+* make the growingtool craftable
+* mapgen: do not use fixed tree stuff
+* add settingtypes.txt

init.lua

@@ -901,7 +901,7 @@ local head_sounds = default.node_sound_wood_defaults({
 	dig = {name="riesenpilz_head", gain=0.2},
 	dug = {name="riesenpilz_stem", gain=0.1}
 })
-local add_fence = minetest.register_fence
+local add_fence = default.register_fence
 local node_groups = {oddly_breakable_by_hand=3, fall_damage_add_percent=-80, bouncy=10}
 
 for _, ndata in ipairs({
@@ -1228,7 +1228,6 @@ if minetest.global_exists(technic) then
 	end
 
 
-	--[ [
 	if minetest.global_exists(3darmor) then add to depends
 		--lavashroom skin armor, swimming in lava possible
 
@@ -1252,7 +1251,7 @@ if minetest.global_exists(technic) then
 		technic.comp("riesenpilz:lavashroom_skin 5", "riesenpilz:antilava_plate")
 
 		armor_register(plate blah)
-	end--] ]
+	end
 })
 end--]]
 
@@ -1261,8 +1260,6 @@ if riesenpilz.enable_mapgen then
 	dofile(modpath.."mapgen.lua")
 end
 
-
-
 -- Legacy
 
 
@@ -1274,5 +1271,5 @@ local msg = "[riesenpilz] loaded after ca. "..time
 if time > 0.05 then
 	print(msg)
 else
-	minetest.log("info", msg)
+	minetest.log("action", msg)
 end

settings.lua

@@ -19,7 +19,7 @@ riesenpilz.inform_all = false--minetest.is_singleplayer()
 riesenpilz.max_spam = 2
 
 --3d apple
-riesenpilz.change_apple = true
+riesenpilz.change_apple = false
 
 --disallows growing a mushroom if it not every node would have a free place
 riesenpilz.giant_restrict_area = false