Merge https://git.tchncs.de/Illuna-Minetest/illuna

2016-04-20 19:50:20 +02:00 · 2016-04-20 19:50:20 +02:00 · e2608e0b54
commit e2608e0b54
parent b41e934544 dee5a419e9
3 changed files with 33 additions and 3 deletions
--- a/crafting.lua
+++ b/crafting.lua
@ -1,3 +1,30 @@
+minetest.register_craft({
+        output = "building_blocks:slab_marble",
+        recipe = {
+            { "darkage:marble", "darkage:marble","darkage:marble" },
+            { "", "", "" },
+            { "", "", "" }
+        },
+})
+
+minetest.register_craft({
+	output = "homedecor:kitchen_cabinet_marble",
+        recipe = {
+            { "stairs:slab_Marble", "" },
+            { "homedecor:kitchen_cabinet", "" },
+            { "", "" }
+        },
+})
+
+minetest.register_craft({
+        output = "homedecor:dishwasher_marble",
+        recipe = {
+            { "stairs:slab_Marble", "" },
+            { "homedecor:dishwasher", "" },
+            { "", "" }
+        },
+})
+
 minetest.register_craft({
 	output = "homedecor:wardrobe",
 	recipe = {
--- a/depends.txt
+++ b/depends.txt
@ -1,4 +1,6 @@
 default
+darkage ?
+building_blocks ?
 teleport_potion ?
 mobs_slimes ?
 mobs_sandworm ?
--- a/init.lua
+++ b/init.lua
@ -1,2 +1,3 @@
 dofile(minetest.get_modpath("illuna").."/nodes.lua")
 dofile(minetest.get_modpath("illuna").."/crafting.lua")
+--dofile(minetest.get_modpath("illuna").."/aliases.lua")