diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b5cb52..8e9a794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Legacy Stairs+ conversion code. - It was only required to import worlds last edited before Q3 2013. +### Added + +- Compressed desert cobblestone. + ## [2.0.0] - 2019-11-25 ### Added diff --git a/crafting.lua b/crafting.lua index a1058a9..cd07711 100644 --- a/crafting.lua +++ b/crafting.lua @@ -512,6 +512,22 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "moreblocks:desert_cobble_compressed", + recipe = { + {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"}, + {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"}, + {"default:desert_cobble", "default:desert_cobble", "default:desert_cobble"}, + } +}) + +minetest.register_craft({ + output = "default:desert_cobble 9", + recipe = { + {"moreblocks:desert_cobble_compressed"}, + } +}) + minetest.register_craft({ type = "cooking", output = "moreblocks:tar", recipe = "default:pine_tree", }) diff --git a/locale/de.po b/locale/de.po index 852133b..44420e2 100644 --- a/locale/de.po +++ b/locale/de.po @@ -132,6 +132,10 @@ msgstr "Kohlesteinziegel" msgid "Compressed Cobblestone" msgstr "Gepresster Kopfsteinpflaster" +#: nodes.lua +msgid "Compressed Desert Cobblestone" +msgstr "" + #: nodes.lua msgid "Compressed Dirt" msgstr "Gepresste Erde" diff --git a/locale/es.po b/locale/es.po index ad9001c..e64f0a3 100644 --- a/locale/es.po +++ b/locale/es.po @@ -128,6 +128,10 @@ msgstr "" msgid "Compressed Cobblestone" msgstr "" +#: nodes.lua +msgid "Compressed Desert Cobblestone" +msgstr "" + #: nodes.lua msgid "Compressed Dirt" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index 7744da6..e1e25d0 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -133,6 +133,10 @@ msgstr "Briques en pierre de charbon" msgid "Compressed Cobblestone" msgstr "Pierre taillée compressée" +#: nodes.lua +msgid "Compressed Desert Cobblestone" +msgstr "" + #: nodes.lua msgid "Compressed Dirt" msgstr "Terre compressée" diff --git a/locale/it.po b/locale/it.po index 7874949..1ec3055 100644 --- a/locale/it.po +++ b/locale/it.po @@ -132,6 +132,10 @@ msgstr "Mattoni di pietra in carbone" msgid "Compressed Cobblestone" msgstr "" +#: nodes.lua +msgid "Compressed Desert Cobblestone" +msgstr "" + #: nodes.lua msgid "Compressed Dirt" msgstr "" diff --git a/locale/pl.po b/locale/pl.po index a24728f..4d557f3 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -132,6 +132,10 @@ msgstr "Węglowe kamienne cegły" msgid "Compressed Cobblestone" msgstr "Skompresowany bruk" +#: nodes.lua +msgid "Compressed Desert Cobblestone" +msgstr "" + #: nodes.lua msgid "Compressed Dirt" msgstr "Skompresowana ziemia" diff --git a/locale/ru.po b/locale/ru.po index 9b3b93e..cd3d2c5 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -133,6 +133,10 @@ msgstr "угольно-каменный кирпич" msgid "Compressed Cobblestone" msgstr "прессованный булыжник" +#: nodes.lua +msgid "Compressed Desert Cobblestone" +msgstr "" + #: nodes.lua msgid "Compressed Dirt" msgstr "прессованная земля" diff --git a/locale/template.pot b/locale/template.pot index 929dc88..25083cc 100644 --- a/locale/template.pot +++ b/locale/template.pot @@ -127,6 +127,10 @@ msgstr "" msgid "Compressed Cobblestone" msgstr "" +#: nodes.lua +msgid "Compressed Desert Cobblestone" +msgstr "" + #: nodes.lua msgid "Compressed Dirt" msgstr "" diff --git a/locale/zh_CN.po b/locale/zh_CN.po new file mode 100644 index 0000000..e27336f --- /dev/null +++ b/locale/zh_CN.po @@ -0,0 +1,288 @@ +# Template translation for More Blocks. +# Copyright © 2011-2020 Hugo Locurcio and contributors +# This file is distributed under the same license as the More Blocks package. +# IFRFSX , 2020. +msgid "" +msgstr "" +"Project-Id-Version: More Blocks\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-07-13 12:37+0200\n" +"PO-Revision-Date: \n" +"Last-Translator: CodeXP \n" +"Language-Team: \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: circular_saw.lua +msgid "Circular Saw" +msgstr "圆锯" + +#: circular_saw.lua +msgid "" +"Input\n" +"material" +msgstr "" +"输入\n" +"材料" + +#: circular_saw.lua +msgid "Left-over" +msgstr "剩余材料" + +#: circular_saw.lua +msgid "Max" +msgstr "最大值" + +#: circular_saw.lua +msgid "" +"Recycle\n" +"output" +msgstr "" +"回收\n" +"输出物" + +#: circular_saw.lua +msgid "Set" +msgstr "设置" + +#: circular_saw.lua +msgid "owned by @1" +msgstr "属于@1所有" + +#: circular_saw.lua +msgid "Circular Saw is empty" +msgstr "圆锯是空的" + +#: circular_saw.lua +msgid "Circular Saw is working on @1" +msgstr "圆锯正在加工@1" + +#: init.lua +msgid "[moreblocks] loaded." +msgstr "[moreblocks] 已加载" + +#: nodes.lua +msgid "Deprecated" +msgstr "弃用" + +#: nodes.lua +msgid "All-faces Acacia Tree" +msgstr "全切面相思树木方块" + +#: nodes.lua +msgid "All-faces Aspen Tree" +msgstr "全切面白杨树木方块" + +#: nodes.lua +msgid "All-faces Jungle Tree" +msgstr "全切面丛林树木方块" + +#: nodes.lua +msgid "All-faces Pine Tree" +msgstr "全切面松树木方块" + +#: nodes.lua +msgid "All-faces Tree" +msgstr "全切面树木方块" + +#: nodes.lua +msgid "Cactus Brick" +msgstr "仙人掌砖" + +#: nodes.lua +msgid "Cactus Checker" +msgstr "仙人掌棋盘方块" + +#: nodes.lua +msgid "Centered Wooden Tile" +msgstr "居中的木瓦" + +#: nodes.lua +msgid "Checker Stone Tile" +msgstr "棋盘石瓦" + +#: nodes.lua +msgid "Circle Stone Bricks" +msgstr "圆石砖" + +#: nodes.lua +msgid "Clean Glass" +msgstr "干净的玻璃" + +#: nodes.lua +msgid "Coal Checker" +msgstr "棋盘煤块" + +#: nodes.lua +msgid "Coal Glass" +msgstr "煤玻璃" + +#: nodes.lua +msgid "Coal Stone" +msgstr "煤炭石" + +#: nodes.lua +msgid "Coal Stone Bricks" +msgstr "煤炭石砖" + +#: nodes.lua +msgid "Compressed Cobblestone" +msgstr "压缩圆石" + +#: nodes.lua +msgid "Compressed Dirt" +msgstr "压缩土" + +#: nodes.lua +msgid "Copper Patina Block" +msgstr "铜绿方块" + +#: nodes.lua +msgid "Empty Shelf" +msgstr "空书架" + +#: nodes.lua +msgid "Full Wooden Tile" +msgstr "全木瓦" + +#: nodes.lua +msgid "Glow Glass" +msgstr "发光玻璃" + +#: nodes.lua +msgid "Iron Checker" +msgstr "棋盘铁方块" + +#: nodes.lua +msgid "Iron Glass" +msgstr "铁玻璃" + +#: nodes.lua +msgid "Iron Stone" +msgstr "铁石" + +#: nodes.lua +msgid "Iron Stone Bricks" +msgstr "铁石砖" + +#: nodes.lua +msgid "Plankstone" +msgstr "板石" + +#: nodes.lua +msgid "Rope" +msgstr "绳子" + +#: nodes.lua +msgid "Split Stone Tile" +msgstr "裂石砖" + +#: nodes.lua +msgid "Stone Bricks" +msgstr "石砖" + +#: nodes.lua +msgid "Stone Tile" +msgstr "石瓦" + +#: nodes.lua +msgid "Super Glow Glass" +msgstr "超级发光玻璃" + +#: nodes.lua +msgid "Sweeper" +msgstr "清扫器" + +#: nodes.lua +msgid "Tar" +msgstr "焦油" + +#: nodes.lua +msgid "Trap Desert Stone" +msgstr "陷阱沙漠石" + +#: nodes.lua +msgid "Trap Glass" +msgstr "陷阱玻璃" + +#: nodes.lua +msgid "Trap Glow Glass" +msgstr "陷阱发光玻璃" + +#: nodes.lua +msgid "Trap Obsidian" +msgstr "陷阱黑耀石" + +#: nodes.lua +msgid "Trap Obsidian Glass" +msgstr "陷阱黑耀石玻璃" + +#: nodes.lua +msgid "Trap Sandstone" +msgstr "陷阱沙石" + +#: nodes.lua +msgid "Trap Stone" +msgstr "陷阱石" + +#: nodes.lua +msgid "Trap Super Glow Glass" +msgstr "陷阱超级发光玻璃" + +#: nodes.lua +msgid "Wooden Tile" +msgstr "木瓦" + +#: nodes.lua +msgid "Offset Wooden Tile" +msgstr "胶合木瓦" + +# @deprecated +#: nodes.lua +msgid "Downwards Wooden Tile" +msgstr "向下的木瓦" + +# @deprecated +#: nodes.lua +msgid "Leftwards Wooden Tile" +msgstr "向左的木瓦" + +# @deprecated +#: nodes.lua +msgid "Rightwards Wooden Tile" +msgstr "向右的木瓦" + +#: ownership.lua +msgid "Sorry, @1 owns that spot." +msgstr "抱歉，那个位置是@1的。" + +#: ownership.lua +msgid "someone" +msgstr "某人" + +#: stairsplus/common.lua +#, lua-format +msgid "%s Microblock" +msgstr "%s 小方块" + +#: stairsplus/common.lua stairsplus/slabs.lua +#, lua-format +msgid "%s Slab" +msgstr "%s 台阶" + +#: stairsplus/common.lua +#, lua-format +msgid "%s Slope" +msgstr "%s 斜坡" + +#: stairsplus/common.lua +#, lua-format +msgid "%s Panel" +msgstr "%s 嵌板" + +#: stairsplus/common.lua +#, lua-format +msgid "%s Stairs" +msgstr "%s 楼梯" diff --git a/locale/zh_TW.po b/locale/zh_TW.po new file mode 100644 index 0000000..b15ca9d --- /dev/null +++ b/locale/zh_TW.po @@ -0,0 +1,288 @@ +# Template translation for More Blocks. +# Copyright © 2011-2020 Hugo Locurcio and contributors +# This file is distributed under the same license as the More Blocks package. +# IFRFSX , 2020. +msgid "" +msgstr "" +"Project-Id-Version: More Blocks\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-07-13 12:37+0200\n" +"PO-Revision-Date: \n" +"Last-Translator: CodeXP \n" +"Language-Team: \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: circular_saw.lua +msgid "Circular Saw" +msgstr "圓鋸" + +#: circular_saw.lua +msgid "" +"Input\n" +"material" +msgstr "" +"輸入\n" +"材料" + +#: circular_saw.lua +msgid "Left-over" +msgstr "剩餘材料" + +#: circular_saw.lua +msgid "Max" +msgstr "最大值" + +#: circular_saw.lua +msgid "" +"Recycle\n" +"output" +msgstr "" +"回收\n" +"輸出物" + +#: circular_saw.lua +msgid "Set" +msgstr "設置" + +#: circular_saw.lua +msgid "owned by @1" +msgstr "屬於@1所有" + +#: circular_saw.lua +msgid "Circular Saw is empty" +msgstr "圓鋸是空的" + +#: circular_saw.lua +msgid "Circular Saw is working on @1" +msgstr "圓鋸正在加工@1" + +#: init.lua +msgid "[moreblocks] loaded." +msgstr "[moreblocks] 已加載" + +#: nodes.lua +msgid "Deprecated" +msgstr "棄用" + +#: nodes.lua +msgid "All-faces Acacia Tree" +msgstr "全切面相思樹木方塊" + +#: nodes.lua +msgid "All-faces Aspen Tree" +msgstr "全切面白楊樹木方塊" + +#: nodes.lua +msgid "All-faces Jungle Tree" +msgstr "全切面叢林樹木方塊" + +#: nodes.lua +msgid "All-faces Pine Tree" +msgstr "全切面松樹木方塊" + +#: nodes.lua +msgid "All-faces Tree" +msgstr "全切面樹木方塊" + +#: nodes.lua +msgid "Cactus Brick" +msgstr "仙人掌磚" + +#: nodes.lua +msgid "Cactus Checker" +msgstr "仙人掌棋盤方塊" + +#: nodes.lua +msgid "Centered Wooden Tile" +msgstr "居中的木瓦" + +#: nodes.lua +msgid "Checker Stone Tile" +msgstr "棋盤石瓦" + +#: nodes.lua +msgid "Circle Stone Bricks" +msgstr "圓石磚" + +#: nodes.lua +msgid "Clean Glass" +msgstr "乾淨的玻璃" + +#: nodes.lua +msgid "Coal Checker" +msgstr "棋盤煤塊" + +#: nodes.lua +msgid "Coal Glass" +msgstr "煤玻璃" + +#: nodes.lua +msgid "Coal Stone" +msgstr "煤炭石" + +#: nodes.lua +msgid "Coal Stone Bricks" +msgstr "煤炭石磚" + +#: nodes.lua +msgid "Compressed Cobblestone" +msgstr "壓縮圓石" + +#: nodes.lua +msgid "Compressed Dirt" +msgstr "壓縮土" + +#: nodes.lua +msgid "Copper Patina Block" +msgstr "銅綠方塊" + +#: nodes.lua +msgid "Empty Shelf" +msgstr "空書架" + +#: nodes.lua +msgid "Full Wooden Tile" +msgstr "全木瓦" + +#: nodes.lua +msgid "Glow Glass" +msgstr "發光玻璃" + +#: nodes.lua +msgid "Iron Checker" +msgstr "棋盤鐵方塊" + +#: nodes.lua +msgid "Iron Glass" +msgstr "鐵玻璃" + +#: nodes.lua +msgid "Iron Stone" +msgstr "鐵石" + +#: nodes.lua +msgid "Iron Stone Bricks" +msgstr "鐵石磚" + +#: nodes.lua +msgid "Plankstone" +msgstr "板石" + +#: nodes.lua +msgid "Rope" +msgstr "繩子" + +#: nodes.lua +msgid "Split Stone Tile" +msgstr "裂石磚" + +#: nodes.lua +msgid "Stone Bricks" +msgstr "石磚" + +#: nodes.lua +msgid "Stone Tile" +msgstr "石瓦" + +#: nodes.lua +msgid "Super Glow Glass" +msgstr "超級發光玻璃" + +#: nodes.lua +msgid "Sweeper" +msgstr "清掃器" + +#: nodes.lua +msgid "Tar" +msgstr "焦油" + +#: nodes.lua +msgid "Trap Desert Stone" +msgstr "陷阱沙漠石" + +#: nodes.lua +msgid "Trap Glass" +msgstr "陷阱玻璃" + +#: nodes.lua +msgid "Trap Glow Glass" +msgstr "陷阱發光玻璃" + +#: nodes.lua +msgid "Trap Obsidian" +msgstr "陷阱黑耀石" + +#: nodes.lua +msgid "Trap Obsidian Glass" +msgstr "陷阱黑耀石玻璃" + +#: nodes.lua +msgid "Trap Sandstone" +msgstr "陷阱沙石" + +#: nodes.lua +msgid "Trap Stone" +msgstr "陷阱石" + +#: nodes.lua +msgid "Trap Super Glow Glass" +msgstr "陷阱超級發光玻璃" + +#: nodes.lua +msgid "Wooden Tile" +msgstr "木瓦" + +#: nodes.lua +msgid "Offset Wooden Tile" +msgstr "膠合木瓦" + +# @deprecated +#: nodes.lua +msgid "Downwards Wooden Tile" +msgstr "向下的木瓦" + +# @deprecated +#: nodes.lua +msgid "Leftwards Wooden Tile" +msgstr "向左的木瓦" + +# @deprecated +#: nodes.lua +msgid "Rightwards Wooden Tile" +msgstr "向右的木瓦" + +#: ownership.lua +msgid "Sorry, @1 owns that spot." +msgstr "抱歉，那個位置是@1的。" + +#: ownership.lua +msgid "someone" +msgstr "某人" + +#: stairsplus/common.lua +#, lua-format +msgid "%s Microblock" +msgstr "%s 小方塊" + +#: stairsplus/common.lua stairsplus/slabs.lua +#, lua-format +msgid "%s Slab" +msgstr "%s 臺階" + +#: stairsplus/common.lua +#, lua-format +msgid "%s Slope" +msgstr "%s 斜坡" + +#: stairsplus/common.lua +#, lua-format +msgid "%s Panel" +msgstr "%s 嵌板" + +#: stairsplus/common.lua +#, lua-format +msgid "%s Stairs" +msgstr "%s 樓梯" diff --git a/mod.conf b/mod.conf index 366893e..011d4a0 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,5 @@ name = moreblocks description = Adds various miscellaneous blocks to the game. depends = default -optional_depends = intllib,stairs,farming,wool +optional_depends = intllib,stairs,farming,wool,basic_materials +min_minetest_version = 5.0.0 diff --git a/nodes.lua b/nodes.lua index ab33375..e255e0a 100644 --- a/nodes.lua +++ b/nodes.lua @@ -175,6 +175,12 @@ local nodes = { is_ground_content = false, sounds = sound_stone, }, + ["desert_cobble_compressed"] = { + description = S("Compressed Desert Cobblestone"), + groups = {cracky = 1}, + is_ground_content = false, + sounds = sound_stone, + }, ["plankstone"] = { description = S("Plankstone"), paramtype2 = "facedir", @@ -188,6 +194,7 @@ local nodes = { description = S("Iron Glass"), drawtype = "glasslike_framed_optional", tiles = {"default_glass.png^[colorize:#DEDEDE", "default_glass_detail.png^[colorize:#DEDEDE"}, + use_texture_alpha = true, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -198,6 +205,7 @@ local nodes = { description = S("Coal Glass"), drawtype = "glasslike_framed_optional", tiles = {"default_glass.png^[colorize:#828282", "default_glass_detail.png^[colorize:#828282"}, + use_texture_alpha = true, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -208,6 +216,7 @@ local nodes = { description = S("Clean Glass"), drawtype = "glasslike_framed_optional", tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"}, + use_texture_alpha = true, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -307,6 +316,7 @@ local nodes = { description = S("Trap Glass"), drawtype = "glasslike_framed_optional", tiles = {"default_glass.png^moreblocks_trap_box_glass.png", "default_glass_detail.png"}, + use_texture_alpha = true, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -319,6 +329,7 @@ local nodes = { description = S("Trap Obsidian Glass"), drawtype = "glasslike_framed_optional", tiles = {"default_obsidian_glass.png^moreblocks_trap_box_glass.png", "default_obsidian_glass_detail.png"}, + use_texture_alpha = true, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -388,6 +399,7 @@ local nodes = { description = S("Glow Glass"), drawtype = "glasslike_framed_optional", tiles = {"default_glass.png^[colorize:#E9CD61", "default_glass_detail.png^[colorize:#E9CD61"}, + use_texture_alpha = true, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -399,6 +411,7 @@ local nodes = { description = S("Trap Glow Glass"), drawtype = "glasslike_framed_optional", tiles = {"default_glass.png^[colorize:#E9CD61^moreblocks_trap_box_glass.png", "default_glass_detail.png^[colorize:#E9CD61"}, + use_texture_alpha = true, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -412,6 +425,7 @@ local nodes = { description = S("Super Glow Glass"), drawtype = "glasslike_framed_optional", tiles = {"default_glass.png^[colorize:#FFFF78", "default_glass_detail.png^[colorize:#FFFF78"}, + use_texture_alpha = true, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -423,6 +437,7 @@ local nodes = { description = S("Trap Super Glow Glass"), drawtype = "glasslike_framed_optional", tiles = {"default_glass.png^[colorize:#FFFF78^moreblocks_trap_box_glass.png", "default_glass_detail.png^[colorize:#FFFF78"}, + use_texture_alpha = true, paramtype = "light", sunlight_propagates = true, is_ground_content = false, diff --git a/stairsplus/common.lua b/stairsplus/common.lua index d42ccfa..de852ca 100644 --- a/stairsplus/common.lua +++ b/stairsplus/common.lua @@ -16,6 +16,7 @@ local descriptions = { } stairsplus.register_single = function(category, alternate, info, modname, subname, recipeitem, fields) + local src_def = minetest.registered_nodes[recipeitem] or {} local desc_base = descriptions[category]:format(fields.description) local def = {} @@ -31,6 +32,9 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam def.drawtype = "nodebox" def.paramtype = "light" def.paramtype2 = def.paramtype2 or "facedir" + if def.use_texture_alpha == nil then + def.use_texture_alpha = src_def.use_texture_alpha + end -- This makes node rotation work on placement def.place_param2 = nil diff --git a/textures/moreblocks_desert_cobble_compressed.png b/textures/moreblocks_desert_cobble_compressed.png new file mode 100644 index 0000000..307b9b8 Binary files /dev/null and b/textures/moreblocks_desert_cobble_compressed.png differ