Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anthony Zhang 2012-11-11 17:52:07 -05:00
commit 618fd31f43
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
minetest.register_node("mesecons_noteblock:noteblock", { minetest.register_node("mesecons_noteblock:noteblock", {
description = "Noteblock", description = "Noteblock",
tile_images = {"mesecons_noteblock.png"}, tiles = {"mesecons_noteblock.png"},
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2},
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
visual_scale = 1.3, visual_scale = 1.3,

View File

@ -3,7 +3,7 @@
minetest.register_node("mesecons_powerplant:power_plant", { minetest.register_node("mesecons_powerplant:power_plant", {
drawtype = "plantlike", drawtype = "plantlike",
visual_scale = 1, visual_scale = 1,
tile_images = {"jeija_power_plant.png"}, tiles = {"jeija_power_plant.png"},
inventory_image = "jeija_power_plant.png", inventory_image = "jeija_power_plant.png",
paramtype = "light", paramtype = "light",
walkable = false, walkable = false,

View File

@ -1,7 +1,7 @@
-- WALL LEVER -- WALL LEVER
minetest.register_node("mesecons_walllever:wall_lever_off", { minetest.register_node("mesecons_walllever:wall_lever_off", {
drawtype = "nodebox", drawtype = "nodebox",
tile_images = { tiles = {
"jeija_wall_lever_tb.png", "jeija_wall_lever_tb.png",
"jeija_wall_lever_bottom.png", "jeija_wall_lever_bottom.png",
"jeija_wall_lever_sides.png", "jeija_wall_lever_sides.png",
@ -32,7 +32,7 @@ minetest.register_node("mesecons_walllever:wall_lever_off", {
}) })
minetest.register_node("mesecons_walllever:wall_lever_on", { minetest.register_node("mesecons_walllever:wall_lever_on", {
drawtype = "nodebox", drawtype = "nodebox",
tile_images = { tiles = {
"jeija_wall_lever_top.png", "jeija_wall_lever_top.png",
"jeija_wall_lever_tb.png", "jeija_wall_lever_tb.png",
"jeija_wall_lever_sides.png", "jeija_wall_lever_sides.png",