diff options
50 files changed, 8 insertions, 9 deletions
@@ -221,7 +221,7 @@ local nodes = { }, ["glow_glass"] = { description = S("Glow Glass"), - drawtype = "glasslike", + drawtype = "glasslike_framed", paramtype = "light", sunlight_propagates = true, light_source = 11, @@ -230,8 +230,7 @@ local nodes = { }, ["trap_glow_glass"] = { description = S("Trap Glow Glass"), - drawtype = "glasslike", - tiles = {"moreblocks_glow_glass.png"}, + drawtype = "glasslike_framed", paramtype = "light", sunlight_propagates = true, light_source = 11, @@ -242,7 +241,7 @@ local nodes = { }, ["super_glow_glass"] = { description = S("Super Glow Glass"), - drawtype = "glasslike", + drawtype = "glasslike_framed", paramtype = "light", sunlight_propagates = true, light_source = 15, @@ -251,8 +250,7 @@ local nodes = { }, ["trap_super_glow_glass"] = { description = S("Trap Super Glow Glass"), - drawtype = "glasslike", - tiles = {"moreblocks_super_glow_glass.png"}, + drawtype = "glasslike_framed", paramtype = "light", sunlight_propagates = true, light_source = 15, diff --git a/stairsplus/init.lua b/stairsplus/init.lua index cf2d0de..74d7ddb 100644 --- a/stairsplus/init.lua +++ b/stairsplus/init.lua @@ -21,7 +21,7 @@ function stairsplus:register_all(modname, subname, recipeitem, fields) self:register_slab (modname, subname, recipeitem, fields) self:register_panel(modname, subname, recipeitem, fields) self:register_micro(modname, subname, recipeitem, fields) - self:register_6dfacedir_conversion(modname, subname) + -- self:register_6dfacedir_conversion(modname, subname) circular_saw.known_nodes[recipeitem] = {modname, subname} end @@ -35,11 +35,12 @@ function register_stair_slab_panel_micro(modname, subname, recipeitem, groups, i }) end -dofile(modpath.."/conversion.lua") +-- dofile(modpath.."/aliases.lua") +-- dofile(modpath.."/conversion.lua") + dofile(modpath.."/stairs.lua") dofile(modpath.."/slabs.lua") dofile(modpath.."/panels.lua") dofile(modpath.."/microblocks.lua") -dofile(modpath.."/aliases.lua") dofile(modpath.."/registrations.lua") diff --git a/textures/invisible.png b/textures/invisible.png Binary files differindex c2e8752..4b5b302 100644 --- a/textures/invisible.png +++ b/textures/invisible.png diff --git a/textures/moreblocks_cactus_brick.png b/textures/moreblocks_cactus_brick.png Binary files differindex bdd4b92..9d3a6c2 100644 --- a/textures/moreblocks_cactus_brick.png +++ b/textures/moreblocks_cactus_brick.png diff --git a/textures/moreblocks_cactus_checker.png b/textures/moreblocks_cactus_checker.png Binary files differindex 0e55b0a..134766a 100644 --- a/textures/moreblocks_cactus_checker.png +++ b/textures/moreblocks_cactus_checker.png diff --git a/textures/moreblocks_circle_stone_bricks.png b/textures/moreblocks_circle_stone_bricks.png Binary files differindex 03bbcbb..4ca0134 100644 --- a/textures/moreblocks_circle_stone_bricks.png +++ b/textures/moreblocks_circle_stone_bricks.png diff --git a/textures/moreblocks_circular_saw_bottom.png b/textures/moreblocks_circular_saw_bottom.png Binary files differindex c472a8b..1522829 100644 --- a/textures/moreblocks_circular_saw_bottom.png +++ b/textures/moreblocks_circular_saw_bottom.png diff --git a/textures/moreblocks_circular_saw_side.png b/textures/moreblocks_circular_saw_side.png Binary files differindex a557095..ce9e16f 100644 --- a/textures/moreblocks_circular_saw_side.png +++ b/textures/moreblocks_circular_saw_side.png diff --git a/textures/moreblocks_circular_saw_top.png b/textures/moreblocks_circular_saw_top.png Binary files differindex cec4aaa..96f3350 100644 --- a/textures/moreblocks_circular_saw_top.png +++ b/textures/moreblocks_circular_saw_top.png diff --git a/textures/moreblocks_clean_glass.png b/textures/moreblocks_clean_glass.png Binary files differindex 906a3c1..140ee2b 100644 --- a/textures/moreblocks_clean_glass.png +++ b/textures/moreblocks_clean_glass.png diff --git a/textures/moreblocks_coal_checker.png b/textures/moreblocks_coal_checker.png Binary files differindex 4da7746..7619e56 100644 --- a/textures/moreblocks_coal_checker.png +++ b/textures/moreblocks_coal_checker.png diff --git a/textures/moreblocks_coal_glass.png b/textures/moreblocks_coal_glass.png Binary files differindex d7c830d..5cb7227 100644 --- a/textures/moreblocks_coal_glass.png +++ b/textures/moreblocks_coal_glass.png diff --git a/textures/moreblocks_coal_glass_stairsplus.png b/textures/moreblocks_coal_glass_stairsplus.png Binary files differindex 0441cec..8086a28 100644 --- a/textures/moreblocks_coal_glass_stairsplus.png +++ b/textures/moreblocks_coal_glass_stairsplus.png diff --git a/textures/moreblocks_coal_stone.png b/textures/moreblocks_coal_stone.png Binary files differindex 95db8fa..1e514ed 100644 --- a/textures/moreblocks_coal_stone.png +++ b/textures/moreblocks_coal_stone.png diff --git a/textures/moreblocks_coal_stone_bricks.png b/textures/moreblocks_coal_stone_bricks.png Binary files differindex 52c8ca8..366e445 100644 --- a/textures/moreblocks_coal_stone_bricks.png +++ b/textures/moreblocks_coal_stone_bricks.png diff --git a/textures/moreblocks_empty_bookshelf.png b/textures/moreblocks_empty_bookshelf.png Binary files differindex 56fc713..b49fd2e 100644 --- a/textures/moreblocks_empty_bookshelf.png +++ b/textures/moreblocks_empty_bookshelf.png diff --git a/textures/moreblocks_fence_jungle_wood.png b/textures/moreblocks_fence_jungle_wood.png Binary files differindex 63a39ee..b59db10 100644 --- a/textures/moreblocks_fence_jungle_wood.png +++ b/textures/moreblocks_fence_jungle_wood.png diff --git a/textures/moreblocks_fence_wood.png b/textures/moreblocks_fence_wood.png Binary files differindex 0b99f0e..e3510c5 100644 --- a/textures/moreblocks_fence_wood.png +++ b/textures/moreblocks_fence_wood.png diff --git a/textures/moreblocks_glass.png b/textures/moreblocks_glass.png Binary files differindex ade0196..912b029 100644 --- a/textures/moreblocks_glass.png +++ b/textures/moreblocks_glass.png diff --git a/textures/moreblocks_glass_stairsplus.png b/textures/moreblocks_glass_stairsplus.png Binary files differindex d222b62..b879ec3 100644 --- a/textures/moreblocks_glass_stairsplus.png +++ b/textures/moreblocks_glass_stairsplus.png diff --git a/textures/moreblocks_glow_glass.png b/textures/moreblocks_glow_glass.png Binary files differindex 84991fa..843bebf 100644 --- a/textures/moreblocks_glow_glass.png +++ b/textures/moreblocks_glow_glass.png diff --git a/textures/moreblocks_glow_glass_stairsplus.png b/textures/moreblocks_glow_glass_stairsplus.png Binary files differindex 235179c..cdb8044 100644 --- a/textures/moreblocks_glow_glass_stairsplus.png +++ b/textures/moreblocks_glow_glass_stairsplus.png diff --git a/textures/moreblocks_iron_checker.png b/textures/moreblocks_iron_checker.png Binary files differindex f852884..fb11fdb 100644 --- a/textures/moreblocks_iron_checker.png +++ b/textures/moreblocks_iron_checker.png diff --git a/textures/moreblocks_iron_glass.png b/textures/moreblocks_iron_glass.png Binary files differindex ad5cd1e..51be0d6 100644 --- a/textures/moreblocks_iron_glass.png +++ b/textures/moreblocks_iron_glass.png diff --git a/textures/moreblocks_iron_glass_stairsplus.png b/textures/moreblocks_iron_glass_stairsplus.png Binary files differindex b41cba7..52e3bf3 100644 --- a/textures/moreblocks_iron_glass_stairsplus.png +++ b/textures/moreblocks_iron_glass_stairsplus.png diff --git a/textures/moreblocks_iron_stone.png b/textures/moreblocks_iron_stone.png Binary files differindex 657c4b2..20c42f3 100644 --- a/textures/moreblocks_iron_stone.png +++ b/textures/moreblocks_iron_stone.png diff --git a/textures/moreblocks_iron_stone_bricks.png b/textures/moreblocks_iron_stone_bricks.png Binary files differindex 1b0ed5c..1f817f8 100644 --- a/textures/moreblocks_iron_stone_bricks.png +++ b/textures/moreblocks_iron_stone_bricks.png diff --git a/textures/moreblocks_jungle_wood.png b/textures/moreblocks_jungle_wood.png Binary files differindex ebc6485..6196a76 100644 --- a/textures/moreblocks_jungle_wood.png +++ b/textures/moreblocks_jungle_wood.png diff --git a/textures/moreblocks_junglestick.png b/textures/moreblocks_junglestick.png Binary files differindex afe5892..58514a6 100644 --- a/textures/moreblocks_junglestick.png +++ b/textures/moreblocks_junglestick.png diff --git a/textures/moreblocks_obsidian_glass_stairsplus.png b/textures/moreblocks_obsidian_glass_stairsplus.png Binary files differindex eb758f1..3eb22d0 100644 --- a/textures/moreblocks_obsidian_glass_stairsplus.png +++ b/textures/moreblocks_obsidian_glass_stairsplus.png diff --git a/textures/moreblocks_plankstone.png b/textures/moreblocks_plankstone.png Binary files differindex ac866b8..b1a65c5 100644 --- a/textures/moreblocks_plankstone.png +++ b/textures/moreblocks_plankstone.png diff --git a/textures/moreblocks_plankstone_2.png b/textures/moreblocks_plankstone_2.png Binary files differindex 52656b0..953c2f5 100644 --- a/textures/moreblocks_plankstone_2.png +++ b/textures/moreblocks_plankstone_2.png diff --git a/textures/moreblocks_rope.png b/textures/moreblocks_rope.png Binary files differindex 55967a6..19787fe 100644 --- a/textures/moreblocks_rope.png +++ b/textures/moreblocks_rope.png diff --git a/textures/moreblocks_split_stone_tile.png b/textures/moreblocks_split_stone_tile.png Binary files differindex 579e5ac..d7d69af 100644 --- a/textures/moreblocks_split_stone_tile.png +++ b/textures/moreblocks_split_stone_tile.png diff --git a/textures/moreblocks_split_stone_tile_top.png b/textures/moreblocks_split_stone_tile_top.png Binary files differindex 76e39df..3c8eb6d 100644 --- a/textures/moreblocks_split_stone_tile_top.png +++ b/textures/moreblocks_split_stone_tile_top.png diff --git a/textures/moreblocks_stone_tile.png b/textures/moreblocks_stone_tile.png Binary files differindex 20b070e..0f9038f 100644 --- a/textures/moreblocks_stone_tile.png +++ b/textures/moreblocks_stone_tile.png diff --git a/textures/moreblocks_super_glow_glass.png b/textures/moreblocks_super_glow_glass.png Binary files differindex 65e09f4..a9d4c5f 100644 --- a/textures/moreblocks_super_glow_glass.png +++ b/textures/moreblocks_super_glow_glass.png diff --git a/textures/moreblocks_super_glow_glass_stairsplus.png b/textures/moreblocks_super_glow_glass_stairsplus.png Binary files differindex b8a6657..9118c78 100644 --- a/textures/moreblocks_super_glow_glass_stairsplus.png +++ b/textures/moreblocks_super_glow_glass_stairsplus.png diff --git a/textures/moreblocks_sweeper.png b/textures/moreblocks_sweeper.png Binary files differindex e901ef0..eda3cc3 100644 --- a/textures/moreblocks_sweeper.png +++ b/textures/moreblocks_sweeper.png diff --git a/textures/moreblocks_trap_glass.png b/textures/moreblocks_trap_glass.png Binary files differindex e0d1c26..25c3387 100644 --- a/textures/moreblocks_trap_glass.png +++ b/textures/moreblocks_trap_glass.png diff --git a/textures/moreblocks_trap_stone.png b/textures/moreblocks_trap_stone.png Binary files differindex 05a2531..987fa1f 100644 --- a/textures/moreblocks_trap_stone.png +++ b/textures/moreblocks_trap_stone.png diff --git a/textures/moreblocks_wood.png b/textures/moreblocks_wood.png Binary files differindex 66f2b72..89841da 100644 --- a/textures/moreblocks_wood.png +++ b/textures/moreblocks_wood.png diff --git a/textures/moreblocks_wood_tile.png b/textures/moreblocks_wood_tile.png Binary files differindex c05a56f..b6c9667 100644 --- a/textures/moreblocks_wood_tile.png +++ b/textures/moreblocks_wood_tile.png diff --git a/textures/moreblocks_wood_tile_center.png b/textures/moreblocks_wood_tile_center.png Binary files differindex 7b8f822..3bc4649 100644 --- a/textures/moreblocks_wood_tile_center.png +++ b/textures/moreblocks_wood_tile_center.png diff --git a/textures/moreblocks_wood_tile_down.png b/textures/moreblocks_wood_tile_down.png Binary files differindex aedddfb..711e0f7 100644 --- a/textures/moreblocks_wood_tile_down.png +++ b/textures/moreblocks_wood_tile_down.png diff --git a/textures/moreblocks_wood_tile_flipped.png b/textures/moreblocks_wood_tile_flipped.png Binary files differindex 66eb5a6..2657822 100644 --- a/textures/moreblocks_wood_tile_flipped.png +++ b/textures/moreblocks_wood_tile_flipped.png diff --git a/textures/moreblocks_wood_tile_full.png b/textures/moreblocks_wood_tile_full.png Binary files differindex 0c28e92..7ec7f05 100644 --- a/textures/moreblocks_wood_tile_full.png +++ b/textures/moreblocks_wood_tile_full.png diff --git a/textures/moreblocks_wood_tile_left.png b/textures/moreblocks_wood_tile_left.png Binary files differindex b84166f..5c9b864 100644 --- a/textures/moreblocks_wood_tile_left.png +++ b/textures/moreblocks_wood_tile_left.png diff --git a/textures/moreblocks_wood_tile_right.png b/textures/moreblocks_wood_tile_right.png Binary files differindex 883f44c..a7473ae 100644 --- a/textures/moreblocks_wood_tile_right.png +++ b/textures/moreblocks_wood_tile_right.png diff --git a/textures/moreblocks_wood_tile_up.png b/textures/moreblocks_wood_tile_up.png Binary files differindex 6221910..2a49873 100644 --- a/textures/moreblocks_wood_tile_up.png +++ b/textures/moreblocks_wood_tile_up.png |
