From 5aba29d076f77e57c68d3df0afc104bd83e4c22a Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Fri, 20 Jan 2017 11:11:33 +0100
Subject: [PATCH] Move glass bottle to mcl_potions+remove vesselsmod

---
 mods/mcl_potions/init.lua                     |  15 ++++++++++
 .../textures/vessels_glass_bottle_inv.png     | Bin
 mods/vessels/README.txt                       |  22 --------------
 mods/vessels/depends.txt                      |   1 -
 mods/vessels/init.lua                         |  27 ------------------
 .../vessels/textures/vessels_glass_bottle.png | Bin 230 -> 0 bytes
 6 files changed, 15 insertions(+), 50 deletions(-)
 rename mods/{vessels => mcl_potions}/textures/vessels_glass_bottle_inv.png (100%)
 delete mode 100644 mods/vessels/README.txt
 delete mode 100644 mods/vessels/depends.txt
 delete mode 100644 mods/vessels/init.lua
 delete mode 100644 mods/vessels/textures/vessels_glass_bottle.png

diff --git a/mods/mcl_potions/init.lua b/mods/mcl_potions/init.lua
index 5bb5ab6787..c20cb905b6 100644
--- a/mods/mcl_potions/init.lua
+++ b/mods/mcl_potions/init.lua
@@ -12,6 +12,21 @@ minetest.register_craft({
 	recipe = { "farming:mushroom_brown", "default:sugar", "mcl_mobitems:spider_eye" },
 })
 
+minetest.register_craftitem("mcl_potions:glass_bottle", {
+	description = "Glass Bottle",
+	inventory_image = "vessels_glass_bottle_inv.png",
+	wield_image = "vessels_glass_bottle_inv.png",
+	groups = {brewitem=1},
+})
+
+minetest.register_craft( {
+	output = "mcl_potions:glass_bottle 3",
+	recipe = {
+		{ "default:glass", "", "default:glass" },
+		{ "", "default:glass", "" }
+	}
+})
+
 -- TODO: Get texture
 --[[
 minetest.register_craftitem("mcl_potions:dragon_breath", {
diff --git a/mods/vessels/textures/vessels_glass_bottle_inv.png b/mods/mcl_potions/textures/vessels_glass_bottle_inv.png
similarity index 100%
rename from mods/vessels/textures/vessels_glass_bottle_inv.png
rename to mods/mcl_potions/textures/vessels_glass_bottle_inv.png
diff --git a/mods/vessels/README.txt b/mods/vessels/README.txt
deleted file mode 100644
index f2698587d1..0000000000
--- a/mods/vessels/README.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Minetest 0.4 mod: vessels
-==========================
-
-Crafts
--------
-Glass bottle (yields 4)
-
-   G - G
-   - G -
-
-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
diff --git a/mods/vessels/depends.txt b/mods/vessels/depends.txt
deleted file mode 100644
index 4ad96d5159..0000000000
--- 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 4d3722517a..0000000000
--- a/mods/vessels/init.lua
+++ /dev/null
@@ -1,27 +0,0 @@
--- Minetest 0.4 mod: vessels
--- See README.txt for licensing and other information.
-
-minetest.register_node("vessels:glass_bottle", {
-	description = "Glass Bottle",
-	drawtype = "plantlike",
-	tiles = {"vessels_glass_bottle.png"},
-	is_ground_content = false,
-	inventory_image = "vessels_glass_bottle_inv.png",
-	wield_image = "vessels_glass_bottle.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25}
-	},
-	groups = {vessel=1,dig_immediate=3,attached_node=1,brewitem=1},
-	sounds = default.node_sound_glass_defaults(),
-})
-
-minetest.register_craft( {
-	output = "vessels:glass_bottle 3",
-	recipe = {
-		{ "default:glass", "", "default:glass" },
-		{ "", "default:glass", "" }
-	}
-})
diff --git a/mods/vessels/textures/vessels_glass_bottle.png b/mods/vessels/textures/vessels_glass_bottle.png
deleted file mode 100644
index d069155ad783cf9685daa762122477293d579a87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5u*Z=?jPd67^U?;uOU3HbK
z;wC@stpU2bcJ0~|YIrcl@<gKTne|K0ojZ3W*YnAfC$gVkB?2`vmIV0)GdMiEkp|?X
zd%8G=Xq-<@SRnf#Rxqa_{=wIGcYg=4#4Xb}^*}r!Jwd}^>oW#x<~l~X5?%fS#}pXk
zJ2V^u8&<XO$8yShFm5`)*umg*p3#oYi78=I!vvsGIYzk-?Fo14*p@7ixmo_y;edl4
a14Hv-=@qH!5~@He89ZJ6T-G@yGywqh<xwyI