diff --git a/mods/farming/README.md b/mods/farming/README.md index 353d6f93..7afd0e7d 100644 --- a/mods/farming/README.md +++ b/mods/farming/README.md @@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t ### Changelog: -- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy +- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy, minmax light setting options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton to savanna - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates - 1.43 - Scythe works on use instead of right-click, added seed=1 groups to actual seeds and seed=2 group for plantable food items. diff --git a/mods/farming/crops/barley.lua b/mods/farming/crops/barley.lua index 69b30562..65d1f03e 100644 --- a/mods/farming/crops/barley.lua +++ b/mods/farming/crops/barley.lua @@ -108,8 +108,8 @@ minetest.register_node("farming:barley_7", table.copy(def)) farming.registered_plants["farming:barley"] = { crop = "farming:barley", seed = "farming:seed_barley", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 7 } diff --git a/mods/farming/crops/beans.lua b/mods/farming/crops/beans.lua index b469d085..38d8fa94 100644 --- a/mods/farming/crops/beans.lua +++ b/mods/farming/crops/beans.lua @@ -226,8 +226,8 @@ minetest.register_node("farming:beanpole_5", table.copy(def)) farming.registered_plants["farming:beans"] = { crop = "farming:beanpole", seed = "farming:beans", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/mods/farming/crops/beetroot.lua b/mods/farming/crops/beetroot.lua index f20cfead..ef57986a 100644 --- a/mods/farming/crops/beetroot.lua +++ b/mods/farming/crops/beetroot.lua @@ -86,7 +86,7 @@ minetest.register_node("farming:beetroot_5", table.copy(def)) farming.registered_plants["farming:beetroot"] = { crop = "farming:beetroot", seed = "farming:beetroot", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/mods/farming/crops/blueberry.lua b/mods/farming/crops/blueberry.lua index 38053ad4..e8d83c3a 100644 --- a/mods/farming/crops/blueberry.lua +++ b/mods/farming/crops/blueberry.lua @@ -88,7 +88,7 @@ minetest.register_node("farming:blueberry_4", table.copy(def)) farming.registered_plants["farming:blueberries"] = { crop = "farming:blueberry", seed = "farming:blueberries", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/mods/farming/crops/cabbage.lua b/mods/farming/crops/cabbage.lua index 4a3c2e23..4e75d636 100644 --- a/mods/farming/crops/cabbage.lua +++ b/mods/farming/crops/cabbage.lua @@ -63,7 +63,7 @@ minetest.register_node("farming:cabbage_6", table.copy(def)) farming.registered_plants["farming:cabbage"] = { crop = "farming:cabbage", seed = "farming:cabbage", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 6 } diff --git a/mods/farming/crops/carrot.lua b/mods/farming/crops/carrot.lua index f19338c8..8be1f4eb 100644 --- a/mods/farming/crops/carrot.lua +++ b/mods/farming/crops/carrot.lua @@ -118,7 +118,7 @@ minetest.register_node("farming:carrot_8", table.copy(def)) farming.registered_plants["farming:carrot"] = { crop = "farming:carrot", seed = "farming:carrot", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/crops/chili.lua b/mods/farming/crops/chili.lua index 867c9455..43345566 100644 --- a/mods/farming/crops/chili.lua +++ b/mods/farming/crops/chili.lua @@ -95,7 +95,7 @@ minetest.register_node("farming:chili_8", table.copy(def)) farming.registered_plants["farming:chili_pepper"] = { crop = "farming:chili", seed = "farming:chili_pepper", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/crops/cocoa.lua b/mods/farming/crops/cocoa.lua index 9e8a4041..72e37d04 100644 --- a/mods/farming/crops/cocoa.lua +++ b/mods/farming/crops/cocoa.lua @@ -194,8 +194,8 @@ minetest.register_node("farming:cocoa_4", table.copy(def)) farming.registered_plants["farming:cocoa_beans"] = { crop = "farming:cocoa", seed = "farming:cocoa_beans", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/mods/farming/crops/coffee.lua b/mods/farming/crops/coffee.lua index f234573b..f64369c8 100644 --- a/mods/farming/crops/coffee.lua +++ b/mods/farming/crops/coffee.lua @@ -106,7 +106,7 @@ minetest.register_node("farming:coffee_5", table.copy(def)) farming.registered_plants["farming:coffee"] = { crop = "farming:coffee", seed = "farming:coffee_beans", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/mods/farming/crops/corn.lua b/mods/farming/crops/corn.lua index 4835281e..0999fb99 100644 --- a/mods/farming/crops/corn.lua +++ b/mods/farming/crops/corn.lua @@ -153,7 +153,7 @@ minetest.register_node("farming:corn_8", table.copy(def)) farming.registered_plants["farming:corn"] = { crop = "farming:corn", seed = "farming:corn", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/crops/cotton.lua b/mods/farming/crops/cotton.lua index 067b444b..6ea2e6fe 100644 --- a/mods/farming/crops/cotton.lua +++ b/mods/farming/crops/cotton.lua @@ -172,8 +172,8 @@ minetest.register_node("farming:cotton_8", table.copy(def)) farming.registered_plants["farming:cotton"] = { crop = "farming:cotton", seed = "farming:seed_cotton", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/crops/cucumber.lua b/mods/farming/crops/cucumber.lua index fc15e479..c5e70def 100644 --- a/mods/farming/crops/cucumber.lua +++ b/mods/farming/crops/cucumber.lua @@ -59,7 +59,7 @@ minetest.register_node("farming:cucumber_4", table.copy(def)) farming.registered_plants["farming:cucumber"] = { crop = "farming:cucumber", seed = "farming:cucumber", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/mods/farming/crops/garlic.lua b/mods/farming/crops/garlic.lua index 7fe75655..162bacec 100644 --- a/mods/farming/crops/garlic.lua +++ b/mods/farming/crops/garlic.lua @@ -129,7 +129,7 @@ minetest.register_node("farming:garlic_5", table.copy(def)) farming.registered_plants["farming:garlic"] = { crop = "farming:garlic", seed = "farming:garlic_clove", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/mods/farming/crops/grapes.lua b/mods/farming/crops/grapes.lua index 5d13dc65..8c5e4586 100644 --- a/mods/farming/crops/grapes.lua +++ b/mods/farming/crops/grapes.lua @@ -233,8 +233,8 @@ minetest.register_node("farming:grapes_8", table.copy(def)) farming.registered_plants["farming:grapes"] = { crop = "farming:grapes", seed = "farming:grapes", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/crops/hemp.lua b/mods/farming/crops/hemp.lua index 03ed4d2e..f8dfd0b5 100644 --- a/mods/farming/crops/hemp.lua +++ b/mods/farming/crops/hemp.lua @@ -256,7 +256,7 @@ minetest.register_node("farming:hemp_8", table.copy(def)) farming.registered_plants["farming:hemp"] = { crop = "farming:hemp", seed = "farming:seed_hemp", - minlight = 13, - maxlight = 15, + mminlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/crops/melon.lua b/mods/farming/crops/melon.lua index 6495a138..0549dd35 100644 --- a/mods/farming/crops/melon.lua +++ b/mods/farming/crops/melon.lua @@ -88,7 +88,7 @@ minetest.register_node("farming:melon_8", table.copy(def)) farming.registered_plants["farming:melon"] = { crop = "farming:melon", seed = "farming:melon_slice", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/crops/mint.lua b/mods/farming/crops/mint.lua index ae0e6707..5bc40215 100644 --- a/mods/farming/crops/mint.lua +++ b/mods/farming/crops/mint.lua @@ -101,7 +101,7 @@ minetest.register_node("farming:mint_4", table.copy(def)) farming.registered_plants["farming:mint"] = { crop = "farming:mint", seed = "farming:seed_mint", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/mods/farming/crops/onion.lua b/mods/farming/crops/onion.lua index 30c9bc37..2a8c63f3 100644 --- a/mods/farming/crops/onion.lua +++ b/mods/farming/crops/onion.lua @@ -90,7 +90,7 @@ minetest.register_node("farming:onion_5", table.copy(def)) farming.registered_plants["farming:onion"] = { crop = "farming:onion", seed = "farming:onion", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/mods/farming/crops/peas.lua b/mods/farming/crops/peas.lua index 0c8e40c9..7c6a83df 100644 --- a/mods/farming/crops/peas.lua +++ b/mods/farming/crops/peas.lua @@ -91,7 +91,7 @@ minetest.register_node("farming:pea_5", table.copy(def)) farming.registered_plants["farming:pea_pod"] = { crop = "farming:pea", seed = "farming:pea_pod", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/mods/farming/crops/pepper.lua b/mods/farming/crops/pepper.lua index 4d5baf83..848c2ae0 100644 --- a/mods/farming/crops/pepper.lua +++ b/mods/farming/crops/pepper.lua @@ -109,7 +109,7 @@ minetest.register_node("farming:pepper_5", table.copy(def)) farming.registered_plants["farming:pepper"] = { crop = "farming:pepper", seed = "farming:peppercorn", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 5 } diff --git a/mods/farming/crops/pineapple.lua b/mods/farming/crops/pineapple.lua index f57ccf0f..839a627a 100644 --- a/mods/farming/crops/pineapple.lua +++ b/mods/farming/crops/pineapple.lua @@ -135,7 +135,7 @@ minetest.register_node("farming:pineapple_8", table.copy(def)) farming.registered_plants["farming:pineapple"] = { crop = "farming:pineapple", seed = "farming:pineapple_top", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/crops/potato.lua b/mods/farming/crops/potato.lua index 8c087d0c..a55ab298 100644 --- a/mods/farming/crops/potato.lua +++ b/mods/farming/crops/potato.lua @@ -106,7 +106,7 @@ minetest.register_node("farming:potato_4", table.copy(def)) farming.registered_plants["farming:potato"] = { crop = "farming:potato", seed = "farming:potato", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/mods/farming/crops/pumpkin.lua b/mods/farming/crops/pumpkin.lua index 1b0b8c45..5e29c015 100644 --- a/mods/farming/crops/pumpkin.lua +++ b/mods/farming/crops/pumpkin.lua @@ -200,7 +200,7 @@ minetest.register_alias("farming:pumpkin", "farming:pumpkin_8") farming.registered_plants["farming:pumpkin"] = { crop = "farming:pumpkin", seed = "farming:pumpkin_slice", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/crops/raspberry.lua b/mods/farming/crops/raspberry.lua index 0914aa40..df1d3d94 100644 --- a/mods/farming/crops/raspberry.lua +++ b/mods/farming/crops/raspberry.lua @@ -74,7 +74,7 @@ minetest.register_node("farming:raspberry_4", table.copy(def)) farming.registered_plants["farming:raspberries"] = { crop = "farming:raspberry", seed = "farming:raspberries", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 4 } diff --git a/mods/farming/crops/rhubarb.lua b/mods/farming/crops/rhubarb.lua index bd44a713..073cc18f 100644 --- a/mods/farming/crops/rhubarb.lua +++ b/mods/farming/crops/rhubarb.lua @@ -71,7 +71,7 @@ minetest.register_node("farming:rhubarb_3", table.copy(def)) farming.registered_plants["farming:rhubarb"] = { crop = "farming:rhubarb", seed = "farming:rhubarb", - minlight = 13, - maxlight = 15, + minlight = 10, + maxlight = 12, steps = 3 } diff --git a/mods/farming/crops/tomato.lua b/mods/farming/crops/tomato.lua index 79058282..47879b64 100644 --- a/mods/farming/crops/tomato.lua +++ b/mods/farming/crops/tomato.lua @@ -83,7 +83,7 @@ minetest.register_node("farming:tomato_8", table.copy(def)) farming.registered_plants["farming:tomato"] = { crop = "farming:tomato", seed = "farming:tomato", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/crops/wheat.lua b/mods/farming/crops/wheat.lua index 7a8f19b9..e21d7f67 100644 --- a/mods/farming/crops/wheat.lua +++ b/mods/farming/crops/wheat.lua @@ -234,8 +234,8 @@ minetest.register_node("farming:wheat_8", table.copy(def)) farming.registered_plants["farming:wheat"] = { crop = "farming:wheat", seed = "farming:seed_wheat", - minlight = 13, - maxlight = 15, + minlight = farming.min_light, + maxlight = farming.max_light, steps = 8 } diff --git a/mods/farming/farming.conf_example b/mods/farming/farming.conf_example index 68a7bcbf..e5837b28 100644 --- a/mods/farming/farming.conf_example +++ b/mods/farming/farming.conf_example @@ -35,3 +35,7 @@ farming.grains = true -- true or false only -- default rarety of crops on map (higher number = more crops) farming.rarety = 0.002 + +-- default minimum and maximum light levels crops need to grow +farming.min_light = 12 +farming.max_light = 15 diff --git a/mods/farming/init.lua b/mods/farming/init.lua index fd2aa21f..04ee74f7 100644 --- a/mods/farming/init.lua +++ b/mods/farming/init.lua @@ -7,13 +7,15 @@ farming = { mod = "redo", - version = "20200702", + version = "20201209", path = minetest.get_modpath("farming"), select = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5} }, - registered_plants = {} + registered_plants = {}, + min_light = 12, + max_light = 15 } @@ -332,9 +334,8 @@ function farming.plant_growth_timer(pos, elapsed, node_name) return true end - local MIN_LIGHT = minetest.registered_nodes[node_name].minlight or 12 - local MAX_LIGHT = minetest.registered_nodes[node_name].maxlight or 15 - --print ("---", MIN_LIGHT, MAX_LIGHT) + local MIN_LIGHT = minetest.registered_nodes[node_name].minlight or farming.min_light + local MAX_LIGHT = minetest.registered_nodes[node_name].maxlight or farming.max_light if max_growth == 1 or lambda < 2.0 then diff --git a/mods/protector/locale/protector.ru.tr b/mods/protector/locale/protector.ru.tr index 1784d6d0..fc6068e9 100644 --- a/mods/protector/locale/protector.ru.tr +++ b/mods/protector/locale/protector.ru.tr @@ -8,48 +8,48 @@ Remove Protectors around players (separate names with spaces)=Удалить з Replace Protector Owner with name provided=Заменить владельца защиты новым владельцем =<имя владельца> <имя нового владельца> Replacing Protector name '@1' with '@2'=Заменяется владелец защиты с '@1' на '@2' -Show protected areas of your nearby protectors=Показать защищенные территории с ближней защитой -Protector Names to remove: @1=Имена защит, подлежащих удалению: @1 -Name List Reset=Сброс списка имен +Show protected areas of your nearby protectors=Показать ближайшие защищённые территории +Protector Names to remove: @1=Имена, подлежащие удалению: @1 +Name List Reset=Очистить список имён ### doors_chest.lua ### -Protected Wooden Door=Защищенная яблоневая дверь -Protected Steel Door=Защищенная стальная дверь -Protected Trapdoor=Защищенный яблоневый люк -Protected Steel Trapdoor=Защищенный стальной люк -Protected Chest=Защищенный сундук +Protected Wooden Door=Защищённая яблоневая дверь +Protected Steel Door=Защищённая стальная дверь +Protected Trapdoor=Защищённый яблоневый люк +Protected Steel Trapdoor=Защищённый стальной люк +Protected Chest=Защищённый сундук To Chest=В сундук To Inventory=В инвентрарь -Protected Chest (@1)=Защищенный сундук (@1) +Protected Chest (@1)=Защищённый сундук (@1) ### init.lua ### -- Protector interface --=-- Настройка защиты -- -PUNCH node to show protected area=СТУКНУТЬ узел для подсведки защищенной территории -USE for area check=ЛКМ для проверки защищенной территории +PUNCH node to show protected area=СТУКНУТЬ узел для подсветки защищённой территории +USE for area check=ЛКМ для проверки защищённой территории Members:=Участники: Close=Закрыть Protection located at: @1=Защита находится на координатах @1 Members: @1.=Участники: @1. This area is not protected.=Территория свободна. -You can build here.=Здесь можно ставить блоки." -Overlaps into above players protected area=Защитный блок не может быть установлен: пересечение с областями, защищенными другими игроками +You can build here.=Здесь можно ставить блоки. +Overlaps into above players protected area=Защитный блок не может быть установлен: пересечение с областями, защищёнными другими игроками Protection Block=Защитный блок Protection (owned by @1)=Защита игрока @1 Protection Logo=Защитный знак -[MOD] Protector Redo loaded=[MOD] Модификация \"Переделанная Защита\" загружена -Spawn @1 has been protected up to a @2 block radius.=Спаун @1 защищен в радиусе @2 блока. +[MOD] Protector Redo loaded=[МОД] Protector Redo загружен +Spawn @1 has been protected up to a @2 block radius.=Спаун @1 защищён в радиусе @2 блока. This area is owned by @1=Эта территория пренадлежит @1 ### pvp.lua ### [Protector] on_punchplayer called with nil objects=[Защита] on_punchplayer вызвана с нулевыми объектами -[Protector] pvp_protect not active, update your version of Minetest=[Защита] pvp_protect не активен, обновите версию Minetest -[Protector] pvp_protect is disabled=[Защита] pvp_protect отключен +[Protector] pvp_protect not active, update your version of Minetest=[Защита] pvp_protect неактивен, обновите версию Minetest +[Protector] pvp_protect is disabled=[Защита] pvp_protect отключён ### hud.lua ### Owner: @1=Владелец: @1 ### tool.lua ### -Protector Placer Tool (stand near protector, face direction and use)=Инструмент установки защиты (станьте рядом с защитой, повернитесь в нужное направление и используйте) +Protector Placer Tool (stand near protector, face direction and use)=Инструмент установки защиты (встаньте рядом с защитой, повернитесь в нужном направлении и используйте) Protector already in place!=Защита уже установлена! No protectors available to place!=У вас нет защитных блоков в инвентаре! Protector placed at @1=Защита находится на координатах @1 diff --git a/mods/skinsdb/meta/character_1933.txt b/mods/skinsdb/meta/character_1933.txt new file mode 100644 index 00000000..80037d59 --- /dev/null +++ b/mods/skinsdb/meta/character_1933.txt @@ -0,0 +1,3 @@ +ElCeejus, Father of Dragons +ElCeejo +CC BY-SA 3.0 diff --git a/mods/skinsdb/textures/character_1933.png b/mods/skinsdb/textures/character_1933.png new file mode 100644 index 00000000..3eeb9ee1 Binary files /dev/null and b/mods/skinsdb/textures/character_1933.png differ