Merge branch 'master' of https://github.com/D00Med/scifi_nodes into grossam-features
This commit is contained in:
commit
9ad78b4b86
|
|
@ -34,3 +34,11 @@ CC BY-NC 3.0
|
|||
* scifi_nodes_palm_scanner.ogg https://freesound.org/people/THE_bizniss/sounds/39313/
|
||||
* scifi_nodes_access_granted https://freesound.org/people/TheBuilder15/sounds/415762/
|
||||
* scifi_nodes_access_refused https://freesound.org/people/RICHERlandTV/sounds/216090/
|
||||
|
||||
# Contributors:
|
||||
|
||||
* tanmayameher https://github.com/tanmayameher
|
||||
* naturefreshmilk https://github.com/naturefreshmilk
|
||||
* acmgit https://github.com/acmgit
|
||||
* catz85 https://github.com/catz85
|
||||
* coil0 https://github.com/coil0
|
||||
|
|
|
|||
|
|
@ -647,7 +647,7 @@ minetest.register_craft({
|
|||
output = "scifi_nodes:doomwall3 6",
|
||||
recipe = {
|
||||
{"scifi_nodes:white", "scifi_nodes:white", "scifi_nodes:white"},
|
||||
{"scifi_nodes:black", "dye:red", "scifi_nodes:black"},
|
||||
{"scifi_nodes:black", "dye:grey", "scifi_nodes:black"},
|
||||
{"scifi_nodes:white", "scifi_nodes:white", "scifi_nodes:white"}
|
||||
}
|
||||
})
|
||||
|
|
|
|||
2
init.lua
2
init.lua
|
|
@ -848,7 +848,7 @@ minetest.register_node("scifi_nodes:blumetstr", {
|
|||
minetest.register_node("scifi_nodes:glass", {
|
||||
description = "dark glass",
|
||||
drawtype = "glasslike",
|
||||
sunlight_propagates = false,
|
||||
sunlight_propagates = true,
|
||||
tiles = {
|
||||
"scifi_nodes_glass.png"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
|||
will the authors be held liable for any damages arising from the use of this content.
|
||||
|
||||
|
||||
For moreblocks_slope.obj:
|
||||
For scifi_nodes_slope.obj, which is renamed from moreblocks_slope.obj:
|
||||
|
||||
zlib license
|
||||
============
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ minetest.register_node("scifi_nodes:slope_"..name, {
|
|||
description = desc.." Slope",
|
||||
sunlight_propagates = false,
|
||||
drawtype = "mesh",
|
||||
mesh = "moreblocks_slope.obj",
|
||||
mesh = "scifi_nodes_slope.obj",
|
||||
tiles = texture,
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
# Blender v2.69 (sub 0) OBJ File: 'slope_test_slope_onetexture.blend'
|
||||
# www.blender.org
|
||||
mtllib slope_test_slope_onetexture.mtl
|
||||
o Cube_Cube.002
|
||||
v 0.500000 0.500000 0.500000
|
||||
v -0.500000 0.500000 0.500000
|
||||
v -0.500000 -0.500000 0.500000
|
||||
v 0.500000 -0.500000 0.500000
|
||||
v -0.500000 -0.500000 -0.500000
|
||||
v 0.500000 -0.500000 -0.500000
|
||||
vt 1.000000 1.000000
|
||||
vt 0.000000 1.000000
|
||||
vt 0.000000 0.000000
|
||||
vt 1.000000 0.000000
|
||||
usemtl None
|
||||
s off
|
||||
f 1/1 2/2 3/3 4/4
|
||||
f 4/3 3/4 5/1 6/2
|
||||
f 2/1 5/3 3/4
|
||||
f 1/2 4/3 6/4
|
||||
f 2/1 1/2 6/3 5/4
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
g top
|
||||
v 0.500000 0.500000 0.500000
|
||||
v -0.500000 0.500000 0.500000
|
||||
v -0.500000 -0.500000 -0.500000
|
||||
v 0.500000 -0.500000 -0.500000
|
||||
vt 1.0000 1.0000
|
||||
vt 0.0000 1.0000
|
||||
vt 0.0000 0.0000
|
||||
vt 1.0000 0.0000
|
||||
vn 0.0000 0.7071 -0.7071
|
||||
s off
|
||||
f 2/1/1 1/2/1 4/3/1 3/4/1
|
||||
g bottom
|
||||
v -0.500000 -0.500000 0.500000
|
||||
v 0.500000 -0.500000 0.500000
|
||||
v -0.500000 -0.500000 -0.500000
|
||||
v 0.500000 -0.500000 -0.500000
|
||||
vt 0.0000 0.0000
|
||||
vt 1.0000 0.0000
|
||||
vt 1.0000 1.0000
|
||||
vt 0.0000 1.0000
|
||||
vn 0.0000 -1.0000 -0.0000
|
||||
s off
|
||||
f 6/5/2 5/6/2 7/7/2 8/8/2
|
||||
g right
|
||||
v -0.500000 0.500000 0.500000
|
||||
v -0.500000 -0.500000 0.500000
|
||||
v -0.500000 -0.500000 -0.500000
|
||||
vt 1.0000 1.0000
|
||||
vt 0.0000 0.0000
|
||||
vt 1.0000 0.0000
|
||||
vn -1.0000 0.0000 0.0000
|
||||
s off
|
||||
f 9/9/3 11/10/3 10/11/3
|
||||
g left
|
||||
v 0.500000 0.500000 0.500000
|
||||
v 0.500000 -0.500000 0.500000
|
||||
v 0.500000 -0.500000 -0.500000
|
||||
vt 0.0000 1.0000
|
||||
vt 0.0000 0.0000
|
||||
vt 1.0000 0.0000
|
||||
vn 1.0000 0.0000 0.0000
|
||||
s off
|
||||
f 12/12/4 13/13/4 14/14/4
|
||||
g back
|
||||
v 0.500000 0.500000 0.500000
|
||||
v -0.500000 0.500000 0.500000
|
||||
v -0.500000 -0.500000 0.500000
|
||||
v 0.500000 -0.500000 0.500000
|
||||
vt 1.0000 1.0000
|
||||
vt 0.0000 1.0000
|
||||
vt 0.0000 0.0000
|
||||
vt 1.0000 0.0000
|
||||
vn 0.0000 -0.0000 1.0000
|
||||
s off
|
||||
f 15/15/5 16/16/5 17/17/5 18/18/5
|
||||
|
|
@ -610,8 +610,11 @@ minetest.register_node("scifi_nodes:powered_stand", {
|
|||
groups = {cracky=1, oddly_breakable_by_hand=1},
|
||||
on_rightclick = function(pos, node, clicker, item, _)
|
||||
local wield_item = clicker:get_wielded_item():get_name()
|
||||
item:take_item()
|
||||
local taken = item:take_item()
|
||||
if taken and not taken:is_empty() then
|
||||
minetest.add_item({x=pos.x, y=pos.y+1, z=pos.z}, wield_item)
|
||||
return item
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
|
|
@ -1073,8 +1076,11 @@ minetest.register_node("scifi_nodes:itemholder", {
|
|||
if name == meta:get_string("owner") or
|
||||
minetest.check_player_privs(name, "protection_bypass") then
|
||||
local wield_item = clicker:get_wielded_item():get_name()
|
||||
item:take_item()
|
||||
local taken = item:take_item()
|
||||
if taken and not taken:is_empty() then
|
||||
minetest.add_item(pos, wield_item)
|
||||
return item
|
||||
end
|
||||
end
|
||||
end,
|
||||
can_dig = function(pos,player)
|
||||
|
|
|
|||
Loading…
Reference in New Issue