Merge remote-tracking branch 'origin/master'

mods/anvil/depends.txt

@@ -1,4 +1,3 @@
 default 
 metals
-helper_functions
 instruments

mods/bonfire/depends.txt

@@ -1,2 +1 @@
 default
-helper_functions

mods/core/helper_functions.lua

@@ -1,5 +1,5 @@
-table.contains = function(t, v)
-	for _, i in ipairs(t) do
+function table:contains(v)
+	for _, i in ipairs(self) do
 		if i == v then
 			return true
 		end
@@ -45,4 +45,4 @@ function set_node_instead_air(pos, node)
 	if minetest.env:get_node(pos).name == "air" then
 		minetest.env:set_node(pos, node)
 	end
-end
+end

mods/core/init.lua

@@ -0,0 +1,7 @@
+realtest = {}
+
+dofile(minetest.get_modpath("core").."/helper_functions.lua")
+dofile(minetest.get_modpath("core").."/drop.lua")
+dofile(minetest.get_modpath("core").."/seasons.lua")
+dofile(minetest.get_modpath("core").."/creative.lua")
+dofile(minetest.get_modpath("core").."/player.lua")

mods/creative/README.txt

@@ -1,22 +0,0 @@
-Minetest 0.4 mod: creative
-==========================
-
-Implements creative mode.
-
-Switch on by using the "creative_mode" setting.
-
-Registered items that
-- have a description, and
-- do not have the group not_in_creative_inventory
-are added to the creative inventory.
-
-License of source code and media files:
----------------------------------------
-Copyright (C) 2012 Perttu Ahola (celeron55) <celeron55@gmail.com>
-
-This program is free software. It comes without any warranty, to
-the extent permitted by applicable law. You can redistribute it
-and/or modify it under the terms of the Do What The Fuck You Want
-To Public License, Version 2, as published by Sam Hocevar. See
-http://sam.zoy.org/wtfpl/COPYING for more details.
-

mods/default/depends.txt

@@ -0,0 +1 @@
+core

mods/default/init.lua

@@ -10,10 +10,8 @@ LIGHT_MAX = 14
 
 -- Definitions made by this mod that other mods can use too
 default = {}
-realtest = {}
 
 -- Load other files
-dofile(minetest.get_modpath("default").."/player.lua")
 dofile(minetest.get_modpath("default").."/mapgen.lua")
 
 --
@@ -403,7 +401,7 @@ minetest.register_node("default:dirt_with_clay", {
 
 minetest.register_node("default:dirt_with_grass_and_clay", {
 	description = "Clay",
-	tiles = {"default_grass.png", "default_dirt.png^default_clay.png", "default_dirt.png^default_clay.png^default_grass_side.png"},
+	tiles = {"default_grass.png", "default_dirt.png^default_clay.png", "default_grass.png"},
 	particle_image = {"default_clay_lump.png"},
 	is_ground_content = true,
 	groups = {crumbly=3, drop_on_dig=1},
@@ -472,24 +470,6 @@ minetest.register_node("default:glass", {
 	sounds = default.node_sound_glass_defaults(),
 })
 
-minetest.register_node("default:rail", {
-	description = "Rail",
-	drawtype = "raillike",
-	tiles = {"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"},
-	particle_image = {"default_rail.png"},
-	inventory_image = "default_rail.png",
-	wield_image = "default_rail.png",
-	paramtype = "light",
-	is_ground_content = true,
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	groups = {bendy=2,snappy=1,dig_immediate=2},
-})
-
 minetest.register_node("default:water_flowing", {
 	description = "Flowing Water",
 	inventory_image = minetest.inventorycube("default_water.png"),

mods/furnace/depends.txt

@@ -1,2 +1 @@
-default
-helper_functions
+default

mods/instruments/depends.txt

@@ -1,4 +1,3 @@
 default
 metals
-helper_functions
 trees

mods/seasons/depends.txt

@@ -1 +0,0 @@
-default

mods/trees/depends.txt

@@ -1,3 +1,2 @@
 default
-helper_functions
 metals