1
0
Fork 0

master #1

Merged
WolfySoy merged 1116 commits from VoxeLibre/VoxeLibre:master into PotionEffectTweaks 2024-07-02 11:49:28 +02:00
1 changed files with 3 additions and 2 deletions
Showing only changes of commit a3bbb3694c - Show all commits

View File

@ -351,7 +351,7 @@ local professions = {
leatherworker = { leatherworker = {
name = N("Leatherworker"), name = N("Leatherworker"),
texture = "mobs_mc_villager_leatherworker.png", texture = "mobs_mc_villager_leatherworker.png",
jobsite = "mcl_cauldrons:cauldron", jobsite = "group:cauldron",
trades = { trades = {
{ {
{ { "mcl_mobitems:leather", 9, 12 }, E1 }, { { "mcl_mobitems:leather", 9, 12 }, E1 },
@ -1007,8 +1007,9 @@ end
----- JOBSITE LOGIC ----- JOBSITE LOGIC
local function get_profession_by_jobsite(js) local function get_profession_by_jobsite(js)
local is_cauldron = string.find(js, "mcl_cauldrons:cauldron")
for k,v in pairs(professions) do for k,v in pairs(professions) do
if v.jobsite == js then return k end if v.jobsite == js or (is_cauldron and v.jobsite == "group:cauldron") then return k end
end end
end end