Skip to content
Snippets Groups Projects
Commit bc70d2de authored by Milan's avatar Milan
Browse files

ooops

parent 88601193
Branches master
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 5 deletions
mods/fire/init.lua
+ 0
− 5
View file @ bc70d2de
...@@ -288,13 +288,8 @@ minetest.register_abm({ ...@@ -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.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment