Merge branch 'main' into VorTechnix

This commit is contained in:
VorTechnix 2021-07-21 12:38:18 -07:00
commit 40f0e437fb
3 changed files with 26 additions and 6 deletions

View file

@ -35,6 +35,13 @@ The following brushes together can make large-scale terrain sculpting easy:
//brush cubeapply 50 layers dirt_with_grass dirt 3 stone 10 //brush cubeapply 50 layers dirt_with_grass dirt 3 stone 10
``` ```
## Preserve Air During Schematic Load
`//load` only writes non-air blocks in a saved WorldEdit schematic. To get around this the `//allocate` command was created so that users could set the target area to air before the new nodes were written. The following command applies this work flow (replace `<file>` with the name of your schematic before using the command):
```
//multi //allocate <file> //set air //load <file>
```
## En-mass Foliage clearing ## En-mass Foliage clearing
Clearing large amounts of foliage is easy! Clearing large amounts of foliage is easy!

View file

@ -1,6 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e; set -e;
current_branch="$(git rev-parse --abbrev-ref HEAD)";
if [[ "${1}" == "ci" ]] && [[ "${current_branch}" != "main" ]]; then
echo "Skipping build, because we are currently on the branch '${current_branch}', and we only deploy on the 'main' branch.";
fi
# ██████ ██ ██████ ██ ██ ██ ██ ██████ # ██████ ██ ██████ ██ ██ ██ ██ ██████
# ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ # ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
# ██ ██ ██████ ██ ██ ██ ██ ██ ██ # ██ ██ ██████ ██ ██ ██ ██ ██ ██

View file

@ -12,15 +12,22 @@
-- Docs: http://bitop.luajit.org/api.html -- Docs: http://bitop.luajit.org/api.html
-- module: bit -- module: bit
local bit = bit or {}
bit.bits = 32 local bit
bit.powtab = { 1 } if minetest.global_exists("bit") then
bit = bit
else
bit = {}
for b = 1, bit.bits - 1 do bit.bits = 32
bit.powtab[#bit.powtab + 1] = math.pow(2, b) bit.powtab = { 1 }
for b = 1, bit.bits - 1 do
bit.powtab[#bit.powtab + 1] = math.pow(2, b)
end
end end
-- Functions -- Functions
-- bit.band -- bit.band
if not bit.band then if not bit.band then