GuyLiner
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly merge mcl_craftguide

This commit is contained in:
Lizzy Fleckenstein 2021-01-03 15:23:29 +01:00
parent 6b2416b211
commit 1fda78667f
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/HELP/mcl_craftguide/init.lua
View File

@ -1113,15 +1113,11 @@ if progressive_mode then
inv_items = {} inv_items = {}
end end
<<<<<<< HEAD
if not data or not data.inv_items then if not data or not data.inv_items then
return return
end end
meta:set_string("inv_items", serialize(data.inv_items))
=======
meta:set_string("inv_items", serialize(inv_items)) meta:set_string("inv_items", serialize(inv_items))
>>>>>>> 4c2f3f2b7cea5b132d7485b4d54def1fe72b8e46
end end
M.register_on_leaveplayer(function(player) M.register_on_leaveplayer(function(player)