diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e8f4bda --- /dev/null +++ b/.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 . diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 211285a..0000000 --- a/.travis.yml +++ /dev/null @@ -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 . diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e9a794..98fcfbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,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 diff --git a/README.md b/README.md index 26020b7..38a1dd4 100644 --- a/README.md +++ b/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. diff --git a/nodes.lua b/nodes.lua index 4bb8c3c..e255e0a 100644 --- a/nodes.lua +++ b/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, 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