From 83b5ee4bae923883adad8dc5bef0f3971b1d2899 Mon Sep 17 00:00:00 2001 From: Anthony Zhang Date: Sun, 29 Jan 2012 13:19:14 -0500 Subject: Add missing forward slash (was causing plugs and sockets to fail). --- jeija/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jeija/init.lua') diff --git a/jeija/init.lua b/jeija/init.lua index 067575d..b9482f5 100644 --- a/jeija/init.lua +++ b/jeija/init.lua @@ -862,7 +862,7 @@ dofile(minetest.get_modpath("jeija").."/switch.lua") dofile(minetest.get_modpath("jeija").."/pistons.lua") --TEMPEREST's STUFF if ENABLE_TEMPEREST==1 then - dofile(minetest.get_modpath("jeija").."temperest.lua") + dofile(minetest.get_modpath("jeija").."/temperest.lua") end --INIT -- cgit v1.2.3 From c76070fa27c92bca24d6fa9e20b5381d62c48d79 Mon Sep 17 00:00:00 2001 From: Jeija Date: Sat, 4 Feb 2012 18:02:51 +0100 Subject: Fix Meselamp-Orientation Bug --- jeija/init.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'jeija/init.lua') diff --git a/jeija/init.lua b/jeija/init.lua index b9482f5..86cc08f 100644 --- a/jeija/init.lua +++ b/jeija/init.lua @@ -698,7 +698,7 @@ minetest.register_abm( -- MESELAMPS minetest.register_node("jeija:meselamp_on", { drawtype = "torchlike", - tile_images = {"jeija_meselamp_on_floor_on.png", "jeija_meselamp_on_ceiling_on.png", "jeija_meselamp_on.png"}, + tile_images = {"jeija_meselamp_on_ceiling_on.png", "jeija_meselamp_on_floor_on.png", "jeija_meselamp_on.png"}, inventory_image = "jeija_meselamp_on_floor_on.png", paramtype = "light", sunlight_propagates = true, @@ -707,8 +707,8 @@ minetest.register_node("jeija:meselamp_on", { paramtype2 = "wallmounted", light_source = LIGHT_MAX, selection_box = { - type = "wallmounted", - type = "fixed", + --type = "wallmounted", + --type = "fixed", fixed = {-0.38, -0.5, -0.1, 0.38, -0.2, 0.1}, }, material = minetest.digprop_constanttime(0.1), @@ -718,14 +718,14 @@ minetest.register_node("jeija:meselamp_on", { minetest.register_node("jeija:meselamp_off", { drawtype = "torchlike", - tile_images = {"jeija_meselamp_on_floor_off.png", "jeija_meselamp_on_ceiling_off.png", "jeija_meselamp_off.png"}, + tile_images = {"jeija_meselamp_on_ceiling_off.png", "jeija_meselamp_on_floor_off.png", "jeija_meselamp_off.png"}, inventory_image = "jeija_meselamp_on_floor_off.png", paramtype = "light", sunlight_propagates = true, walkable = false, wall_mounted = false, selection_box = { - type = "fixed", + --type = "fixed", fixed = {-0.38, -0.5, -0.1, 0.38, -0.2, 0.1}, }, material = minetest.digprop_constanttime(0.1), -- cgit v1.2.3 From 400511949ab0fac6a9f1612b6b9e6a2cee71a46f Mon Sep 17 00:00:00 2001 From: Jeija Date: Sat, 4 Feb 2012 18:21:12 +0100 Subject: Apply lightstone --- jeija/init.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'jeija/init.lua') diff --git a/jeija/init.lua b/jeija/init.lua index 86cc08f..b680b24 100644 --- a/jeija/init.lua +++ b/jeija/init.lua @@ -860,6 +860,7 @@ dofile(minetest.get_modpath("jeija").."/wireless.lua") dofile(minetest.get_modpath("jeija").."/alias.lua") dofile(minetest.get_modpath("jeija").."/switch.lua") dofile(minetest.get_modpath("jeija").."/pistons.lua") +dofile(minetest.get_modpath("jeija").."/lightstone.lua") --TEMPEREST's STUFF if ENABLE_TEMPEREST==1 then dofile(minetest.get_modpath("jeija").."/temperest.lua") -- cgit v1.2.3 From 9aaa4af37e5f2a9c3a85cfe30049429ccdfea9e4 Mon Sep 17 00:00:00 2001 From: Anthony Zhang Date: Sat, 4 Feb 2012 13:01:56 -0500 Subject: Move the IC craft definition into init.lua, since it is also needed byt the node detector. --- jeija/init.lua | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'jeija/init.lua') diff --git a/jeija/init.lua b/jeija/init.lua index b680b24..f39e3eb 100644 --- a/jeija/init.lua +++ b/jeija/init.lua @@ -638,16 +638,30 @@ minetest.register_on_dignode( end ) - --- Solar Panel - +-- Silicon minetest.register_craftitem("jeija:silicon", { image = "jeija_silicon.png", on_place_on_ground = minetest.craftitem_place_item, description="Silicon", }) +-- IC +minetest.register_craftitem("jeija:ic", { + image = "jeija_ic.png", + on_place_on_ground = minetest.craftitem_place_item, + description="IC", +}) +minetest.register_craft({ + output = 'craft "jeija:ic" 2', + recipe = { + {'craft "jeija:silicon"', 'craft "jeija:silicon"', 'node "jeija:mesecon_off"'}, + {'craft "jeija:silicon"', 'craft "jeija:silicon"', 'node "jeija:mesecon_off"'}, + {'node "jeija:mesecon_off"', 'node "jeija:mesecon_off"', ''}, + } +}) + +-- Solar Panel minetest.register_node("jeija:solar_panel", { drawtype = "raillike", tile_images = {"jeija_solar_panel.png"}, -- cgit v1.2.3 From f54166af45bf270cd671b3cda3cf693a3865da77 Mon Sep 17 00:00:00 2001 From: Anthony Zhang Date: Sat, 4 Feb 2012 13:07:36 -0500 Subject: Update wireless and IC nodes for itemdef. --- jeija/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'jeija/init.lua') diff --git a/jeija/init.lua b/jeija/init.lua index f39e3eb..34c20c6 100644 --- a/jeija/init.lua +++ b/jeija/init.lua @@ -655,9 +655,9 @@ minetest.register_craftitem("jeija:ic", { minetest.register_craft({ output = 'craft "jeija:ic" 2', recipe = { - {'craft "jeija:silicon"', 'craft "jeija:silicon"', 'node "jeija:mesecon_off"'}, - {'craft "jeija:silicon"', 'craft "jeija:silicon"', 'node "jeija:mesecon_off"'}, - {'node "jeija:mesecon_off"', 'node "jeija:mesecon_off"', ''}, + {'jeija:silicon', 'jeija:silicon', 'jeija:mesecon_off'}, + {'jeija:silicon', 'jeija:silicon', 'jeija:mesecon_off'}, + {'jeija:mesecon_off', 'jeija:mesecon_off', ''}, } }) -- cgit v1.2.3