Merge remote-tracking branch 'upstream/master'

Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>

.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: build
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-python@master
+
+      - run: |
+         sudo apt-get update -qq
+         sudo apt-get install -qqq luarocks
+      - name: Install pre-commit
+        run: pip3 install pre-commit
+
+      - name: Install LuaCheck
+        run: luarocks install --local luacheck
+
+      - name: Run LuaCheck using pre-commit
+        run: |
+         pre-commit run --all-files
+         $HOME/.luarocks/bin/luacheck .

.pre-commit-config.yaml

@@ -1,7 +1,8 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v3.3.0
     hooks:
+      - id: fix-byte-order-marker
       - id: end-of-file-fixer
       - id: trailing-whitespace
 

.travis.yml

@@ -1,15 +0,0 @@
-dist: bionic
-language: python
-
-python:
-  - 3.7.1
-
-install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qqq luarocks
-  - pip3 install pre-commit
-  - luarocks install --local luacheck
-
-script:
-  - pre-commit run --all-files
-  - $HOME/.luarocks/bin/luacheck .

CHANGELOG.md

@@ -12,6 +12,11 @@ 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.
 
+### Changed
+
+- Switch to GitHub Actions.
+  - Benefits include faster responses.
+
 ### Added
 
 - Compressed desert cobblestone.

README.md

@@ -1,4 +1,4 @@
-# More Blocks
+# More Blocks [![Build status](https://github.com/minetest-mods/moreblocks/workflows/build/badge.svg)](https://github.com/minetest-mods/moreblocks/actions)
 
 More Blocks for [Minetest](https://www.minetest.net/), a free and open source infinite
 world block sandbox game.

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 <IFRFSX@protonmail.com>, 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 <codexp@gmx.net>\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 楼梯"

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 <IFRFSX@protonmail.com>, 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 <codexp@gmx.net>\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 樓梯"

nodes.lua

@@ -194,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,
@@ -204,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,
@@ -214,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,
@@ -313,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,
@@ -325,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,
@@ -394,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,
@@ -405,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,
@@ -418,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,
@@ -429,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,

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

stairsplus/registrations.lua

@@ -61,6 +61,8 @@ for _, name in pairs(default_nodes) do
 	-- Stone and desert_stone drop cobble and desert_cobble respectively.
 	if type(ndef.drop) == "string" then
 		ndef.drop = ndef.drop:gsub(".+:", "")
+	elseif name == "desert_stone" then
+		ndef.drop = ndef.drop.items[1].items[1]:gsub(".+:", "")
 	end
 
 	-- Use the primary tile for all sides of cut glasslike nodes and disregard paramtype2.