From e08d2306ba43e69006e485312de18de4b461c17e Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 29 Dec 2015 17:17:04 +0100 Subject: [PATCH 1/8] added the textures folder :-) --- README.md | 8 -------- textures/columnia_blueprint.png | Bin 0 -> 3051 bytes textures/columnia_lamp.png | Bin 0 -> 3115 bytes textures/columnia_lamp_inv.png | Bin 0 -> 3021 bytes textures/columnia_rusty.png | Bin 0 -> 3333 bytes textures/columnia_rusty_block.png | Bin 0 -> 3406 bytes 6 files changed, 8 deletions(-) create mode 100644 textures/columnia_blueprint.png create mode 100644 textures/columnia_lamp.png create mode 100644 textures/columnia_lamp_inv.png create mode 100644 textures/columnia_rusty.png create mode 100644 textures/columnia_rusty_block.png diff --git a/README.md b/README.md index 44c1fdc..163fb3a 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,6 @@ columnia Simple Pillar Mod for Minetest -Advice: -Dont Download the mod from GitHub: -I had some problems whit GitHub so i can't upload the texturefolder. So please download the mod from this Link: -https://www.dropbox.com/s/cbpdgbkbzrp1yir/columnia.zip -This zip will also include the textures. -The GitHub respository is only for the Code. -I'm sorry - Licences: Columnia (2014 by Glunggi) is a fork of stairs ..in principle is its stairs with other nodes. So i will to keep the old stairs- Licenses for this chanced Mode.. include all of my chances. diff --git a/textures/columnia_blueprint.png b/textures/columnia_blueprint.png new file mode 100644 index 0000000000000000000000000000000000000000..331afc60e0b9128dd45056a2805962daf2e187b8 GIT binary patch literal 3051 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 FV1kG4(%}FA literal 0 HcmV?d00001 diff --git a/textures/columnia_lamp_inv.png b/textures/columnia_lamp_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..5611b789e1816cba181fadb0c5ce494a2f476d26 GIT binary patch literal 3021 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 P00000NkvXXu0mjfRIfkP literal 0 HcmV?d00001 diff --git a/textures/columnia_rusty_block.png b/textures/columnia_rusty_block.png new file mode 100644 index 0000000000000000000000000000000000000000..7c4ec94b07f64b17c6605fe124148c999c5fec7a GIT binary patch literal 3406 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 Date: Tue, 29 Dec 2015 17:22:17 +0100 Subject: [PATCH 2/8] default:wood -> group:wood --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 06633b3..50251ce 100644 --- a/init.lua +++ b/init.lua @@ -623,7 +623,7 @@ columnia.register_column_ia("sandstonebrick", "default:sandstonebrick", "Sandstone Brick Column Linkdown", default.node_sound_stone_defaults()) -columnia.register_column_ia("wood", "default:wood", +columnia.register_column_ia("wood", "group:wood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, {"default_wood.png"}, "Wooden Column", From 6bc7b9c3f0b6a12d944a70b0a17f0f046064660c Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 29 Dec 2015 17:38:27 +0100 Subject: [PATCH 3/8] merge changes from https://github.com/FozLand/columnia --- init.lua | 46 ++++++++++++++++++++++++++++++ textures/columnia_blueprint.png | Bin 3051 -> 301 bytes textures/columnia_lamp.png | Bin 3115 -> 381 bytes textures/columnia_lamp_inv.png | Bin 3021 -> 263 bytes textures/columnia_rusty.png | Bin 3333 -> 534 bytes textures/columnia_rusty_block.png | Bin 3406 -> 609 bytes 6 files changed, 46 insertions(+) diff --git a/init.lua b/init.lua index 50251ce..10b38fc 100644 --- a/init.lua +++ b/init.lua @@ -644,3 +644,49 @@ columnia.register_column_ia("junglewood", "default:junglewood", "Junglewood Column Link", "Junglewood Column Linkdown", default.node_sound_wood_defaults()) + +if core.get_modpath( 'moretrees' ) then + local morewood = { + { name='beech', description='Beech Tree' }, + { name='apple_tree', description='Apple Tree' }, + { name='oak', description='Oak Tree' }, + { name='sequoia', description='Giant Sequoia' }, + { name='birch', description='Birch Tree' }, + { name='palm', description='Palm Tree', }, + { name='spruce', description='Spruce Tree' }, + { name='pine', description='Pine Tree' }, + { name='willow', description='Willow Tree' }, + { name='acacia', description='Acacia Tree' }, + { name='rubber_tree', description='Rubber Tree' }, + { name='fir', description='Douglas Fir' } + } + for _,t in pairs( morewood ) do + print('register: '.. t.name) + columnia.register_column_ia( t.name, 'moretrees:' .. t.name ..'_planks', + {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, + { 'moretrees_' .. t.name .. '_wood.png' }, + t.description .. ' Column', + t.description .. ' Column Top', + t.description .. ' Column Bottom', + t.description .. ' Column Crosslink', + t.description .. ' Column Link', + t.description .. ' Column Linkdown', + default.node_sound_wood_defaults()) + end +end + +if core.get_modpath('moreblocks') then + stairsplus:register_all( + 'columnia', + 'rusty_block', + 'columnia:rusty_block', + { + description = 'Rusty Block', + tiles = { + 'columnia_rusty_block.png' + }, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), + } + ) +end diff --git a/textures/columnia_blueprint.png b/textures/columnia_blueprint.png index 331afc60e0b9128dd45056a2805962daf2e187b8..f1a1bb4aebbccd3885da8225c4d09cbb85befa85 100644 GIT binary patch delta 224 zcmaDYzLsf%1SbnK0|SFvqv7|-3%T?H8FT}DLR^6&r%qpxk&#@pc5_>MZ%AlVctmVO zWL$7aWN3JFTzqm+a71ieQdD&O|NsB9zCL6FYG5o0@(X5gcy=QV#7XjYcj3$5Yv4ao zQM`o2#LZufddw8-)*Tu((_`lksMX>V%~UyB($}S+X&F XsuN_$KQHkKXfT7PtDnm{r-UW|HZ)CZ delta 2997 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 U$!66-+yDRo07*qoM6N<$f>uS-TL1t6 diff --git a/textures/columnia_lamp_inv.png b/textures/columnia_lamp_inv.png index 5611b789e1816cba181fadb0c5ce494a2f476d26..44bb9c44e28e57e40cbe8f9024d4e309c5e2f061 100644 GIT binary patch delta 185 zcmX>r-p({Zf|G@rfq~)e-A6%_7jo%4$_4m@xB>;Dylw4`)Xtnay?y((rAt<9*}VPL ztC!!ufBXOc|MvplMxYADk|4ie28U-i(md>FdgVkB5cL zLh$+pUm>6hGfx-C5RU7~2?y9(L>6w@BsfELNs`nXmK4L4GnP$fwbnE+&}a|cvRtb1 l$r)>_F2z-+PfKdBF??|2Xq?ZJ8wNCi!PC{xWt~$(69B5nM!^68 delta 2965 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 A=l}o! delta 3298 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 gPn<6xObCAl0DUiOWk?I6NB{r;07*qoM6N<$f diff --git a/textures/columnia_rusty_block.png b/textures/columnia_rusty_block.png index 7c4ec94b07f64b17c6605fe124148c999c5fec7a..fe6c1224874f561d568fe1cdbcb9e18728d55c9f 100644 GIT binary patch delta 534 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 C&1#JR From 415fad6492e7274c008a36c01ca85fbc5ed370a0 Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 29 Dec 2015 20:07:33 +0100 Subject: [PATCH 4/8] fix nil value error because depends.txt and temporally disable moretrees compatibility --- depends.txt | 1 + init.lua | 85 +++++++++++++++++++++++++++++------------------------ 2 files changed, 48 insertions(+), 38 deletions(-) create mode 100644 depends.txt diff --git a/depends.txt b/depends.txt new file mode 100644 index 0000000..4ad96d5 --- /dev/null +++ b/depends.txt @@ -0,0 +1 @@ +default diff --git a/init.lua b/init.lua index 10b38fc..ad57bf3 100644 --- a/init.lua +++ b/init.lua @@ -533,7 +533,8 @@ columnia.register_column_ia("rusty_block", "columnia:rusty_block", "Rusty Column Crosslink", "Rusty Column Link", "Rusty Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("stone", "default:stone", {cracky=3}, @@ -544,7 +545,8 @@ columnia.register_column_ia("stone", "default:stone", "Stone Column Crosslink", "Stone Column Link", "Stone Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("stonebrick", "default:stonebrick", {cracky=3}, @@ -555,7 +557,8 @@ columnia.register_column_ia("stonebrick", "default:stonebrick", "Stone Brick Column Crosslink", "Stone Brick Column Link", "Stone Brick Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("desert_stonebrick", "default:desert_stonebrick", {cracky=3}, @@ -566,7 +569,8 @@ columnia.register_column_ia("desert_stonebrick", "default:desert_stonebrick", "Desert Stone Brick Column Crosslink", "Desert Stone Brick Column Link", "Desert Stone Brick Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("desert_stone", "default:desert_stone", {cracky=3}, @@ -577,7 +581,8 @@ columnia.register_column_ia("desert_stone", "default:desert_stone", "Desert Stone Column Crosslink", "Desert Stone Column Link", "Desert Stone Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("cobble", "default:cobble", {cracky=3}, @@ -588,7 +593,8 @@ columnia.register_column_ia("cobble", "default:cobble", "Cobble Column Crosslink", "Cobble Column Link", "Cobble Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("brick", "default:brick", {cracky=3}, @@ -599,7 +605,8 @@ columnia.register_column_ia("brick", "default:brick", "Brick Column Crosslink", "Brick Column Link", "Brick Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("sandstone", "default:sandstone", {crumbly=2,cracky=2}, @@ -610,7 +617,8 @@ columnia.register_column_ia("sandstone", "default:sandstone", "Sandstone Column Crosslink", "Sandstone Column Link", "Sandstone Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("sandstonebrick", "default:sandstonebrick", {crumbly=2,cracky=2}, @@ -621,7 +629,8 @@ columnia.register_column_ia("sandstonebrick", "default:sandstonebrick", "Sandstone Brick Column Crosslink", "Sandstone Brick Column Link", "Sandstone Brick Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("wood", "group:wood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, @@ -645,35 +654,35 @@ columnia.register_column_ia("junglewood", "default:junglewood", "Junglewood Column Linkdown", default.node_sound_wood_defaults()) -if core.get_modpath( 'moretrees' ) then - local morewood = { - { name='beech', description='Beech Tree' }, - { name='apple_tree', description='Apple Tree' }, - { name='oak', description='Oak Tree' }, - { name='sequoia', description='Giant Sequoia' }, - { name='birch', description='Birch Tree' }, - { name='palm', description='Palm Tree', }, - { name='spruce', description='Spruce Tree' }, - { name='pine', description='Pine Tree' }, - { name='willow', description='Willow Tree' }, - { name='acacia', description='Acacia Tree' }, - { name='rubber_tree', description='Rubber Tree' }, - { name='fir', description='Douglas Fir' } - } - for _,t in pairs( morewood ) do - print('register: '.. t.name) - columnia.register_column_ia( t.name, 'moretrees:' .. t.name ..'_planks', - {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, - { 'moretrees_' .. t.name .. '_wood.png' }, - t.description .. ' Column', - t.description .. ' Column Top', - t.description .. ' Column Bottom', - t.description .. ' Column Crosslink', - t.description .. ' Column Link', - t.description .. ' Column Linkdown', - default.node_sound_wood_defaults()) - end -end +--if core.get_modpath( 'moretrees' ) then +-- local morewood = { +-- { name='beech', description='Beech Tree' }, +-- { name='apple_tree', description='Apple Tree' }, +-- { name='oak', description='Oak Tree' }, +-- { name='sequoia', description='Giant Sequoia' }, +-- { name='birch', description='Birch Tree' }, +-- { name='palm', description='Palm Tree', }, +-- { name='spruce', description='Spruce Tree' }, +-- { name='pine', description='Pine Tree' }, +-- { name='willow', description='Willow Tree' }, +-- { name='acacia', description='Acacia Tree' }, +-- { name='rubber_tree', description='Rubber Tree' }, +-- { name='fir', description='Douglas Fir' } +-- } +-- for _,t in pairs( morewood ) do +-- print('register: '.. t.name) +-- columnia.register_column_ia( t.name, 'moretrees:' .. t.name ..'_planks', +-- {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, +-- { 'moretrees_' .. t.name .. '_wood.png' }, +-- t.description .. ' Column', +-- t.description .. ' Column Top', +-- t.description .. ' Column Bottom', +-- t.description .. ' Column Crosslink', +-- t.description .. ' Column Link', +-- t.description .. ' Column Linkdown', +-- default.node_sound_wood_defaults()) +-- end +--end if core.get_modpath('moreblocks') then stairsplus:register_all( From 040b03a87908fb7d2ba1918307df9260e87d5568 Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 29 Dec 2015 20:09:44 +0100 Subject: [PATCH 5/8] finally remove obsolete 'depends' file in the git repo --- depends | 1 - 1 file changed, 1 deletion(-) delete mode 100644 depends diff --git a/depends b/depends deleted file mode 100644 index 4ad96d5..0000000 --- a/depends +++ /dev/null @@ -1 +0,0 @@ -default From b98819516631cbdfc5c030d181e6b0135eee55a6 Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 29 Dec 2015 20:16:15 +0100 Subject: [PATCH 6/8] re-add moretrees compatibility --- init.lua | 58 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/init.lua b/init.lua index ad57bf3..13a3c1e 100644 --- a/init.lua +++ b/init.lua @@ -654,35 +654,35 @@ columnia.register_column_ia("junglewood", "default:junglewood", "Junglewood Column Linkdown", default.node_sound_wood_defaults()) ---if core.get_modpath( 'moretrees' ) then --- local morewood = { --- { name='beech', description='Beech Tree' }, --- { name='apple_tree', description='Apple Tree' }, --- { name='oak', description='Oak Tree' }, --- { name='sequoia', description='Giant Sequoia' }, --- { name='birch', description='Birch Tree' }, --- { name='palm', description='Palm Tree', }, --- { name='spruce', description='Spruce Tree' }, --- { name='pine', description='Pine Tree' }, --- { name='willow', description='Willow Tree' }, --- { name='acacia', description='Acacia Tree' }, --- { name='rubber_tree', description='Rubber Tree' }, --- { name='fir', description='Douglas Fir' } --- } --- for _,t in pairs( morewood ) do --- print('register: '.. t.name) --- columnia.register_column_ia( t.name, 'moretrees:' .. t.name ..'_planks', --- {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, --- { 'moretrees_' .. t.name .. '_wood.png' }, --- t.description .. ' Column', --- t.description .. ' Column Top', --- t.description .. ' Column Bottom', --- t.description .. ' Column Crosslink', --- t.description .. ' Column Link', --- t.description .. ' Column Linkdown', --- default.node_sound_wood_defaults()) --- end ---end +if core.get_modpath( 'moretrees' ) then + local morewood = { + { name='beech', description='Beech Tree' }, + { name='apple_tree', description='Apple Tree' }, + { name='oak', description='Oak Tree' }, + { name='sequoia', description='Giant Sequoia' }, + { name='birch', description='Birch Tree' }, + { name='palm', description='Palm Tree', }, + { name='spruce', description='Spruce Tree' }, + { name='pine', description='Pine Tree' }, + { name='willow', description='Willow Tree' }, + { name='acacia', description='Acacia Tree' }, + { name='rubber_tree', description='Rubber Tree' }, + { name='fir', description='Douglas Fir' } + } + for _,t in pairs( morewood ) do + print('register: '.. t.name) + columnia.register_column_ia( t.name, 'moretrees:' .. t.name ..'_planks', + {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, + { 'moretrees_' .. t.name .. '_wood.png' }, + t.description .. ' Column', + t.description .. ' Column Top', + t.description .. ' Column Bottom', + t.description .. ' Column Crosslink', + t.description .. ' Column Link', + t.description .. ' Column Linkdown', + default.node_sound_wood_defaults()) + end +end if core.get_modpath('moreblocks') then stairsplus:register_all( From d8ab6cac0e805556d96d14c9f3d93e6c24de4b22 Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 29 Dec 2015 20:35:02 +0100 Subject: [PATCH 7/8] fixed pine wood --- depends.txt | 1 + init.lua | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/depends.txt b/depends.txt index 4ad96d5..1246684 100644 --- a/depends.txt +++ b/depends.txt @@ -1 +1,2 @@ default +moretrees? diff --git a/init.lua b/init.lua index 13a3c1e..c801378 100644 --- a/init.lua +++ b/init.lua @@ -632,7 +632,7 @@ columnia.register_column_ia("sandstonebrick", "default:sandstonebrick", default.node_sound_stone_defaults() ) -columnia.register_column_ia("wood", "group:wood", +columnia.register_column_ia("wood", "default:wood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, {"default_wood.png"}, "Wooden Column", @@ -654,6 +654,17 @@ columnia.register_column_ia("junglewood", "default:junglewood", "Junglewood Column Linkdown", default.node_sound_wood_defaults()) +columnia.register_column_ia("wood", "default:pine_wood", + {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, + {"default_pine_wood.png"}, + "Pinewood Column", + "Pineewood Column Top", + "Pineewood Column Bottom", + "Pineewood Column Crosslink", + "Pineewood Column Link", + "Pineewood Column Linkdown", + default.node_sound_wood_defaults()) + if core.get_modpath( 'moretrees' ) then local morewood = { { name='beech', description='Beech Tree' }, @@ -663,7 +674,6 @@ if core.get_modpath( 'moretrees' ) then { name='birch', description='Birch Tree' }, { name='palm', description='Palm Tree', }, { name='spruce', description='Spruce Tree' }, - { name='pine', description='Pine Tree' }, { name='willow', description='Willow Tree' }, { name='acacia', description='Acacia Tree' }, { name='rubber_tree', description='Rubber Tree' }, From 7f88642f5f056696231b5840d8e6401d0fe1d6db Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 29 Dec 2015 20:37:23 +0100 Subject: [PATCH 8/8] fix typo --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index c801378..b09367b 100644 --- a/init.lua +++ b/init.lua @@ -654,7 +654,7 @@ columnia.register_column_ia("junglewood", "default:junglewood", "Junglewood Column Linkdown", default.node_sound_wood_defaults()) -columnia.register_column_ia("wood", "default:pine_wood", +columnia.register_column_ia("pinewood", "default:pine_wood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, {"default_pine_wood.png"}, "Pinewood Column",