mcl_beehives.ru.tr

ru tr
Merge pull request 'Allow villager to claim filled cauldrons.' (#3856 ) from Codiac/MineClone2:cauldron_job_site_fix into master
2023-08-07 07:14:46 +00:00 · 2023-08-05 16:44:27 +00:00 · 2023-08-05 15:09:53 +10:00 · 2023-08-05 15:09:53 +10:00
2 changed files with 15 additions and 2 deletions
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@ -351,7 +351,7 @@ local professions = {
 	leatherworker = {
 		name = N("Leatherworker"),
 		texture = "mobs_mc_villager_leatherworker.png",
-		jobsite = "mcl_cauldrons:cauldron",
+		jobsite = "group:cauldron",
 		trades = {
 			{
 			{ { "mcl_mobitems:leather", 9, 12 }, E1 },
@ -1008,7 +1008,15 @@ end
 ----- JOBSITE LOGIC
 local function get_profession_by_jobsite(js)
 	for k,v in pairs(professions) do
-		if v.jobsite == js then return k end
+		if v.jobsite == js then
+			return k
+		-- Catch Nitwit doesn't have a jobsite
+		elseif v.jobsite and v.jobsite:find("^group:") then
+			local group = v.jobsite:gsub("^group:", "")
+			if minetest.get_item_group(js, group) > 0 then
+				return k
+			end
+		end
 	end
 end

--- a/mods/ITEMS/mcl_beehives/locale/mcl_beehives.ru.tr
+++ b/mods/ITEMS/mcl_beehives/locale/mcl_beehives.ru.tr
@ -0,0 +1,5 @@
+# textdomain: mcl_beehives
+Beehive=Улей 
+Artificial bee nest.=Искусственное пчелиное гнездо.
+Bee Nest=Пчелиное гнездо 
+A naturally generating block that houses bees and a tasty treat...if you can get it.=Блок естественной выработки, в котором живут пчелы, и вкусное угощение... если вы сможете его достать.
Author	SHA1	Message	Date
ADLON	a5980538ef	mcl_beehives.ru.tr ru tr	2023-08-07 07:14:46 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟	aa3b3421d5	Merge pull request 'Allow villager to claim filled cauldrons.' (#3856 ) from Codiac/MineClone2:cauldron_job_site_fix into master Reviewed-on: MineClone2/MineClone2#3856 Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>	2023-08-05 16:44:27 +00:00
codiac	4f2cb955b8	Use minetest.get_item_group for more flexibility	2023-08-05 15:09:53 +10:00
codiac	a3bbb3694c	Allow villager to claim filled cauldrons. Fixes #3733	2023-08-05 15:09:53 +10:00