From 1fda78667f7c17e29b9420c702d398e1f693699a Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sun, 3 Jan 2021 15:23:29 +0100 Subject: [PATCH] Properly merge mcl_craftguide --- mods/HELP/mcl_craftguide/init.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mods/HELP/mcl_craftguide/init.lua b/mods/HELP/mcl_craftguide/init.lua index 18989529f6..e56b5071db 100644 --- a/mods/HELP/mcl_craftguide/init.lua +++ b/mods/HELP/mcl_craftguide/init.lua @@ -1113,15 +1113,11 @@ if progressive_mode then inv_items = {} end -<<<<<<< HEAD if not data or not data.inv_items then return end - meta:set_string("inv_items", serialize(data.inv_items)) -======= meta:set_string("inv_items", serialize(inv_items)) ->>>>>>> 4c2f3f2b7cea5b132d7485b4d54def1fe72b8e46 end M.register_on_leaveplayer(function(player)