From: PilzAdam <pilzadam@minetest.net>
Date: Sat, 23 Mar 2013 16:42:40 +0000 (+0100)
Subject: Move creative, dye, vessels and wool to common
X-Git-Tag: 0.4.6~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7e843c92a66f90436430221bcb3673163344a902;p=oweals%2Fminetest_game.git

Move creative, dye, vessels and wool to common
---

diff --git a/game.conf b/game.conf
index b66889f4..ae19fdf2 100644
--- a/game.conf
+++ b/game.conf
@@ -1,2 +1,2 @@
 name = Minetest
-common_mods = bucket, default, doors, fire, stairs
+common_mods = bucket, creative, default, doors, dye, fire, stairs, vessels, wool
diff --git a/mods/creative/README.txt b/mods/creative/README.txt
deleted file mode 100644
index 7d49b981..00000000
--- a/mods/creative/README.txt
+++ /dev/null
@@ -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.
-
diff --git a/mods/creative/depends.txt b/mods/creative/depends.txt
deleted file mode 100644
index 4ad96d51..00000000
--- a/mods/creative/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-default
diff --git a/mods/creative/init.lua b/mods/creative/init.lua
deleted file mode 100644
index 8ec21bc6..00000000
--- a/mods/creative/init.lua
+++ /dev/null
@@ -1,162 +0,0 @@
--- minetest/creative/init.lua
-
-local creative_inventory = {}
-creative_inventory.creative_inventory_size = 0
-
--- Create detached creative inventory after loading all mods
-minetest.after(0, function()
-	local inv = minetest.create_detached_inventory("creative", {
-		allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
-			if minetest.setting_getbool("creative_mode") then
-				return count
-			else
-				return 0
-			end
-		end,
-		allow_put = function(inv, listname, index, stack, player)
-			return 0
-		end,
-		allow_take = function(inv, listname, index, stack, player)
-			if minetest.setting_getbool("creative_mode") then
-				return -1
-			else
-				return 0
-			end
-		end,
-		on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
-		end,
-		on_put = function(inv, listname, index, stack, player)
-		end,
-		on_take = function(inv, listname, index, stack, player)
-			print(player:get_player_name().." takes item from creative inventory; listname="..dump(listname)..", index="..dump(index)..", stack="..dump(stack))
-			if stack then
-				print("stack:get_name()="..dump(stack:get_name())..", stack:get_count()="..dump(stack:get_count()))
-			end
-		end,
-	})
-	local creative_list = {}
-	for name,def in pairs(minetest.registered_items) do
-		if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0)
-				and def.description and def.description ~= "" then
-			table.insert(creative_list, name)
-		end
-	end
-	table.sort(creative_list)
-	inv:set_size("main", #creative_list)
-	for _,itemstring in ipairs(creative_list) do
-		inv:add_item("main", ItemStack(itemstring))
-	end
-	creative_inventory.creative_inventory_size = #creative_list
-	print("creative inventory size: "..dump(creative_inventory.creative_inventory_size))
-end)
-
--- Create the trash field
-local trash = minetest.create_detached_inventory("creative_trash", {
-	-- Allow the stack to be placed and remove it in on_put()
-	-- This allows the creative inventory to restore the stack
-	allow_put = function(inv, listname, index, stack, player)
-		if minetest.setting_getbool("creative_mode") then
-			return stack:get_count()
-		else
-			return 0
-		end
-	end,
-	on_put = function(inv, listname, index, stack, player)
-		inv:set_stack(listname, index, "")
-	end,
-})
-trash:set_size("main", 1)
-
-
-creative_inventory.set_creative_formspec = function(player, start_i, pagenum)
-	pagenum = math.floor(pagenum)
-	local pagemax = math.floor((creative_inventory.creative_inventory_size-1) / (6*4) + 1)
-	player:set_inventory_formspec("size[13,7.5]"..
-			--"image[6,0.6;1,2;player.png]"..
-			"list[current_player;main;5,3.5;8,4;]"..
-			"list[current_player;craft;8,0;3,3;]"..
-			"list[current_player;craftpreview;12,1;1,1;]"..
-			"list[detached:creative;main;0.3,0.5;4,6;"..tostring(start_i).."]"..
-			"label[2.0,6.55;"..tostring(pagenum).."/"..tostring(pagemax).."]"..
-			"button[0.3,6.5;1.6,1;creative_prev;<<]"..
-			"button[2.7,6.5;1.6,1;creative_next;>>]"..
-			"label[5,1.5;Trash:]"..
-			"list[detached:creative_trash;main;5,2;1,1;]")
-end
-minetest.register_on_joinplayer(function(player)
-	-- If in creative mode, modify player's inventory forms
-	if not minetest.setting_getbool("creative_mode") then
-		return
-	end
-	creative_inventory.set_creative_formspec(player, 0, 1)
-end)
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	if not minetest.setting_getbool("creative_mode") then
-		return
-	end
-	-- Figure out current page from formspec
-	local current_page = 0
-	local formspec = player:get_inventory_formspec()
-	local start_i = string.match(formspec, "list%[detached:creative;main;[%d.]+,[%d.]+;[%d.]+,[%d.]+;(%d+)%]")
-	start_i = tonumber(start_i) or 0
-
-	if fields.creative_prev then
-		start_i = start_i - 4*6
-	end
-	if fields.creative_next then
-		start_i = start_i + 4*6
-	end
-
-	if start_i < 0 then
-		start_i = start_i + 4*6
-	end
-	if start_i >= creative_inventory.creative_inventory_size then
-		start_i = start_i - 4*6
-	end
-		
-	if start_i < 0 or start_i >= creative_inventory.creative_inventory_size then
-		start_i = 0
-	end
-
-	creative_inventory.set_creative_formspec(player, start_i, start_i / (6*4) + 1)
-end)
-
-if minetest.setting_getbool("creative_mode") then
-	
-	minetest.register_item(":", {
-		type = "none",
-		wield_image = "wieldhand.png",
-		wield_scale = {x=1,y=1,z=2.5},
-		tool_capabilities = {
-			full_punch_interval = 0.5,
-			max_drop_level = 3,
-			groupcaps = {
-				crumbly = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
-				cracky = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
-				snappy = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
-				choppy = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
-				oddly_breakable_by_hand = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
-			}
-		}
-	})
-	
-	minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack)
-		return true
-	end)
-	
-	function minetest.handle_node_drops(pos, drops, digger)
-		if not digger or not digger:is_player() then
-			return
-		end
-		local inv = digger:get_inventory()
-		if inv then
-			for _,item in ipairs(drops) do
-				item = ItemStack(item):get_name()
-				if not inv:contains_item("main", item) then
-					inv:add_item("main", item)
-				end
-			end
-		end
-	end
-	
-end
diff --git a/mods/dye/README.txt b/mods/dye/README.txt
deleted file mode 100644
index d414c2cc..00000000
--- a/mods/dye/README.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Minetest 0.4 mod: dye
-======================
-
-See init.lua for documentation.
-
-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.
-
diff --git a/mods/dye/depends.txt b/mods/dye/depends.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/mods/dye/init.lua b/mods/dye/init.lua
deleted file mode 100644
index 28868281..00000000
--- a/mods/dye/init.lua
+++ /dev/null
@@ -1,134 +0,0 @@
--- minetest/dye/init.lua
-
--- To make recipes that will work with any dye ever made by anybody, define
--- them based on groups.
--- You can select any group of groups, based on your need for amount of colors.
--- basecolor: 9, excolor: 17, unicolor: 89
---
--- Example of one shapeless recipe using a color group:
--- Note: As this uses basecolor_*, you'd need 9 of these.
--- minetest.register_craft({
---     type = "shapeless",
---     output = '<mod>:item_yellow',
---     recipe = {'<mod>:item_no_color', 'group:basecolor_yellow'},
--- })
-
--- Other mods can use these for looping through available colors
-local dye = {}
-dye.basecolors = {"white", "grey", "black", "red", "yellow", "green", "cyan", "blue", "magenta"}
-dye.excolors = {"white", "lightgrey", "grey", "darkgrey", "black", "red", "orange", "yellow", "lime", "green", "aqua", "cyan", "sky_blue", "blue", "violet", "magenta", "red_violet"}
-
--- Base color groups:
--- - basecolor_white
--- - basecolor_grey
--- - basecolor_black
--- - basecolor_red
--- - basecolor_yellow
--- - basecolor_green
--- - basecolor_cyan
--- - basecolor_blue
--- - basecolor_magenta
-
--- Extended color groups (* = equal to a base color):
--- * excolor_white
--- - excolor_lightgrey
--- * excolor_grey
--- - excolor_darkgrey
--- * excolor_black
--- * excolor_red
--- - excolor_orange
--- * excolor_yellow
--- - excolor_lime
--- * excolor_green
--- - excolor_aqua
--- * excolor_cyan
--- - excolor_sky_blue
--- * excolor_blue
--- - excolor_violet
--- * excolor_magenta
--- - excolor_red_violet
-
--- The whole unifieddyes palette as groups:
--- - unicolor_<excolor>
--- For the following, no white/grey/black is allowed:
--- - unicolor_medium_<excolor>
--- - unicolor_dark_<excolor>
--- - unicolor_light_<excolor>
--- - unicolor_<excolor>_s50
--- - unicolor_medium_<excolor>_s50
--- - unicolor_dark_<excolor>_s50
-
--- Local stuff
-local dyelocal = {}
-
--- This collection of colors is partly a historic thing, partly something else.
-dyelocal.dyes = {
-	{"white",      "White dye",     {dye=1, basecolor_white=1,   excolor_white=1,     unicolor_white=1}},
-	{"grey",       "Grey dye",      {dye=1, basecolor_grey=1,    excolor_grey=1,      unicolor_grey=1}},
-	{"dark_grey",  "Dark grey dye", {dye=1, basecolor_grey=1,    excolor_darkgrey=1,  unicolor_darkgrey=1}},
-	{"black",      "Black dye",     {dye=1, basecolor_black=1,   excolor_black=1,     unicolor_black=1}},
-	{"violet",     "Violet dye",    {dye=1, basecolor_magenta=1, excolor_violet=1,    unicolor_violet=1}},
-	{"blue",       "Blue dye",      {dye=1, basecolor_blue=1,    excolor_blue=1,      unicolor_blue=1}},
-	{"cyan",       "Cyan dye",      {dye=1, basecolor_cyan=1,    excolor_cyan=1,      unicolor_cyan=1}},
-	{"dark_green", "Dark green dye",{dye=1, basecolor_green=1,   excolor_green=1,     unicolor_dark_green=1}},
-	{"green",      "Green dye",     {dye=1, basecolor_green=1,   excolor_green=1,     unicolor_green=1}},
-	{"yellow",     "Yellow dye",    {dye=1, basecolor_yellow=1,  excolor_yellow=1,    unicolor_yellow=1}},
-	{"brown",      "Brown dye",     {dye=1, basecolor_yellow=1,  excolor_orange=1,    unicolor_dark_orange=1}},
-	{"orange",     "Orange dye",    {dye=1, basecolor_orange=1,  excolor_orange=1,    unicolor_orange=1}},
-	{"red",        "Red dye",       {dye=1, basecolor_red=1,     excolor_red=1,       unicolor_red=1}},
-	{"magenta",    "Magenta dye",   {dye=1, basecolor_magenta=1, excolor_red_violet=1,unicolor_red_violet=1}},
-	{"pink",       "Pink dye",      {dye=1, basecolor_red=1,     excolor_red=1,       unicolor_light_red=1}},
-}
-
--- Define items
-for _, row in ipairs(dyelocal.dyes) do
-	local name = row[1]
-	local description = row[2]
-	local groups = row[3]
-	local item_name = "dye:"..name
-	local item_image = "dye_"..name..".png"
-	minetest.register_craftitem(item_name, {
-		inventory_image = item_image,
-		description = description,
-		groups = groups
-	})
-end
-
--- Mix recipes
--- Just mix everything to everything somehow sanely
-
-dyelocal.mixbases = {"magenta", "red", "orange", "brown", "yellow", "green", "dark_green", "cyan", "blue", "violet", "black", "dark_grey", "grey", "white"}
-
-dyelocal.mixes = {
-	--       magenta,  red,    orange,   brown,    yellow,  green,  dark_green, cyan,    blue,   violet,   black,  dark_grey,  grey,   white
-	white = {"pink",  "pink", "orange", "orange", "yellow", "green", "green",  "grey",  "cyan", "violet",  "grey",  "grey",   "white", "white"},
-	grey  = {"pink",  "pink", "orange", "orange", "yellow", "green", "green",  "grey",  "cyan",  "pink",  "dark_grey","grey", "grey"},
-	dark_grey={"brown","brown", "brown", "brown", "brown","dark_green","dark_green","blue","blue","violet","black", "black"},
-	black = {"black", "black", "black",  "black", "black",  "black", "black",  "black", "black", "black",  "black"},
-	violet= {"magenta","magenta","red",  "brown", "red",    "cyan",  "brown",  "blue",  "violet","violet"},
-	blue  = {"violet", "magenta","brown","brown","dark_green","cyan","cyan",   "cyan",  "blue"},
-	cyan  = {"blue","brown","dark_green","dark_grey","green","cyan","dark_green","cyan"},
-	dark_green={"brown","brown","brown", "brown", "green",  "green", "dark_green"},
-	green = {"brown", "yellow","yellow","dark_green","green","green"},
-	yellow= {"red",  "orange", "yellow","orange", "yellow"},
-	brown = {"brown", "brown","orange", "brown"},
-	orange= {"red",  "orange","orange"},
-	red   = {"magenta","red"},
-	magenta={"magenta"},
-}
-
-for one,results in pairs(dyelocal.mixes) do
-	for i,result in ipairs(results) do
-		local another = dyelocal.mixbases[i]
-		minetest.register_craft({
-			type = "shapeless",
-			output = 'dye:'..result..' 2',
-			recipe = {'dye:'..one, 'dye:'..another},
-		})
-	end
-end
-
--- Hide dyelocal
-dyelocal = nil
-
--- EOF
diff --git a/mods/dye/textures/dye_black.png b/mods/dye/textures/dye_black.png
deleted file mode 100644
index ef526e69..00000000
Binary files a/mods/dye/textures/dye_black.png and /dev/null differ
diff --git a/mods/dye/textures/dye_blue.png b/mods/dye/textures/dye_blue.png
deleted file mode 100644
index d3e97919..00000000
Binary files a/mods/dye/textures/dye_blue.png and /dev/null differ
diff --git a/mods/dye/textures/dye_brown.png b/mods/dye/textures/dye_brown.png
deleted file mode 100644
index 5b27085f..00000000
Binary files a/mods/dye/textures/dye_brown.png and /dev/null differ
diff --git a/mods/dye/textures/dye_cyan.png b/mods/dye/textures/dye_cyan.png
deleted file mode 100644
index 3ae44e26..00000000
Binary files a/mods/dye/textures/dye_cyan.png and /dev/null differ
diff --git a/mods/dye/textures/dye_dark_green.png b/mods/dye/textures/dye_dark_green.png
deleted file mode 100644
index 784b7853..00000000
Binary files a/mods/dye/textures/dye_dark_green.png and /dev/null differ
diff --git a/mods/dye/textures/dye_dark_grey.png b/mods/dye/textures/dye_dark_grey.png
deleted file mode 100644
index adaa014e..00000000
Binary files a/mods/dye/textures/dye_dark_grey.png and /dev/null differ
diff --git a/mods/dye/textures/dye_green.png b/mods/dye/textures/dye_green.png
deleted file mode 100644
index e88631cb..00000000
Binary files a/mods/dye/textures/dye_green.png and /dev/null differ
diff --git a/mods/dye/textures/dye_grey.png b/mods/dye/textures/dye_grey.png
deleted file mode 100644
index c4706e7f..00000000
Binary files a/mods/dye/textures/dye_grey.png and /dev/null differ
diff --git a/mods/dye/textures/dye_magenta.png b/mods/dye/textures/dye_magenta.png
deleted file mode 100644
index 4946c716..00000000
Binary files a/mods/dye/textures/dye_magenta.png and /dev/null differ
diff --git a/mods/dye/textures/dye_orange.png b/mods/dye/textures/dye_orange.png
deleted file mode 100644
index 347964db..00000000
Binary files a/mods/dye/textures/dye_orange.png and /dev/null differ
diff --git a/mods/dye/textures/dye_pink.png b/mods/dye/textures/dye_pink.png
deleted file mode 100644
index ec2acf5c..00000000
Binary files a/mods/dye/textures/dye_pink.png and /dev/null differ
diff --git a/mods/dye/textures/dye_red.png b/mods/dye/textures/dye_red.png
deleted file mode 100644
index 9f8c151e..00000000
Binary files a/mods/dye/textures/dye_red.png and /dev/null differ
diff --git a/mods/dye/textures/dye_violet.png b/mods/dye/textures/dye_violet.png
deleted file mode 100644
index 0ee216cc..00000000
Binary files a/mods/dye/textures/dye_violet.png and /dev/null differ
diff --git a/mods/dye/textures/dye_white.png b/mods/dye/textures/dye_white.png
deleted file mode 100644
index 508e32fb..00000000
Binary files a/mods/dye/textures/dye_white.png and /dev/null differ
diff --git a/mods/dye/textures/dye_yellow.png b/mods/dye/textures/dye_yellow.png
deleted file mode 100644
index d00a5b83..00000000
Binary files a/mods/dye/textures/dye_yellow.png and /dev/null differ
diff --git a/mods/vessels/README.txt b/mods/vessels/README.txt
deleted file mode 100644
index 150b501d..00000000
--- a/mods/vessels/README.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Minetest 0.4 mod: vessels
-==========================
-
-Crafts
--------
-Glass bottle (yields 10)
-
-   G - G
-   G - G
-   - G -
-
-Drinking Glass (yields 14)
-
-   G - G
-   G - G
-   G G G
-
-Heavy Steel Bottle (yields 5)
-
-   S - S
-   S - S
-   - S -
-
-License of source code:
------------------------
-Copyright (C) 2012 Vanessa Ezekowitz
-Version 2012-09-02
-Modifications by Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-http://www.gnu.org/licenses/lgpl-2.1.html
-
-License of media (textures and sounds)
---------------------------------------
-WTFPL
-
-Authors of media files
------------------------
-Unless specifically noted,
-Copyright (C) 2012 Vanessa Ezekowitz
-
diff --git a/mods/vessels/depends.txt b/mods/vessels/depends.txt
deleted file mode 100644
index 4ad96d51..00000000
--- a/mods/vessels/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-default
diff --git a/mods/vessels/init.lua b/mods/vessels/init.lua
deleted file mode 100644
index 3a441fc2..00000000
--- a/mods/vessels/init.lua
+++ /dev/null
@@ -1,89 +0,0 @@
--- Minetest 0.4 mod: vessels
--- See README.txt for licensing and other information.
-
-minetest.register_craftitem("vessels:glass_bottle", {
-	description = "Glass Bottle (empty)",
-	inventory_image = "vessels_glass_bottle_inv.png",
-	wield_image = "vessels_glass_bottle.png",
-	groups = {vessel=1},
-})
-
-minetest.register_craft( {
-	output = "vessels:glass_bottle 10",
-	recipe = {
-		{ "default:glass", "", "default:glass" },
-		{ "default:glass", "", "default:glass" },
-		{ "", "default:glass", "" }
-	}
-})
-
-minetest.register_craftitem("vessels:drinking_glass", {
-	description = "Drinking Glass (empty)",
-	inventory_image = "vessels_drinking_glass_inv.png",
-	wield_image = "vessels_drinking_glass.png",
-	groups = {vessel=1},
-})
-
-minetest.register_craft( {
-	output = "vessels:drinking_glass 14",
-	recipe = {
-		{ "default:glass", "", "default:glass" },
-		{ "default:glass", "", "default:glass" },
-		{ "default:glass", "default:glass", "default:glass" }
-	}
-})
-
-minetest.register_craftitem("vessels:steel_bottle", {
-	description = "Heavy Steel Bottle (empty)",
-	inventory_image = "vessels_steel_bottle_inv.png",
-	wield_image = "vessels_steel_bottle.png",
-	groups = {vessel=1},
-})
-
-minetest.register_craft( {
-	output = "vessels:steel_bottle 5",
-	recipe = {
-		{ "default:steel_ingot", "", "default:steel_ingot" },
-		{ "default:steel_ingot", "", "default:steel_ingot" },
-		{ "", "default:steel_ingot", "" }
-	}
-})
-
-
--- Make sure we can recycle them
-
-minetest.register_craftitem("vessels:glass_fragments", {
-	description = "Pile of Glass Fragments",
-	inventory_image = "vessels_glass_fragments.png",
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "vessels:glass_fragments",
-	recipe = {
-		"vessels:glass_bottle",
-		"vessels:glass_bottle",
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "vessels:glass_fragments",
-	recipe = {
-		"vessels:drinking_glass",
-		"vessels:drinking_glass",
-	},
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "default:glass",
-	recipe = "vessels:glass_fragments",
-})
-
-minetest.register_craft( {
-	type = "cooking",
-	output = "default:steel_ingot",
-	recipe = "vessels:steel_bottle",
-})
-
diff --git a/mods/vessels/textures/alternates/vessels_drinking_glass.png b/mods/vessels/textures/alternates/vessels_drinking_glass.png
deleted file mode 100644
index 8ad033e8..00000000
Binary files a/mods/vessels/textures/alternates/vessels_drinking_glass.png and /dev/null differ
diff --git a/mods/vessels/textures/alternates/vessels_glass_bottle.png b/mods/vessels/textures/alternates/vessels_glass_bottle.png
deleted file mode 100644
index d9225793..00000000
Binary files a/mods/vessels/textures/alternates/vessels_glass_bottle.png and /dev/null differ
diff --git a/mods/vessels/textures/alternates/vessels_steel_bottle.png b/mods/vessels/textures/alternates/vessels_steel_bottle.png
deleted file mode 100644
index 629c857d..00000000
Binary files a/mods/vessels/textures/alternates/vessels_steel_bottle.png and /dev/null differ
diff --git a/mods/vessels/textures/vessels_drinking_glass.png b/mods/vessels/textures/vessels_drinking_glass.png
deleted file mode 100644
index 8ad033e8..00000000
Binary files a/mods/vessels/textures/vessels_drinking_glass.png and /dev/null differ
diff --git a/mods/vessels/textures/vessels_drinking_glass_inv.png b/mods/vessels/textures/vessels_drinking_glass_inv.png
deleted file mode 100644
index 18f5cb83..00000000
Binary files a/mods/vessels/textures/vessels_drinking_glass_inv.png and /dev/null differ
diff --git a/mods/vessels/textures/vessels_glass_bottle.png b/mods/vessels/textures/vessels_glass_bottle.png
deleted file mode 100644
index d9225793..00000000
Binary files a/mods/vessels/textures/vessels_glass_bottle.png and /dev/null differ
diff --git a/mods/vessels/textures/vessels_glass_bottle_inv.png b/mods/vessels/textures/vessels_glass_bottle_inv.png
deleted file mode 100644
index c325fd16..00000000
Binary files a/mods/vessels/textures/vessels_glass_bottle_inv.png and /dev/null differ
diff --git a/mods/vessels/textures/vessels_glass_fragments.png b/mods/vessels/textures/vessels_glass_fragments.png
deleted file mode 100644
index 7772a239..00000000
Binary files a/mods/vessels/textures/vessels_glass_fragments.png and /dev/null differ
diff --git a/mods/vessels/textures/vessels_steel_bottle.png b/mods/vessels/textures/vessels_steel_bottle.png
deleted file mode 100644
index 629c857d..00000000
Binary files a/mods/vessels/textures/vessels_steel_bottle.png and /dev/null differ
diff --git a/mods/vessels/textures/vessels_steel_bottle_inv.png b/mods/vessels/textures/vessels_steel_bottle_inv.png
deleted file mode 100644
index d2b846da..00000000
Binary files a/mods/vessels/textures/vessels_steel_bottle_inv.png and /dev/null differ
diff --git a/mods/wool/README.txt b/mods/wool/README.txt
deleted file mode 100644
index 9db13327..00000000
--- a/mods/wool/README.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Minetest 0.4 mod: wool
-======================
-
-Mostly backward-compatible with jordach's 16-color wool mod.
-
-License of source code:
------------------------
-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.
-
-License of media (textures and sounds)
---------------------------------------
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
-http://creativecommons.org/licenses/by-sa/3.0/
-
-Authors of media files
------------------------
-Cisoun:
-- wool_black.png wool_brown.png wool_dark_green.png wool_green.png
-- wool_magenta.png wool_pink.png wool_violet.png wool_yellow.png wool_blue.png
-- wool_cyan.png wool_dark_grey.png wool_grey.png wool_orange.png wool_red.png
-- wool_white.png
-
diff --git a/mods/wool/depends.txt b/mods/wool/depends.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/mods/wool/init.lua b/mods/wool/init.lua
deleted file mode 100644
index 4ad119e4..00000000
--- a/mods/wool/init.lua
+++ /dev/null
@@ -1,48 +0,0 @@
--- minetest/wool/init.lua
-
--- Backwards compatibility with jordach's 16-color wool mod
-minetest.register_alias("wool:dark_blue", "wool:blue")
-minetest.register_alias("wool:gold", "wool:yellow")
-
-local wool = {}
--- This uses a trick: you can first define the recipes using all of the base
--- colors, and then some recipes using more specific colors for a few non-base
--- colors available. When crafting, the last recipes will be checked first.
-wool.dyes = {
-	{"white",      "White",      nil},
-	{"grey",       "Grey",       "basecolor_grey"},
-	{"black",      "Black",      "basecolor_black"},
-	{"red",        "Red",        "basecolor_red"},
-	{"yellow",     "Yellow",     "basecolor_yellow"},
-	{"green",      "Green",      "basecolor_green"},
-	{"cyan",       "Cyan",       "basecolor_cyan"},
-	{"blue",       "Blue",       "basecolor_blue"},
-	{"magenta",    "Magenta",    "basecolor_magenta"},
-	{"orange",     "Orange",     "excolor_orange"},
-	{"violet",     "Violet",     "excolor_violet"},
-	{"brown",      "Brown",      "unicolor_dark_orange"},
-	{"pink",       "Pink",       "unicolor_light_red"},
-	{"dark_grey",  "Dark Grey",  "unicolor_darkgrey"},
-	{"dark_green", "Dark Green", "unicolor_dark_green"},
-}
-
-for _, row in ipairs(wool.dyes) do
-	local name = row[1]
-	local desc = row[2]
-	local craft_color_group = row[3]
-	-- Node Definition
-	minetest.register_node("wool:"..name, {
-		description = desc.." Wool",
-		tiles = {"wool_"..name..".png"},
-		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1},
-	})
-	if craft_color_group then
-		-- Crafting from dye and white wool
-		minetest.register_craft({
-			type = "shapeless",
-			output = 'wool:'..name..' 16',
-			recipe = {'group:dye,'..craft_color_group, 'wool:white'},
-		})
-	end
-end
-
diff --git a/mods/wool/textures/wool_black.png b/mods/wool/textures/wool_black.png
deleted file mode 100644
index f22e3bbe..00000000
Binary files a/mods/wool/textures/wool_black.png and /dev/null differ
diff --git a/mods/wool/textures/wool_blue.png b/mods/wool/textures/wool_blue.png
deleted file mode 100644
index 826d3977..00000000
Binary files a/mods/wool/textures/wool_blue.png and /dev/null differ
diff --git a/mods/wool/textures/wool_brown.png b/mods/wool/textures/wool_brown.png
deleted file mode 100644
index 0dcee4be..00000000
Binary files a/mods/wool/textures/wool_brown.png and /dev/null differ
diff --git a/mods/wool/textures/wool_cyan.png b/mods/wool/textures/wool_cyan.png
deleted file mode 100644
index 372ef459..00000000
Binary files a/mods/wool/textures/wool_cyan.png and /dev/null differ
diff --git a/mods/wool/textures/wool_dark_green.png b/mods/wool/textures/wool_dark_green.png
deleted file mode 100644
index 54d12f69..00000000
Binary files a/mods/wool/textures/wool_dark_green.png and /dev/null differ
diff --git a/mods/wool/textures/wool_dark_grey.png b/mods/wool/textures/wool_dark_grey.png
deleted file mode 100644
index c15bec48..00000000
Binary files a/mods/wool/textures/wool_dark_grey.png and /dev/null differ
diff --git a/mods/wool/textures/wool_green.png b/mods/wool/textures/wool_green.png
deleted file mode 100644
index d70fe2b1..00000000
Binary files a/mods/wool/textures/wool_green.png and /dev/null differ
diff --git a/mods/wool/textures/wool_grey.png b/mods/wool/textures/wool_grey.png
deleted file mode 100644
index 86e647c6..00000000
Binary files a/mods/wool/textures/wool_grey.png and /dev/null differ
diff --git a/mods/wool/textures/wool_magenta.png b/mods/wool/textures/wool_magenta.png
deleted file mode 100644
index c4da6ae1..00000000
Binary files a/mods/wool/textures/wool_magenta.png and /dev/null differ
diff --git a/mods/wool/textures/wool_orange.png b/mods/wool/textures/wool_orange.png
deleted file mode 100644
index 2a76cf99..00000000
Binary files a/mods/wool/textures/wool_orange.png and /dev/null differ
diff --git a/mods/wool/textures/wool_pink.png b/mods/wool/textures/wool_pink.png
deleted file mode 100644
index 6d59544d..00000000
Binary files a/mods/wool/textures/wool_pink.png and /dev/null differ
diff --git a/mods/wool/textures/wool_red.png b/mods/wool/textures/wool_red.png
deleted file mode 100644
index ab4dd649..00000000
Binary files a/mods/wool/textures/wool_red.png and /dev/null differ
diff --git a/mods/wool/textures/wool_violet.png b/mods/wool/textures/wool_violet.png
deleted file mode 100644
index 653af587..00000000
Binary files a/mods/wool/textures/wool_violet.png and /dev/null differ
diff --git a/mods/wool/textures/wool_white.png b/mods/wool/textures/wool_white.png
deleted file mode 100644
index f3371aa6..00000000
Binary files a/mods/wool/textures/wool_white.png and /dev/null differ
diff --git a/mods/wool/textures/wool_yellow.png b/mods/wool/textures/wool_yellow.png
deleted file mode 100644
index 5c5d72ff..00000000
Binary files a/mods/wool/textures/wool_yellow.png and /dev/null differ