Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ooops

Browse source
This commit is contained in:
Milan 2018-01-17 10:39:25 +01:00
parent 886011937a
commit bc70d2dec7
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mods/fire/init.lua
View file

@ -288,13 +288,8 @@ minetest.register_abm({
-- Enable the following ABMs according to 'enable fire' setting -- Enable the following ABMs according to 'enable fire' setting
<<<<<<< HEAD
local fire_enabled = minetest.setting_getbool("enable_fire")
=======
--[[ --[[
local fire_enabled = minetest.settings:get_bool("enable_fire") local fire_enabled = minetest.settings:get_bool("enable_fire")
>>>>>>> 2e47e09... fire: remove fire abm's, make fire nodes last 20-30 seconds
if fire_enabled == nil then if fire_enabled == nil then
-- New setting not specified, check for old setting. -- New setting not specified, check for old setting.
-- If old setting is also not specified, 'not nil' is true. -- If old setting is also not specified, 'not nil' is true.