diff options
| -rw-r--r-- | anvil/init.lua | 1 | ||||
| -rw-r--r-- | boost_cart/cart_entity.lua | 7 | ||||
| -rw-r--r-- | castle_farming/straw.lua | 14 | ||||
| -rw-r--r-- | castle_tapestries/init.lua | 3 | ||||
| -rw-r--r-- | labels/init.lua | 14 | ||||
| -rw-r--r-- | moreores/init.lua | 10 |
6 files changed, 25 insertions, 24 deletions
diff --git a/anvil/init.lua b/anvil/init.lua index 1567894..f4098c8 100644 --- a/anvil/init.lua +++ b/anvil/init.lua @@ -157,6 +157,7 @@ minetest.register_node("anvil:anvil", { end if (listname=='input' and(stack:get_wear() == 0 + or minetest.get_item_group(stack:get_name(), "not_repaired_by_anvil") ~= 0 or stack:get_name() == "technic:water_can" or stack:get_name() == "technic:lava_can" )) then diff --git a/boost_cart/cart_entity.lua b/boost_cart/cart_entity.lua index 32ebe5f..07a7d69 100644 --- a/boost_cart/cart_entity.lua +++ b/boost_cart/cart_entity.lua @@ -238,7 +238,6 @@ function cart_entity:on_step(dtime) pos = vector.round(pos) update.pos = true update.vel = true - mod_found = true end if acc == nil then -- Meta speed modifier @@ -266,11 +265,7 @@ function cart_entity:on_step(dtime) end -- Slow down or speed up, depending on Y direction - if acc then - acc = acc + dir.y * -2.5 - else - acc = 0 - end + acc = acc + dir.y * -2 if self.old_dir.y ~= 1 and not self.punched then -- Stop the cart swing between two rail parts (handbrake) diff --git a/castle_farming/straw.lua b/castle_farming/straw.lua index 673daac..aef5312 100644 --- a/castle_farming/straw.lua +++ b/castle_farming/straw.lua @@ -1,9 +1,9 @@ -minetest.register_alias("cottages:straw", "farming:straw") -minetest.register_alias("castle:straw", "farming:straw") -minetest.register_alias("darkage:straw", "farming:straw") -minetest.register_alias("cottages:straw_bale", "castle_farming:bound_straw") -minetest.register_alias("darkage:straw_bale", "castle_farming:bound_straw") -minetest.register_alias("castle:bound_straw", "castle_farming:bound_straw") +minetest.register_alias_force("cottages:straw", "farming:straw") +minetest.register_alias_force("castle:straw", "farming:straw") +minetest.register_alias_force("darkage:straw", "farming:straw") +minetest.register_alias_force("cottages:straw_bale", "castle_farming:bound_straw") +minetest.register_alias_force("darkage:straw_bale", "castle_farming:bound_straw") +minetest.register_alias_force("castle:bound_straw", "castle_farming:bound_straw") -- internationalization boilerplate local MP = minetest.get_modpath(minetest.get_current_modname()) @@ -72,4 +72,4 @@ minetest.register_craft({ type = "fuel", recipe = "castle_farming:straw_dummy", burntime = 10*2 + 4*stick_burn_time -})
\ No newline at end of file +}) diff --git a/castle_tapestries/init.lua b/castle_tapestries/init.lua index 437511e..c4e5983 100644 --- a/castle_tapestries/init.lua +++ b/castle_tapestries/init.lua @@ -69,6 +69,7 @@ minetest.register_node("castle_tapestries:tapestry", { paramtype = "light", paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", + walkable = false, selection_box = { type = "wallmounted", wall_side = {-0.5,-0.5,0.4375,0.5,1.5,0.5}, @@ -102,6 +103,7 @@ minetest.register_node("castle_tapestries:tapestry_long", { paramtype = "light", paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", + walkable = false, selection_box = { type = "wallmounted", wall_side = {-0.5,-0.5,0.4375,0.5,2.5,0.5}, @@ -135,6 +137,7 @@ minetest.register_node("castle_tapestries:tapestry_very_long", { paramtype = "light", paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.png", + walkable = false, selection_box = { type = "wallmounted", wall_side = {-0.5,-0.5,0.4375,0.5,3.5,0.5}, diff --git a/labels/init.lua b/labels/init.lua index 6caafc0..29e12a7 100644 --- a/labels/init.lua +++ b/labels/init.lua @@ -226,14 +226,16 @@ minetest.register_node(":streets:printer", { }, }) -streets.register_label = function(friendlyname,name,tex,color,ink_needed) +streets.register_label = function(friendlyname,name,tex,color,ink_needed,hide) + local groups = {snappy = 3,attached_node = 1,oddly_breakable_by_hand = 1} + if hide then groups.not_in_creative_inventory = 1 end minetest.register_node(":streets:mark_"..name,{ description = streets.S("Marking Overlay: "..friendlyname), tiles = {tex,"streets_rw_transparent.png"}, drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", - groups = {snappy = 3,attached_node = 1,oddly_breakable_by_hand = 1}, + groups = groups, sunlight_propagates = true, walkable = false, inventory_image = tex, @@ -292,7 +294,7 @@ streets.register_label("Solid White Side Line","solid_white_side_line","streets_ minetest.register_alias("streets:asphalt_side","streets:mark_solid_white_side_line_on_asphalt") minetest.register_alias("streets:asphalt_sideline","streets:mark_solid_white_side_line_on_asphalt") -streets.register_label("Solid White Side Line (rotated)","solid_white_side_line_rotated","streets_asphalt_side.png^[transformR180","white",3) +streets.register_label("Solid White Side Line (rotated)","solid_white_side_line_rotated","streets_asphalt_side.png^[transformR180","white",3,true) minetest.register_alias("streets:asphalt_sideline_r","streets:mark_solid_white_side_line_rotated_on_asphalt") @@ -314,7 +316,7 @@ streets.register_label("Solid White Side Line (corner)","solid_white_side_line_c minetest.register_alias("streets:asphalt_outer_edge","streets:mark_solid_white_side_line_corner_on_asphalt") -streets.register_label("Solid White Side Line (corner, rotated)","solid_white_side_line_corner_rotated","streets_asphalt_outer_edge.png^[transformR270","white",4) +streets.register_label("Solid White Side Line (corner, rotated)","solid_white_side_line_corner_rotated","streets_asphalt_outer_edge.png^[transformR270","white",4,true) minetest.register_alias("streets:asphalt_outer_edge_r","streets:mark_solid_white_side_line_corner_rotated_on_asphalt") @@ -376,7 +378,7 @@ streets.register_label("Solid Yellow Side Line (corner)","solid_yellow_side_line minetest.register_alias("streets:rw_outer_edge","streets:solid_yellow_side_line_corner") -streets.register_label("Solid Yellow Side Line (corner,rotated)","solid_yellow_side_line_corner_rotated","streets_rw_outer_edge.png^[transformR270","yellow",5) +streets.register_label("Solid Yellow Side Line (corner,rotated)","solid_yellow_side_line_corner_rotated","streets_rw_outer_edge.png^[transformR270","yellow",5,true) minetest.register_alias("streets:rw_outer_edge","streets:solid_yellow_side_line_corner") @@ -419,7 +421,7 @@ streets.register_label("Solid Yellow Side Line","solid_yellow_side_line","street minetest.register_alias("streets:rw_sideline","streets:mark_solid_yellow_side_line") -streets.register_label("Solid Yellow Side Line (rotated)","solid_yellow_side_line_rotated","streets_rw_asphalt_side.png^[transformR180","yellow",3) +streets.register_label("Solid Yellow Side Line (rotated)","solid_yellow_side_line_rotated","streets_rw_asphalt_side.png^[transformR180","yellow",3,true) streets.register_label("Yellow Diagonal Lines","yellow_diagonal","streets_yellow_diagonal_lines.png","yellow",5) diff --git a/moreores/init.lua b/moreores/init.lua index 86f8e0a..34c9a0e 100644 --- a/moreores/init.lua +++ b/moreores/init.lua @@ -288,21 +288,21 @@ local oredefs = { }, tools = { pick = { - cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel= 1} + cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel= 2} }, hoe = { uses = 1000 }, shovel = { - crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel= 1} + crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel= 2} }, axe = { - choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel= 1}, + choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel= 2}, fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel= 1} }, sword = { - fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel= 1}, - snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel= 1}, + fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel= 2}, + snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel= 2}, choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0} } }, |