Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2021-03-25 22:06:02 +01:00
commit f236cd705d
3 changed files with 23 additions and 2 deletions

11
.github/workflows/luacheck.yml vendored Normal file
View File

@ -0,0 +1,11 @@
on: [push, pull_request]
name: luacheck
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: lint
uses: Roang-zero1/factorio-mod-luacheck@master
with:
luacheckrc_url: ""

View File

@ -1,5 +1,5 @@
read_globals = { read_globals = {
"dump", "vector", "minetest", "dump", "vector",
"table", "math", "PseudoRandom", "VoxelArea", "table", "math", "PseudoRandom", "VoxelArea",
"stairs", "stairsplus", "skins", "treecapitator", "stairs", "stairsplus", "skins", "treecapitator",
default = { default = {
@ -10,6 +10,15 @@ read_globals = {
} }
}, },
other_fields = true other_fields = true
},
minetest = {
fields = {
registered_nodes = {
read_only = false,
other_fields = true
}
},
other_fields = true
} }
} }
globals = {"snow"} globals = {"snow"}

View File

@ -377,7 +377,8 @@ nodedef = {
-- by player position. ~ LazyJ -- by player position. ~ LazyJ
-- I made this a little harder to dig than snow blocks because -- I made this a little harder to dig than snow blocks because
-- I imagine snow brick as being much more dense and solid than fluffy snow. ~ LazyJ -- I imagine snow brick as being much more dense and solid than fluffy snow. ~ LazyJ
groups = {cracky=2, crumbly=2, choppy=2, oddly_breakable_by_hand=2, melts=1, icemaker=1, cooks_into_ice=1, cools_lava = 1, snowy = 1}, groups = {cracky=2, crumbly=2, choppy=2, oddly_breakable_by_hand=2, melts=1,
icemaker=1, cooks_into_ice=1, cools_lava = 1, snowy = 1},
--Let's use the new snow sounds instead of the old grass sounds. ~ LazyJ --Let's use the new snow sounds instead of the old grass sounds. ~ LazyJ
sounds = default.node_sound_snow_defaults(), sounds = default.node_sound_snow_defaults(),
-- The "on_construct" part below, thinking in terms of layers, -- The "on_construct" part below, thinking in terms of layers,