atomdmac
/
MineClone5
forked from MineClone5/MineClone5
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix readme - I don't want my e-mail plastered on the internet...

This commit is contained in:
Brandon 2020-06-17 22:29:34 -04:00
parent 69d93d362d
commit 5db4adb58f
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -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 * [Rootyjr](https://github.com/Rootyjr): Fishing rod and bugfixes
* [aligator](https://github.com/aligator): Improvement of doors * [aligator](https://github.com/aligator): Improvement of doors
* [ryvnf](https://github.com/ryvnf): Explosion mechanics * [ryvnf](https://github.com/ryvnf): Explosion mechanics
<<<<<<< HEAD
* MysticTempest: Bugfixes * MysticTempest: Bugfixes
======= * bzoss <https://github.com/bzoss>: Brewing Stand
* bzoss <brandonzoss@gmail.com>: Brewing Stand
>>>>>>> 56a89405107fd3cd9c913a3284f8c9974aa51f62
* Lots of other people: TO BE WRITTEN (see mod directories for details) * Lots of other people: TO BE WRITTEN (see mod directories for details)
#### Mod credits (summary) #### Mod credits (summary)

4
mods/CORE/mcl_explosions/init.lua
View File

@ -343,11 +343,7 @@ local function trace_explode(pos, strength, raydirs, radius, drop_chance, fire,
minetest.bulk_set_node(airs, {name="air"}) minetest.bulk_set_node(airs, {name="air"})
end end
if #fires > 0 then if #fires > 0 then
<<<<<<< HEAD
minetest.bulk_set_node(fires, {name="mcl_fire:fire"}) minetest.bulk_set_node(fires, {name="mcl_fire:fire"})
=======
minetest.bulk_set_node(fires, {name="mcl_core:fire"})
>>>>>>> 56a89405107fd3cd9c913a3284f8c9974aa51f62
end end
-- Update falling nodes -- Update falling nodes
for a=1, #airs do for a=1, #airs do