Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'refs/remotes/origin/master'
  • Loading branch information
Uberi committed Apr 27, 2013
2 parents d4f18d0 + 9299111 commit 163384f
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README
Expand Up @@ -14,7 +14,7 @@ Jordach: Sounds for the noteblock
minerd247: Some textures
...other contributors

This is a mod for minetest-c55.
This is a mod for minetest.
Copy the minetest-mod-mesecons directory into you game's mod folder
(e.g. games/minetest_game/mods/minetest-mod-mesecons)

Expand Down
8 changes: 4 additions & 4 deletions mesecons_extrawires/vertical.lua
Expand Up @@ -117,7 +117,7 @@ minetest.register_node("mesecons_extrawires:vertical_off", {
minetest.register_node("mesecons_extrawires:vertical_top_on", {
description = "Vertical mesecon",
drawtype = "nodebox",
tiles = {"wires_full_on.png"},
tiles = {"wires_full_on.png","wires_full_on.png","wires_vertical_on.png"},
walkable = false,
paramtype = "light",
sunlight_propagates = true,
Expand All @@ -139,7 +139,7 @@ minetest.register_node("mesecons_extrawires:vertical_top_on", {
minetest.register_node("mesecons_extrawires:vertical_top_off", {
description = "Vertical mesecon",
drawtype = "nodebox",
tiles = {"wires_full_off.png"},
tiles = {"wires_full_off.png","wires_full_off.png","wires_vertical_off.png"},
walkable = false,
paramtype = "light",
sunlight_propagates = true,
Expand All @@ -162,7 +162,7 @@ minetest.register_node("mesecons_extrawires:vertical_top_off", {
minetest.register_node("mesecons_extrawires:vertical_bottom_on", {
description = "Vertical mesecon",
drawtype = "nodebox",
tiles = {"wires_full_on.png"},
tiles = {"wires_full_on.png","wires_full_on.png","wires_vertical_on.png"},
walkable = false,
paramtype = "light",
sunlight_propagates = true,
Expand All @@ -183,7 +183,7 @@ minetest.register_node("mesecons_extrawires:vertical_bottom_on", {
minetest.register_node("mesecons_extrawires:vertical_bottom_off", {
description = "Vertical mesecon",
drawtype = "nodebox",
tiles = {"wires_full_off.png"},
tiles = {"wires_full_off.png","wires_full_off.png","wires_vertical_off.png"},
walkable = false,
paramtype = "light",
sunlight_propagates = true,
Expand Down
26 changes: 14 additions & 12 deletions mesecons_pressureplates/init.lua
Expand Up @@ -5,7 +5,7 @@ local pp_box_off = {

local pp_box_on = {
type = "fixed",
fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 },
fixed = { -7/16, -8/16, -7/16, 7/16, -7.5/16, 7/16 },
}

pp_on_timer = function (pos, elapsed)
Expand Down Expand Up @@ -49,17 +49,17 @@ end
-- image: inventory and wield image of the pressure plate
-- recipe: crafting recipe of the pressure plate

function mesecon:register_pressure_plate(offstate, onstate, description, texture_off, texture_on, image, recipe)
function mesecon:register_pressure_plate(offstate, onstate, description, textures_off, textures_on, image_w, image_i, recipe)
local ppspec = {
offstate = offstate,
onstate = onstate
}

minetest.register_node(offstate, {
drawtype = "nodebox",
tiles = {texture_off},
inventory_image = texture_off,
wield_image = image,
tiles = textures_off,
inventory_image = image_i,
wield_image = image_w,
paramtype = "light",
selection_box = pp_box_off,
node_box = pp_box_off,
Expand All @@ -77,7 +77,7 @@ function mesecon:register_pressure_plate(offstate, onstate, description, texture

minetest.register_node(onstate, {
drawtype = "nodebox",
tiles = {texture_on},
tiles = textures_on,
paramtype = "light",
selection_box = pp_box_on,
node_box = pp_box_on,
Expand Down Expand Up @@ -110,16 +110,18 @@ mesecon:register_pressure_plate(
"mesecons_pressureplates:pressure_plate_wood_off",
"mesecons_pressureplates:pressure_plate_wood_on",
"Wooden Pressure Plate",
"jeija_pressure_plate_wood_off.png",
"jeija_pressure_plate_wood_on.png",
"jeija_pressure_plate_wood_off.png",
{"jeija_pressure_plate_wood_off.png","jeija_pressure_plate_wood_off.png","jeija_pressure_plate_wood_off_edges.png"},
{"jeija_pressure_plate_wood_on.png","jeija_pressure_plate_wood_on.png","jeija_pressure_plate_wood_on_edges.png"},
"jeija_pressure_plate_wood_wield.png",
"jeija_pressure_plate_wood_inv.png",
{{"default:wood", "default:wood"}})

mesecon:register_pressure_plate(
"mesecons_pressureplates:pressure_plate_stone_off",
"mesecons_pressureplates:pressure_plate_stone_on",
"Stone Pressure Plate",
"jeija_pressure_plate_stone_off.png",
"jeija_pressure_plate_stone_on.png",
"jeija_pressure_plate_stone_off.png",
{"jeija_pressure_plate_stone_off.png","jeija_pressure_plate_stone_off.png","jeija_pressure_plate_stone_off_edges.png"},
{"jeija_pressure_plate_stone_on.png","jeija_pressure_plate_stone_on.png","jeija_pressure_plate_stone_on_edges.png"},
"jeija_pressure_plate_stone_wield.png",
"jeija_pressure_plate_stone_inv.png",
{{"default:cobble", "default:cobble"}})
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mesecons_textures/textures/jeija_pressure_plate_stone_off.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mesecons_textures/textures/jeija_pressure_plate_stone_on.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mesecons_textures/textures/jeija_pressure_plate_wood_off.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mesecons_textures/textures/jeija_pressure_plate_wood_on.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 163384f

Please sign in to comment.