From 5db4adb58f82e15df6c3446fc1ba473540eda8aa Mon Sep 17 00:00:00 2001 From: Brandon Date: Wed, 17 Jun 2020 22:29:34 -0400 Subject: [PATCH] fix readme - I don't want my e-mail plastered on the internet... --- README.md | 5 +---- mods/CORE/mcl_explosions/init.lua | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index f56e131ba..b41282696 100644 --- a/README.md +++ b/README.md @@ -201,11 +201,8 @@ There are so many people to list (sorry). Check out the respective mod directori * [Rootyjr](https://github.com/Rootyjr): Fishing rod and bugfixes * [aligator](https://github.com/aligator): Improvement of doors * [ryvnf](https://github.com/ryvnf): Explosion mechanics -<<<<<<< HEAD * MysticTempest: Bugfixes -======= -* bzoss : Brewing Stand ->>>>>>> 56a89405107fd3cd9c913a3284f8c9974aa51f62 +* bzoss : Brewing Stand * Lots of other people: TO BE WRITTEN (see mod directories for details) #### Mod credits (summary) diff --git a/mods/CORE/mcl_explosions/init.lua b/mods/CORE/mcl_explosions/init.lua index 47e4e89c4..2c7e69cdc 100644 --- a/mods/CORE/mcl_explosions/init.lua +++ b/mods/CORE/mcl_explosions/init.lua @@ -343,11 +343,7 @@ local function trace_explode(pos, strength, raydirs, radius, drop_chance, fire, minetest.bulk_set_node(airs, {name="air"}) end if #fires > 0 then -<<<<<<< HEAD minetest.bulk_set_node(fires, {name="mcl_fire:fire"}) -======= - minetest.bulk_set_node(fires, {name="mcl_core:fire"}) ->>>>>>> 56a89405107fd3cd9c913a3284f8c9974aa51f62 end -- Update falling nodes for a=1, #airs do