diff --git a/README.md b/README.md index 18cf03cd..dc770ae9 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [throwing][] ([WTFPL][lic.wtfpl]) -- version: [90bcf43 Git][ver.throwing] *2013-09-27* ([patched][patch.throwing]) * [xtraarmor][] ([CC BY-SA][lic.ccbysa3.0]) -- version: 0.3 * farming/ - * [crops][] ([LGPL / CC BY-SA / CC BY / CC0][lic.crops]) -- version: [1][ver.crops] *2017-09-30* + * [crops][] ([LGPL / CC BY-SA / CC BY / CC0][lic.crops]) -- version: [1][ver.crops] *2017-09-30* ([patched][patch.crops]) * [farming_plus][] ([WTFPL][lic.farming_plus]) -- version: [7e0d976 Git][ver.farming_plus] *2014-07-31* ([patched][patch.farming_plus]) * furniture/ * [jukebox][] ([WTFPL / CC0][lic.jukebox]) -- version: [d1cd9e1 Git][ver.jukebox] *2017-09-01* @@ -506,6 +506,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [patch.castle_weapons]: https://github.com/AntumMT/mod-castle_weapons/tree/669db13 [patch.christmas]: https://github.com/AntumMT/mod-christmas/tree/7ffdc67 [patch.craftguide]: https://github.com/AntumMT/mod-craftguide/tree/3930813 +[patch.crops]: https://github.com/AntumMT/mod-crops/tree/a1cce06 [patch.drawers]: https://github.com/AntumMT/mod-drawers/tree/a77f809 [patch.enchanting]: https://github.com/AntumMT/mod-enchanting/tree/7a01f2f [patch.ethereal]: https://github.com/AntumMT/mod-ethereal/tree/e3ba6b1 diff --git a/mods/farming/crops/corn.lua b/mods/farming/crops/corn.lua index 15dc886b..f2c4b82b 100644 --- a/mods/farming/crops/corn.lua +++ b/mods/farming/crops/corn.lua @@ -22,7 +22,7 @@ minetest.register_node("crops:corn", { paramtype2 = "meshoptions", waving = 1, sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = true, paramtype = "light", node_placement_prediction = "crops:corn_base_seed", @@ -73,7 +73,7 @@ minetest.register_node("crops:corn_base_seed", { paramtype2 = "meshoptions", waving = 1, tiles = { "crops_corn_base_seed.png" }, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, sunlight_propagates = true, paramtype = "light", @@ -106,7 +106,7 @@ minetest.register_node("crops:corn_base_1", { paramtype2 = "meshoptions", tiles = { "crops_corn_base_1.png" }, waving = 1, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, sunlight_propagates = true, paramtype = "light", @@ -140,7 +140,7 @@ minetest.register_node("crops:corn_base_2", { drawtype = "plantlike", paramtype2 = "meshoptions", tiles = { "crops_corn_base_2.png" }, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, sunlight_propagates = true, paramtype = "light", @@ -178,7 +178,7 @@ minetest.register_node("crops:corn_base_3", { drawtype = "plantlike", paramtype2 = "meshoptions", tiles = { "crops_corn_base_3.png" }, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, sunlight_propagates = true, paramtype = "light", @@ -200,7 +200,7 @@ minetest.register_node("crops:corn_top_1", { paramtype2 = "meshoptions", tiles = { "crops_corn_base_1.png" }, waving = 1, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, sunlight_propagates = true, paramtype = "light", @@ -236,7 +236,7 @@ minetest.register_node("crops:corn_top_2", { paramtype2 = "meshoptions", tiles = { "crops_corn_top_1.png" }, waving = 1, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, sunlight_propagates = true, paramtype = "light", @@ -275,7 +275,7 @@ minetest.register_node("crops:corn_top_3", { paramtype2 = "meshoptions", tiles = { "crops_corn_top_2.png" }, waving = 1, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, sunlight_propagates = true, paramtype = "light", @@ -305,7 +305,7 @@ minetest.register_node("crops:corn_top_4", { paramtype2 = "meshoptions", tiles = { "crops_corn_top_3.png" }, waving = 1, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, sunlight_propagates = true, paramtype = "light", diff --git a/mods/farming/crops/melon.lua b/mods/farming/crops/melon.lua index 696b108d..daf3012f 100644 --- a/mods/farming/crops/melon.lua +++ b/mods/farming/crops/melon.lua @@ -28,7 +28,7 @@ minetest.register_node("crops:melon_seed", { drawtype = "plantlike", waving = 1, sunlight_propagates = false, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", node_placement_prediction = "crops:melon_plant_1", @@ -54,7 +54,7 @@ minetest.register_node("crops:melon_plant_" .. stage , { drawtype = "plantlike", waving = 1, sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", groups = { snappy=3, flammable=3, flora=1, attached_node=1, not_in_creative_inventory=1 }, @@ -75,7 +75,7 @@ minetest.register_node("crops:melon_plant_5_attached", { drawtype = "mesh", paramtype2 = "facedir", sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", groups = { snappy=3, flammable=3, flora=1, attached_node=1, not_in_creative_inventory=1 }, @@ -107,7 +107,7 @@ minetest.register_node("crops:melon", { "crops_melon.png", }, sunlight_propagates = false, - use_texture_alpha = false, + use_texture_alpha = "opaque", walkable = true, groups = { snappy=3, flammable=3, oddly_breakable_by_hand=2 }, paramtype2 = "facedir", diff --git a/mods/farming/crops/polebean.lua b/mods/farming/crops/polebean.lua index afe8fb11..e227c173 100644 --- a/mods/farming/crops/polebean.lua +++ b/mods/farming/crops/polebean.lua @@ -126,7 +126,7 @@ minetest.register_node("crops:beanpole_base", { description = "", drawtype = "plantlike", tiles = { "crops_beanpole_base.png" }, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = true, sunlight_propagates = true, paramtype = "light", @@ -140,7 +140,7 @@ minetest.register_node("crops:beanpole_top", { description = "", drawtype = "plantlike", tiles = { "crops_beanpole_top.png" }, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = true, sunlight_propagates = true, paramtype = "light", @@ -157,7 +157,7 @@ minetest.register_node("crops:beanpoles", { tiles = { "crops_beanpole_base.png" }, drawtype = "plantlike", sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", paramtype = "light", groups = { snappy=3,flammable=3,flora=1,attached_node=1 }, drop = {}, @@ -220,7 +220,7 @@ minetest.register_node("crops:beanpole_plant_base_" .. stage, { tiles = { "crops_beanpole_plant_base_" .. stage .. ".png" }, drawtype = "plantlike", sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", paramtype = "light", walkable = false, groups = { snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1 }, @@ -236,7 +236,7 @@ minetest.register_node("crops:beanpole_plant_top_" .. stage, { tiles = { "crops_beanpole_plant_top_" .. stage .. ".png" }, drawtype = "plantlike", sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", paramtype = "light", walkable = true, groups = { snappy=3,flammable=3,flora=1,not_in_creative_inventory=1 }, diff --git a/mods/farming/crops/potato.lua b/mods/farming/crops/potato.lua index 6f5130af..257c03b2 100644 --- a/mods/farming/crops/potato.lua +++ b/mods/farming/crops/potato.lua @@ -22,7 +22,7 @@ minetest.register_node("crops:potato_eyes", { paramtype2 = "meshoptions", waving = 1, sunlight_propagates = false, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", node_placement_prediction = "crops:potato_plant_1", @@ -53,7 +53,7 @@ minetest.register_node("crops:potato_plant_" .. stage , { paramtype2 = "meshoptions", waving = 1, sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", groups = { snappy=3, flammable=3, flora=1, attached_node=1, not_in_creative_inventory=1 }, @@ -85,7 +85,7 @@ minetest.register_node("crops:soil_with_potatoes", { description = S("Soil with potatoes"), tiles = { "default_dirt.png^crops_potato_soil.png", "default_dirt.png" }, sunlight_propagates = false, - use_texture_alpha = false, + use_texture_alpha = "opaque", walkable = true, groups = { snappy=3, flammable=3, oddly_breakable_by_hand=2, soil=1 }, paramtype2 = "facedir", diff --git a/mods/farming/crops/pumpkin.lua b/mods/farming/crops/pumpkin.lua index a64757dc..c1269b80 100644 --- a/mods/farming/crops/pumpkin.lua +++ b/mods/farming/crops/pumpkin.lua @@ -28,7 +28,7 @@ minetest.register_node("crops:pumpkin_seed", { drawtype = "plantlike", waving = 1, sunlight_propagates = false, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", node_placement_prediction = "crops:pumpkin_plant_1", @@ -54,7 +54,7 @@ minetest.register_node("crops:pumpkin_plant_" .. stage , { drawtype = "plantlike", waving = 1, sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", groups = { snappy=3, flammable=3, flora=1, attached_node=1, not_in_creative_inventory=1 }, @@ -75,7 +75,7 @@ minetest.register_node("crops:pumpkin_plant_5_attached", { drawtype = "mesh", paramtype2 = "facedir", sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", groups = { snappy=3, flammable=3, flora=1, attached_node=1, not_in_creative_inventory=1 }, @@ -113,7 +113,7 @@ minetest.register_node("crops:pumpkin", { "crops_pumpkin.png" }, sunlight_propagates = false, - use_texture_alpha = false, + use_texture_alpha = "opaque", walkable = true, groups = { snappy=3, flammable=3, oddly_breakable_by_hand=2 }, paramtype2 = "facedir", diff --git a/mods/farming/crops/tomato.lua b/mods/farming/crops/tomato.lua index f70d9143..174c6c56 100644 --- a/mods/farming/crops/tomato.lua +++ b/mods/farming/crops/tomato.lua @@ -22,7 +22,7 @@ minetest.register_node("crops:tomato_seed", { paramtype2 = "meshoptions", waving = 1, sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", node_placement_prediction = "crops:tomato_plant_1", @@ -51,7 +51,7 @@ minetest.register_node("crops:tomato_plant_" .. stage , { paramtype2 = "meshoptions", waving = 1, sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", groups = { snappy=3, flammable=3, flora=1, attached_node=1, not_in_creative_inventory=1 }, @@ -71,7 +71,7 @@ minetest.register_node("crops:tomato_plant_5" , { paramtype2 = "meshoptions", waving = 1, sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", groups = { snappy=3, flammable=3, flora=1, attached_node=1, not_in_creative_inventory=1 }, @@ -106,7 +106,7 @@ minetest.register_node("crops:tomato_plant_6", { paramtype2 = "meshoptions", waving = 1, sunlight_propagates = true, - use_texture_alpha = true, + use_texture_alpha = "opaque", walkable = false, paramtype = "light", groups = { snappy=3, flammable=3, flora=1, attached_node=1, not_in_creative_inventory=1 }, diff --git a/mods/farming/crops/tools/updatepo.sh b/mods/farming/crops/tools/updatepo.sh new file mode 100644 index 00000000..b1bac47f --- /dev/null +++ b/mods/farming/crops/tools/updatepo.sh @@ -0,0 +1,23 @@ +#! /bin/bash + +# To create a new translation: +# msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot + +cd "$(dirname "${BASH_SOURCE[0]}")/.."; + +# Extract translatable strings. +xgettext --from-code=UTF-8 \ + --keyword=S \ + --keyword=NS:1,2 \ + --keyword=N_ \ + --sort-by-file \ + --add-comments='Translators:' \ + --add-location=file \ + -o locale/template.pot \ + $(find . -name '*.lua') + +# Update translations. +find locale -name '*.po' | while read -r file; do + echo $file + msgmerge --update $file locale/template.pot; +done