epCode
/
MineClone2
forked from VoxeLibre/VoxeLibre
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

master #5

Merged
epCode merged 255 commits from VoxeLibre/VoxeLibre:master into master 2021-02-02 23:20:01 +01:00
Conversation 0 Commits 255 Files Changed 165 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7d4688b70c - Show all commits

2
mods/ITEMS/mcl_enchanting/engine.lua
View File

@ -148,7 +148,6 @@ function mcl_enchanting.combine(itemstack, combine_with)
local combine_name = combine_with:get_name() local combine_name = combine_with:get_name()
local enchanted_itemname = mcl_enchanting.get_enchanted_itemstring(itemname) local enchanted_itemname = mcl_enchanting.get_enchanted_itemstring(itemname)
if enchanted_itemname ~= mcl_enchanting.get_enchanted_itemstring(combine_name) and not mcl_enchanting.is_book(combine_name) then if enchanted_itemname ~= mcl_enchanting.get_enchanted_itemstring(combine_name) and not mcl_enchanting.is_book(combine_name) then
print(combine_name, mcl_enchanting.is_book(combine_name))
return false return false
end end
local enchantments = mcl_enchanting.get_enchantments(itemstack) local enchantments = mcl_enchanting.get_enchantments(itemstack)
@ -221,6 +220,7 @@ function mcl_enchanting.initialize()
new_def.wield_image = new_def.wield_image .. mcl_enchanting.overlay new_def.wield_image = new_def.wield_image .. mcl_enchanting.overlay
end end
new_def.groups.not_in_creative_inventory = 1 new_def.groups.not_in_creative_inventory = 1
new_def.groups.not_in_craft_guide = 1
new_def.groups.enchanted = 1 new_def.groups.enchanted = 1
new_def.texture = itemdef.texture or itemname:gsub("%:", "_") new_def.texture = itemdef.texture or itemname:gsub("%:", "_")
new_def._mcl_enchanting_enchanted_tool = new_name new_def._mcl_enchanting_enchanted_tool = new_name