bugfixes (1.0.1)

fixed broken init.lua
deleted unused files to save loadtime on servers

README.md

@@ -26,18 +26,35 @@ modyfied by addi
   
 
 ##Release Notes
+Version 1.0.1 
 
-  Version 0.3
-    * 29 Nodes + 3 Craft Items
-    * Furniture and building decoration
-    * Stone layers
+ * fixed init.lua wich get broken by upload on github
 
-  Version 0.2
-    * 13 Nodes
-    * Sedimentary stones
 
-  Version 0.1
-    * 6 Nodes
+Version 1.0 
+
+ * a lot of more nodes because using moreblocks stairgen
+ * 2 sorts of medieval glass added
+ * chalk can crafted from chalk powder
+ * fixed some craft reziep conflicts
+
+Version 0.3
+
+* 29 Nodes + 3 Craft Items
+* Furniture and building decoration
+* Stone layers
+
+
+
+Version 0.2
+
+* 13 Nodes
+* Sedimentary stones
+
+
+Version 0.1
+
+* 6 Nodes
 
 PS: This document has been structured as the README.txt of PilzAdam in 
     his Bed MOD.
@@ -186,15 +203,18 @@ PS: This document has been structured as the README.txt of PilzAdam in
   
   Sandstone Cobble: brick version of the Sandstone, good for
      buildings with a pale color.
+	 
      COOKING
      [Sandstone]
 
   Schist: medium grade metamorphic rock from Slate.
+  
      COOKING
      [Slate]
 
   Silt: granular material of a size somewhere between sand and clay.
      It brokes in 4 Silt Lumps.
+	 
      CRAFT -> 1
      [Silt Lump] [Silt Lump]
      [Silt Lump] [Silt Lump]
@@ -202,6 +222,7 @@ PS: This document has been structured as the README.txt of PilzAdam in
   Slate: fine-grained, foliated, homogeneous metamorphic rock
      derived from an original shale-type sedimentary rock through
      low-grade regional metamorphism. It is used to build roof.
+	 
      COOKING
      [Shale]
      COOKING
@@ -216,6 +237,7 @@ PS: This document has been structured as the README.txt of PilzAdam in
      as building traditional building material in zones where
      slate is easy to find.
      Note: It has stairs and slabs.
+	 
      CRAFT -> 2
      [Slate Cobble] [Slate Cobble]
      [Slate Cobble] [Slate Cobble]
@@ -223,6 +245,7 @@ PS: This document has been structured as the README.txt of PilzAdam in
   Straw: a cube of yellish straw, try them in the roofs they will
      be very nice. Used also as traditional building material
      from ancient times.
+	 
      CRAFT -> 2
      [Shrub] [Shrub]
      [Shrub] [Shrub]
@@ -232,6 +255,7 @@ PS: This document has been structured as the README.txt of PilzAdam in
 
   Straw Bale: a decoration item, looks great for a farm or a 
      country side house.
+	 
      CRAFT -> 1
      [Straw] [Straw]
      [Straw] [Straw]
@@ -240,13 +264,14 @@ PS: This document has been structured as the README.txt of PilzAdam in
      from Desert Sand. The idea is that Desert Sand is stonner
      than regular Sand, so it takes less to create a Desert
      Stone than a Sandstone.
+	 
      CRAFT -> 2
      [Sandstone] [Sandstone]
      [Sandstone] [Sandstone]
 
 
-  ##FURNITURE NODES
-  Just started so they are few ones
+##FURNITURE NODES
+Just started so they are few ones
 
   Box: a more smaller container than the Chest, but it requires
   
@@ -295,7 +320,24 @@ PS: This document has been structured as the README.txt of PilzAdam in
      [Stick] [Glass]  [Stick]
      [Stick] [Stick]  [Stick]
 
+  Medieval Glass: a good looking glass, with small tiles
+  
+     CRAFT -> 8
+     [Glass]       [steel_ingot]       [Glass]
+     [steel_ingot] [Glass]       [steel_ingot]
+     [Glass]       [steel_ingot]       [Glass]
 
+     or:
+     CRAFT -> 1
+     [Medieval Glow Glass]
+	
+  Medieval Glow Glass: a good looking glass, with small tiles wich are glowing by itself
+  
+     CRAFT -> 8
+     [Medieval Glass]
+     [torch] 
+	 
+	 
 ##License:
 Sourcecode: WTFPL (see below)
 Graphics: WTFPL (see below)
@@ -317,9 +359,4 @@ http://minetest.net/
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. You just DO WHAT THE FUCK YOU WANT TO. 
-
-
-
-
-
+  0. You just DO WHAT THE FUCK YOU WANT TO. 

compatibility.lua

@@ -1,10 +0,0 @@
---add compatibility with the old nodes of king arthurs land
-minetest.register_alias("darkage:stair_stonebrick", "darkage:stair_basalt_cobble")
-minetest.register_alias("darkage:stair_stonebrick_inverted", "darkage:stair_basalt_cobble_inverted")
-minetest.register_alias("darkage:stair_stonebrick_wall", "darkage:stair_basalt_cobble_wall")
-minetest.register_alias("darkage:slab_stonebrick_inverted", "darkage:slab_basalt_cobble_inverted")
-minetest.register_alias("darkage:slab_stonebrick_wall", "darkage:slab_basalt_cobble_wall")
-minetest.register_alias("darkage:slab_stonebrick", "darkage:slab_basalt_cobble")
-minetest.register_alias("darkage:panel_stonebrick_vertical", "darkage:panel_basalt_cobble_vertical")
-minetest.register_alias("darkage:panel_stonebrick_bottom", "darkage:panel_basalt_cobble_bottom")
-minetest.register_alias("darkage:panel_stonebrick_top", "darkage:panel_basalt_cobble_top")

init.lua

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 print (" ---- Dark Age is Loading! ---- ")
 -- Commend this lines if you don't like some of this features
 dofile(minetest.get_modpath("darkage").."/mapgen.lua")
@@ -540,553 +539,3 @@ minetest.register_craft({
 	}
 })
 
-=======
-print (" ---- Dark Age is Loading! ---- ")
--- Commend this lines if you don't like some of this features
-dofile(minetest.get_modpath("darkage").."/mapgen.lua")
-dofile(minetest.get_modpath("darkage").."/building.lua")
-dofile(minetest.get_modpath("darkage").."/furniture.lua")
-dofile(minetest.get_modpath("darkage").."/stairs.lua")
-
-----------
--- Items
-----------
-
-minetest.register_node("darkage:adobe", {
-	description = "Adobe",
-	tiles = {"darkage_adobe.png"},
-	is_ground_content = true,
-	groups = {crumbly=3},
-	sounds = default.node_sound_sand_defaults(),
-})
-
-minetest.register_node("darkage:basalt", {
-  description = "Basalt",
-	tiles = {"darkage_basalt.png"},
-	is_ground_content = true,
-  drop = 'darkage:basalt_cobble',
-	groups = {cracky=3},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:basalt_cobble", {
-  description = "Basalt Cobble",
-	tiles = {"darkage_basalt_cobble.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:chalk", {
-  description = "Chalk",
-	tiles = {"darkage_chalk.png"},
-	is_ground_content = true,
-  drop = 'darkage:chalk_powder 2',
-	groups = {crumbly=2,cracky=2},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:cobble_with_plaster", {
-	description = "Cobblestone With Plaster",
-	tiles = {"darkage_cobble_with_plaster_D.png", "darkage_cobble_with_plaster_B.png", "darkage_cobble_with_plaster_C.png",
-		"darkage_cobble_with_plaster_A.png", "default_cobble.png", "darkage_chalk.png"},
-	is_ground_content = true,
-  paramtype2 = "facedir",
-  drop = 'default:cobble',
-	groups = {cracky=3},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("darkage:desert_stone_cobble", {
-	description = "Desert Stone Cobble",
-	tiles = {"darkage_desert_stone_cobble.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:desert_stone_with_iron", {
-	description = "Desert Iron Ore",
-	tiles = {"default_desert_stone.png^darkage_mineral_iron.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	drop = 'default:iron_lump',
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("darkage:darkdirt", {
-	description = "Dark Dirt",
-	tiles = {"darkage_darkdirt.png"},
-	is_ground_content = true,
-	groups = {crumbly=2},
-	sounds = default.node_sound_dirt_defaults(),
-})
-
-minetest.register_node("darkage:dry_leaves", {
-	description = "Dry Leaves",
-	tiles = {"darkage_dry_leaves.png"},
-	is_ground_content = true,
-  paramtype = "light",
-	groups = {snappy=3, flammable=2},
-	sounds = default.node_sound_leaves_defaults()
-})
-
-minetest.register_node("darkage:gneiss", {
-  description = "Gneiss",
-	tiles = {"darkage_gneiss.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	drop = {
-		max_items = 1,
-		items = {
-			{
-				-- player will get cobbles with 1/3 chance
-				items = {'darkage:gneiss_cobble'},
-				rarity = 3,
-			},
-			{
-				items = {'darkage:gneiss'},
-			}
-		}
-	},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:gneiss_cobble", {
-  description = "Gneiss Cobble",
-	tiles = {"darkage_gneiss_cobble.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:marble", {
-  description = "Marble",
-	tiles = {"darkage_marble.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_stone_defaults()
-})
-
-
-minetest.register_node("darkage:mud", {
-  description = "Mud",
-	tiles = {"darkage_mud_up.png","darkage_mud.png"},
-	is_ground_content = true,
-	groups = {crumbly=3},
-  drop = 'darkage:mud_lump 4',
-	sounds = default.node_sound_dirt_defaults({
-		footstep = "",
-	}),
-})
-
-minetest.register_node("darkage:ors", {
-  description = "Old Red Sandstone",
-	tiles = {"darkage_ors.png"},
-	is_ground_content = true,
-  drop = 'darkage:ors_cobble',
-	groups = {crumbly=2,cracky=2},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:ors_cobble", {
-  description = "Old Red Sandstone Cobble",
-	tiles = {"darkage_ors_cobble.png"},
-	is_ground_content = true,
-	groups = {crumbly=2,cracky=2},
-	sounds = default.node_sound_stone_defaults()
-})
-
-
-minetest.register_node("darkage:sandstone_cobble", {
-  description = "Sandstone Cobble",
-	tiles = {"darkage_sandstone_cobble.png"},
-	is_ground_content = true,
-	groups = {crumbly=2,cracky=2},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:serpentine", {
-  description = "Serpentine",
-	tiles = {"darkage_serpentine.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:shale", {
-  description = "Shale",
-	tiles = {"darkage_shale.png","darkage_shale.png","darkage_shale_side.png"},
-	is_ground_content = true,
-	groups = {crumbly=2,cracky=2},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:schist", {
-  description = "Schist",
-	tiles = {"darkage_schist.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:silt", {
-  description = "Silt",
-	tiles = {"darkage_silt.png"},
-	is_ground_content = true,
-	groups = {crumbly=3},
-  drop = 'darkage:silt_lump 4',
-	sounds = default.node_sound_dirt_defaults({
-		footstep = "",
-	}),
-})
-
-minetest.register_node("darkage:slate", {
-  description = "Slate",
-	tiles = {"darkage_slate.png","darkage_slate.png","darkage_slate_side.png"},
-	is_ground_content = true,
-  drop = 'darkage:slate_cobble',
-	groups = {cracky=2},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:slate_cobble", {
-  description = "Slate Cobble",
-	tiles = {"darkage_slate_cobble.png"},
-	is_ground_content = true,
-	groups = {cracky=2},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:slate_tale", {
-  description = "Slate Tale",
-	tiles = {"darkage_slate_tale.png"},
-	is_ground_content = true,
-	groups = {cracky=2},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:straw", {
-  description = "Straw",
-	tiles = {"darkage_straw.png"},
-	is_ground_content = true,
-	groups = {snappy=3, flammable=2},
-	sounds = default.node_sound_leaves_defaults(),
-})
-
-minetest.register_node("darkage:stone_brick", {
-  description = "Stone Brick",
-	tiles = {"darkage_stone_brick.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node("darkage:straw_bale", {
-  description = "Straw Bale",
-	tiles = {"darkage_straw_bale.png"},
-	is_ground_content = true,
-  drop = 'darkage:straw 4',
-	groups = {snappy=2, flammable=2},
-	sounds = default.node_sound_leaves_defaults(),
-})
-
-minetest.register_node("darkage:marble", {
-  description = "Marble",
-	tiles = {"darkage_marble.png"},
-	is_ground_content = true,
-	groups = {cracky=2},
-	sounds = default.node_sound_stone_defaults()
-})
-
---minetest.register_node("darkage:marble_tile", { --disabled because texture not found
---  description = "Marble Tile",
---	tiles = {"darkage_marble_tile.png"},
---	is_ground_content = true,
---	groups = {cracky=2},
---	sounds = default.node_sound_stone_defaults()
---})
-
----------------
--- Overrides
----------------
-minetest.registered_nodes["default:desert_stone"].drop= {
-		max_items = 1,
-		items = {
-			{
-				-- player will get cobbles with 1/3 chance
-				items = {'darkage:desert_stone_cobble'},
-				rarity = 2,
-			},
-			{
-				items = {'default:desert_stone'},
-			}
-		}
-}
-
-
----------------
--- Crafts Items
----------------
-minetest.register_craftitem("darkage:chalk_powder", {
-	description = "Chalk Powder",
-	inventory_image = "darkage_chalk_powder.png",
-})
-
-minetest.register_craftitem("darkage:mud_lump", {
-	description = "Mud Lump",
-	inventory_image = "darkage_mud_lump.png",
-})
-
-minetest.register_craftitem("darkage:silt_lump", {
-	description = "Silt Lump",
-	inventory_image = "darkage_silt_lump.png",
-})
-
-minetest.register_craftitem("darkage:iron_stick", {
-	description = "Iron Stick",
-	inventory_image = "darkage_iron_stick.png",
-})
-
-
-----------
--- Crafts
-----------
-
---sand+clay+water+straw
-
-minetest.register_craft({
-	output = 'darkage:adobe 4',
-	recipe = {
-    {'default:sand','default:sand'},
-		{'default:clay_lump','darkage:straw'},
-	}
-})
-
-
-minetest.register_craft({
-	output = 'darkage:basalt_cobble 4',
-	recipe = {
-    {'default:cobble','default:cobble'},
-		{'default:coal_lump','default:coal_lump'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:cobble_with_plaster 2',
-	recipe = {
-    {'default:cobble','darkage:chalk_powder'},
-		{'default:cobble','darkage:chalk_powder'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:cobble_with_plaster 2',
-	recipe = {
-    {'darkage:chalk_powder','default:cobble'},
-		{'darkage:chalk_powder','default:cobble'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:darkdirt 4',
-	recipe = {
-    {'default:dirt','default:dirt'},
-		{'default:gravel','default:gravel'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:mud 3',
-	recipe = {
-    {'default:dirt','default:dirt'},
-		{'default:clay_lump','darkage:silt_lump'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:mud',
-	recipe = {
-    {'darkage:mud_lump','darkage:mud_lump'},
-    {'darkage:mud_lump','darkage:mud_lump'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:ors 4',
-	recipe = {
-    {'default:sandstone','default:sandstone'},
-		{'default:iron_lump','default:sandstone'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:ors_cobble 4',
-	recipe = {
-    {'darkage:sandstone_cobble','darkage:sandstone_cobble'},
-		{'default:iron_lump','darkage:sandstone_cobble'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:silt 3',
-	recipe = {
-    {'default:sand','default:sand'},
-		{'default:clay_lump','default:clay_lump'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:silt',
-	recipe = {
-    {'darkage:silt_lump','darkage:silt_lump'},
-		{'darkage:silt_lump','darkage:silt_lump'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:slate_tale 2',
-	recipe = {
-    {'darkage:slate_cobble','darkage:slate_cobble'},
-		{'darkage:slate_cobble','darkage:slate_cobble'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:stone_brick 9',--changed bacause conflicts with moreblocks
-	recipe = {
-    {'default:cobble','default:cobble','default:cobble'},--changed bacause conflicts with moreblocks
-	{'default:cobble','default:cobble','default:cobble'},--changed bacause conflicts with moreblocks
-	{'default:cobble','default:cobble','default:cobble'},--changed bacause conflicts with moreblocks
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:straw 2',
-	recipe = {
-    {'default:dry_shrub','default:dry_shrub'},
-		{'default:dry_shrub','default:dry_shrub'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:straw 2',
-	recipe = {
-    {'darkage:dry_leaves','darkage:dry_leaves'},
-		{'darkage:dry_leaves','darkage:dry_leaves'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:straw 4',
-	recipe = {
-    {'farming:wheat_harvested','farming:wheat_harvested'},
-	{'farming:wheat_harvested','farming:wheat_harvested'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:straw_bale',
-	recipe = {
-    {'darkage:straw','darkage:straw'},
-    {'darkage:straw','darkage:straw'},
-	}
-})
-
-minetest.register_craft({
-	output = 'darkage:iron_stick 4',
-	recipe = {
-    {'default:steel_ingot'},
-	}
-})
-
--- Cookings
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:basalt",
-	recipe = "darkage:basalt_cobble",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "default:desert_stone",
-	recipe = "darkage:desert_stone_cobble",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:dry_leaves",
-	recipe = "default:leaves",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:sandstone_cobble",
-	recipe = "default:sandstone",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:gneiss",
-	recipe = "darkage:schist",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:gneiss",
-	recipe = "darkage:gneiss_cobble",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:ors",
-	recipe = "darkage:ors_cobble",
-})
-
-
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:sandstone_cobble",
-	recipe = "default:sandstone",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:schist",
-	recipe = "darkage:slate",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:shale",
-	recipe = "darkage:mud",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:slate",
-	recipe = "darkage:shale",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:slate",
-	recipe = "darkage:slate_cobble",
-})
-
--- Desert
-minetest.register_craft({
-	type = "cooking",
-	output = "darkage:ors_cobble",
-	recipe = "default:desert_stone",
-})
-
-minetest.register_craft({
-	output = 'default:desert_stone 2',
-	recipe = {
-    {'default:desert_sand','default:desert_sand'},
-		{'default:desert_sand','default:desert_sand'},
-	}
-})
-
->>>>>>> version 1.0