diff --git a/api.lua b/api.lua index 140c3bb..ab1a581 100644 --- a/api.lua +++ b/api.lua @@ -907,7 +907,7 @@ function Everness.register_node(self, name, def) if minetest.get_modpath('x_farming') and minetest.global_exists('x_farming') then -- X Farming if _def.groups and (_def.groups.compost or 0) > 0 then - _def.description = _def.description .. '\n' .. S('Compost chance') .. ': ' .. def.groups.compost .. '%' + _def.description = _def.description .. '\n' .. S('Compost chance: @1%', def.groups.compost) end end diff --git a/buckets.lua b/buckets.lua index a54ba74..3e19f98 100644 --- a/buckets.lua +++ b/buckets.lua @@ -217,7 +217,7 @@ bucket.register_liquid( 'everness:mineral_water_flowing', 'everness:bucket_mineral_water', 'everness_bucket_mineral_water.png', - S('Mineral') .. ' ' .. S('Water') .. ' ' .. S('Bucket'), + S('Mineral Water Bucket'), { tool = 1, water_bucket = 1 } ) diff --git a/chat_commands.lua b/chat_commands.lua index 92eb208..27d4c58 100644 --- a/chat_commands.lua +++ b/chat_commands.lua @@ -20,6 +20,6 @@ minetest.register_chatcommand('everness:getbiomename', { local biome_name = minetest.get_biome_name(biome_data.biome) - minetest.chat_send_player(name, 'Biome name: ' .. biome_name) + minetest.chat_send_player(name, S('Biome name: @1', biome_name)) end, }) diff --git a/craftitems.lua b/craftitems.lua index e933fb5..bf257c0 100644 --- a/craftitems.lua +++ b/craftitems.lua @@ -32,7 +32,7 @@ Everness:register_craftitem('everness:bamboo_item', { }) Everness:register_craftitem('everness:baobab_fruit_roasted', { - description = S('Baobab Roasted Fruit') .. '\n'.. minetest.colorize(Everness.colors.brown, S('Hunger') .. ': 4'), + description = S('Baobab Roasted Fruit') .. '\n'.. minetest.colorize(Everness.colors.brown, S('Hunger: @1', 4)), inventory_image = 'everness_baobab_tree_fruit_roasted.png', on_use = minetest.item_eat(4), }) @@ -48,7 +48,7 @@ Everness:register_craftitem('everness:pyrite_lump', { }) Everness:register_craftitem('everness:coconut_fruit', { - description = S('Coconut') .. '\n'.. minetest.colorize(Everness.colors.brown, S('Hunger') .. ': 4'), + description = S('Coconut') .. '\n'.. minetest.colorize(Everness.colors.brown, S('Hunger: @1', 4)), inventory_image = 'everness_coconut_item.png', wield_scale = { x = 2, y = 2, z = 1 }, on_use = minetest.item_eat(4), diff --git a/locale/template.txt b/locale/template.txt index 3877cef..873f241 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -1,195 +1,136 @@ # textdomain: everness +@1 will intersect protection on growth.= +Compost chance: @1%= +Everness Encyclopedia= +You need "everness_encyclopedia" privilige to access this button.= +Empty Bucket= +Mineral Water Bucket= +Lava Bucket= +Get biome name where you are standing.= +This command can only be executed in-game!= +Biome name: @1= +Locked Chest= +Locked Chest (owned by @1)= +You do not own this chest.= +a locked chest= +Chest= Quartz Crystal= Baobab Roasted Fruit= Pyrite Ingot= Pyrite Lump= +Bamboo= +Hunger: @1= +Coconut= +Coral Wood Fence Gate= +Lava Tree Wood Door= +Lava Tree Wood Trapdoor= +Lava Tree Wood Fence Gate= Bamboo Door= Bamboo Trapdoor= Bamboo Wood Fence Gate= Bone Pyrit Door= Willow Door= -Dry Wood Fence= +Crystal Wood Door= +Crystal Wood Trapdoor= +Crystal Wood Fence Gate= +Cursed Wood Door= +Cursed Wood Trapdoor= +Palm Wood Door= +Palm Wood Trapdoor= +Palm Wood Fence Gate= Dry Wood Fence Rail= Dry Wood Mese Post Light= -Bamboo Wood Fence= Bamboo Wood Fence Rail= Bamboo Wood Mese Post Light= -Pyrite Ore= -Pyrite Block= -Forged Pyrite Block= -Pyrite Brick= -Pyrite Slab Brick= -Pyrite Spiral= -Pyrite Pillar Bottom= -Pyrite Pillar Middle= -Pyrite Pillar Top= -Pyrite Pillar Small= -Polished Pyrite Block= -Quartz Ore= -Coral Desert Stone= -Coral Bones= -Coral Desert Cobblestone= -Coral Mossy Cobblestone= -Coral Desert Stone with Moss= -Forsaken Desert Stone= -Forsaken Desert Cobblestone Red= -Forsaken Desert Cobblestone= -Volcanic Rock= -Volcanic Rock with Magma= -Cursed Stone= -Cursed Brick= -Volcanic Sulfur Stone= -Sulfur Stone= -Forsaken Tundra Cobblestone= -Forsaken Tundra Stone= -Mold Cobble= -Forsaken Tundra Brick= -Forsaken Tundra Rocks= -Blue Crying Obsidian= -Blue Weeping Obsidian= -Weeping Obsidian= -Mold Stone= -Soul Sandstone= -Soul Sandstone Veined= -Purple Crystal Block= -Orange Crystal Block= -Quartz Block= -Chiseled Quartz= -Quartz Pillar= -Forsaken Desert Brick= -Forsaken Desert Brick Red= -Forsaken Desert Chiseled Stone= -Forsaken Desert Engraved Stone= -Coral Dirt= -Cursed Dirt= -Crystal Dirt= -Forsaken Tundra Dirt= -Forsaken Tundra Dirt with Grass= -Dirt with Coral Grass= -Dirt with Cursed Grass= -Dirt with Crystal Grass= -Dry Ocean Dirt= -Dirt= -Dirt with Grass= -Crystal Cave Dirt= -Crystal Cave Dirt with Moss= -Moss Block= -Crystal Moss Block= -Coral Sand= -Coral White Sand= -Cursed Sand= -Crystal Sand= -Forsaken Tundra Beach Sand= -Forsaken Tundra Beach Sand with Shells= -Forsaken Desert Sand= -Frosted Snow Block= -Frosted Ice= -Frosted Ice Translucent= -Frosted Cave Ice= -Bone= -Ancient Emerald Ice= -Dense Emerald Ice= -Emerald Ice= -Cursed Mud= -Cobweb= -Cave Flower= -Cave Flower with Particles= -Forsaken Fire= -Coral Tree Trunk= -Coral Tree Bioluminescent= -Cursed Dream Stone= -Dry Tree Trunk= -Baobab Tree Trunk= -Sequoia Tree Trunk= -Willow Tree Trunk= -Willow Wood Planks= -Dry Wood Planks= -Hollow Tree Trunk= -Crystal Tree Trunk= -Mese Tree Trunk= -Baobab Tree Leaves= -Sequoia Tree Leaves= -Baobab Fruit= -Baobab Fruit Marker= -Baobab Sapling= -Willow Tree Leaves= -Coral Tree Leaves= -Dry Tree Branches= -Crystal Tree Leaves= -Coral Tree Sapling= -Coral Tree Bioluminescent Sapling= -Dry Tree Sapling= -Cursed Dream Tree Sapling= -Sequoia Tree Sapling= -Crystal Tree Sapling= -Crystal Tree Large Sapling= -Crystal Bush Stem= -Crystal Bush Leaves= -Crystal Bush Sapling= -Cursed Bush Stem= -Cursed Bush Leaves= -Cursed Bush Sapling= -Coral Burdock= -Coral Bush= -Coral Shrub= -Orange Coral Grass= -Globulagus= -Tall Coral Grass= -Purple Crystal= -Orange Crystal= -Cyan Crystal= -Coral Plant Bioluminescent= -Blooming Cooksonia= -Creeping Moss Spores= -Frosted Icicle= -Frosted Icicle Floor= -Coral Grass= -Red Castor= -Crystal Mushrooms= -Twisted Crystal Grass= -Crystal Grass= -Marsh Grass= -Forsaken Plant= -Blue Cactus= -Cave Barrel Cactus= -Venus Trap Plant= -Illumi Root= -Crystal Waterlily= -Orange Cactus= -Agave Leaf= -Egg plant= -Ivis Moss= -Ngrass= -Bamboo Sprout= -Blood Spoore Plant= -Blood Spoore Plant Small= -Termite Block= -Bamboo Block= -Bamboo Planks= -Bamboo Mosaic= -Baobab Wood Planks= -Sequoia Wood Planks= -Coral Corals= -Coral Frosted= -Coral Starfish= -Spine Kelp= -Crystal Coral Dark= -Crystal Coral Light= -Skull with Candle= -Forsythia Bush= -Glowing Pillar= -Blue Vine Lantern= -Amaranita Lantern= -Lumecorn= -Tinted Glass Red= -Pyrite Lantern= -Pyrite Glass= -Lumabus Vine Lantern= -Eye Vine Lantern= -Cursed Pumpkin Lantern= -Floating Crystal= -Bamboo= -Pyrite Glass Pane= +Crystal Wood Fence Rail= +Crystal Wood Mese Post Light= +Palm Wood Fence Rail= +Palm Wood Mese Post Light= +Coral Wood Fence= +Coral Wood Fence Rail= +Coral Wood Mese Post Light= +Lava Tree Wood Fence= +Lava Tree Wood Fence Rail= +Lava Tree Wood Mese Post Light= +Dry Wood Fence= +Bamboo Wood Fence= +Crystal Wood Fence= +Palm Wood Fence= +Dry Wood Fence Gate= +Coral Desert Stone Stair= +Coral Desert Stone Slab= +Double Coral Desert Stone Slab= +Coral Desert Cobblestone Stair= +Coral Desert Cobblestone Slab= +Double Coral Desert Cobblestone Slab= +Coral Mossy Cobblestone Stair= +Coral Mossy Cobblestone Slab= +Double Coral Mossy Cobblestone Slab= +Cursed Brick Stair= +Cursed Brick Slab= +Double Cursed Brick Slab= +Cursed Brick with Growth Stair= +Cursed Brick with Growth Slab= +Double Cursed Brick with Growth Slab= +Double Coral Bones Block Slab= +Double Coral Bones Brick Slab= +Double Quartz Block Slab= +Double Quartz Chiseled Slab= +Double Quartz Pillar Slab= +Double Dry Wood Slab= +Double Coral Wood Slab= +Double Bamboo Wood Slab= +Double Bamboo Mosaic Wood Slab= +Double Forsaken Desert Brick Slab= +Double Forsaken Desert Brick Red Slab= +Double Forsaken Desert Chiseled Stone Slab= +Double Baobab Wood Slab= +Double Sequoia Wood Slab= +Double Forsaken Tundra Cobblestone Slab= +Double Forsaken Tundra Stone Slab= +Double Forsaken Tundra Brick Slab= +Double Willow Wood Slab= +Double Magma Cobblestone Slab= +Double Volcanic Rock Slab= +Double Volcanic Rock with Magma Slab= +Double Coral Depp Ocean Sandstone Block Slab= +Double Coral Depp Ocean Sandstone Brick Slab= +Double Coral White Sandstone Slab= +Double Coral White Sandstone Pillar Slab= +Double Coral White Sandstone Brick Slab= +Double Coral Desert Stone Block Slab= +Double Coral Desert Stone Brick Slab= +Double Coral Sandstone Slab= +Double Coral Sandstone Brick Slab= +Double Coral Sandstone Chiseled Slab= +Double Coral Sandstone Carved Slab= +Double Cursed Lands Deep Ocean Sandstone Block Slab= +Double Cursed Lands Deep Ocean Sandstone Brick Slab= +Double Crystal Forest Deep Ocean Sandstone Block Slab= +Double Crystal Forest Deep Ocean Sandstone Brick Slab= +Double Crystal Cobblestone Slab= +Double Crystal Mossy Cobblestone Slab= +Double Crystal Stone Brick Slab= +Double Crystal Wood Slab= +Double Mese Wood Slab= +Double Mineral Stone Slab= +Double Mineral Cobblestone Slab= +Double Mineral Stone Block Slab= +Double Mineral Stone Brick Slab= +Double Mineral Sandstone Slab= +Double Mineral Sandstone Block Slab= +Double Mineral Sandstone Brick Slab= +Double Mineral Sandstone Brick Block Slab= +Double Mineral Stone Brick with Growth Slab= +Double Mineral Stone Brick with Flower Growth Slab= +Double Palm Tree Wood Planks Slab= +A bucket can be used to collect and release liquids. This one is filled with mineral water.= +Place it to empty the bucket and create a mineral water source.= +Places a mineral water source= +Coral Bones Block Stair= +Coral Bones Block Slab= +Coral Bones Brick Stair= +Coral Bones Brick Slab= Quartz Block Stair= Quartz Block Slab= Quartz Chiseled Stair= @@ -198,6 +139,8 @@ Quartz Pillar Stair= Quartz Pillar Slab= Dry Wood Stair= Dry Wood Slab= +Coral Wood Stair= +Coral Wood Slab= Bamboo Wood Stair= Bamboo Wood Slab= Bamboo Mosaic Wood Stair= @@ -226,9 +169,422 @@ Volcanic Rock Stair= Volcanic Rock Slab= Volcanic Rock with Magma Stair= Volcanic Rock with Magma Slab= +Coral Depp Ocean Sandstone Block Stair= +Coral Depp Ocean Sandstone Block Slab= +Coral Depp Ocean Sandstone Brick Stair= +Coral Depp Ocean Sandstone Brick Slab= +Coral White Sandstone Stair= +Coral White Sandstone Slab= +Coral White Sandstone Pillar Stair= +Coral White Sandstone Pillar Slab= +Coral White Sandstone Brick Stair= +Coral White Sandstone Brick Slab= +Coral Desert Stone Block Stair= +Coral Desert Stone Block Slab= +Coral Desert Stone Brick Stair= +Coral Desert Stone Brick Slab= +Coral Sandstone Stair= +Coral Sandstone Slab= +Coral Sandstone Brick Stair= +Coral Sandstone Brick Slab= +Coral Sandstone Chiseled Stair= +Coral Sandstone Chiseled Slab= +Coral Sandstone Carved Stair= +Coral Sandstone Carved Slab= +Cursed Lands Deep Ocean Sandstone Block Stair= +Cursed Lands Deep Ocean Sandstone Block Slab= +Cursed Lands Deep Ocean Sandstone Brick Stair= +Cursed Lands Deep Ocean Sandstone Brick Slab= +Crystal Forest Deep Ocean Sandstone Block Stair= +Crystal Forest Deep Ocean Sandstone Block Slab= +Crystal Forest Deep Ocean Sandstone Brick Stair= +Crystal Forest Deep Ocean Sandstone Brick Slab= +Crystal Cobblestone Stair= +Crystal Cobblestone Slab= +Crystal Mossy Cobblestone Stair= +Crystal Mossy Cobblestone Slab= +Crystal Stone Brick Stair= +Crystal Stone Brick Slab= +Crystal Wood Stair= +Crystal Wood Slab= +Mese Wood Stair= +Mese Wood Slab= +Mineral Stone Stair= +Mineral Stone Slab= +Mineral Cobblestone Stair= +Mineral Cobblestone Slab= +Mineral Stone Block Stair= +Mineral Stone Block Slab= +Mineral Stone Brick Stair= +Mineral Stone Brick Slab= +Mineral Sandstone Stair= +Mineral Sandstone Slab= +Mineral Sandstone Block Stair= +Mineral Sandstone Block Slab= +Mineral Sandstone Brick Stair= +Mineral Sandstone Brick Slab= +Mineral Sandstone Brick Block Stair= +Mineral Sandstone Brick Block Slab= +Mineral Stone Brick with Growth Stair= +Mineral Stone Brick with Growth Slab= +Mineral Stone Brick with Flower Growth Stair= +Mineral Stone Brick with Flower Growth Slab= +Palm Tree Wood Planks Stair= +Palm Tree Wood Planks Slab= +Coral Cobblestone Wall= +Coral Mossy Cobblestone Wall= +Cursed Brick Wall= +Cursed Brick with Growth Wall= +Forsaken Tundra Cobblestone Wall= +Forsaken Tundra Stone Wall= +Forsaken Tundra Brick Wall= +Magma Cobblestone Wall= +Volcanic Rock Wall= +Volcanic Rock with Magma Wall= +Coal Ore= +Pyrite Ore= +Ceramic Sherds. Use archeological pickaxe to have a chance of getting various different sherds.= +Ceramic Sherds= +Pyrite Block= +Forged Pyrite Block= +Pyrite Brick= +Pyrite Slab Brick= +Pyrite Spiral= +Pyrite Pillar Bottom= +Pyrite Pillar Middle= +Pyrite Pillar Top= +Pyrite Pillar Small= +Polished Pyrite Block= +Quartz Ore= +Coral Desert Stone= +Crystal Stone= +Coral Sandstone= +Coral Sandstone Brick= +Coral Sandstone Chiseled Block= +Coral Sandstone Carved Block= +Coral White Sandstone= +Coral White Sandstone Brick= +Coral White Sandstone Pillar= +Coral Desert Stone Block= +Coral Desert Stone Brick= +Coral Bones= +Coral Bones Block= +Coral Bones Brick= +Crystal Cobblestone= +Crystal Mossy Cobblestone= +Crystal Stone Brick= +Coral Desert Cobblestone= +Coral Mossy Cobblestone= +Coral Desert Stone with Moss= +Coral Deep Ocean Sandstone Block= +Coral Deep Ocean Sandstone Brick= +Cursed Lands Deep Ocean Sandstone Block= +Cursed Lands Deep Ocean Sandstone Brick= +Crystal Forest Deep Ocean Sandstone Block= +Crystal Forest Deep Ocean Sandstone Brick= +Forsaken Desert Stone= +Forsaken Desert Cobblestone Red= +Forsaken Desert Cobblestone= +Volcanic Rock= +Volcanic Rock with Magma= +Cursed Stone= +Cursed Stone Carved= +Cursed Brick= +Cursed Brick with Growth= +Cursed Brick Mixed= +Cursed Brick Carved= +Volcanic Sulfur Stone= +Sulfur Stone= +Forsaken Tundra Cobblestone= +Forsaken Tundra Stone= +Mold Cobble= +Forsaken Tundra Brick= +Forsaken Tundra Rocks= +Blue Crying Obsidian= +Blue Weeping Obsidian= +Weeping Obsidian= +Mold Stone= +Soul Sandstone= +Soul Sandstone Veined= +Purple Crystal Block= +Orange Crystal Block= +Cyan Crystal Block= +Quartz Block= +Chiseled Quartz= +Quartz Pillar= +Forsaken Desert Brick= +Forsaken Desert Brick Red= +Forsaken Desert Engraved Stone= +Crystal Sandstone= +Crystal Sandstone Brick= +Crystal Sandstone Chiseled= +Cursed Sandstone Block= +Cursed Sandstone Brick= +Mineral Stone= +Mineral Cobblestone= +Mineral Stone Block= +Mineral Stone Brick= +Mineral Sandstone= +Mineral Sandstone Block= +Mineral Stone Brick with Growth= +Mineral Stone Brick with Flower Growth= +Mineral Sandstone Brick= +Mineral Sandstone Brick Block= +Coral Dirt= +Coral Deep Ocean Mud= +Cursed Dirt= +Crystal Dirt= +Forsaken Tundra Dirt= +Forsaken Tundra Dirt with Grass= +Dirt with Coral Grass= +Dirt with Cursed Grass= +Dirt with Crystal Grass= +Dry Ocean Dirt= +Everness Gravel= +Permanent Fire= +Dirt= +Dry Dirt= +Dirt with Dry Grass= +Dirt with Grass= +Crystal Cave Dirt= +Crystal Cave Dirt with Moss= +Moss Block= +Crystal Moss Block= +Coral Sand= +Coral White Sand= +Cursed Sand= +Crystal Sand= +Crystal Forest Deep Ocean Sand with Crack= +Forsaken Tundra Beach Sand= +Forsaken Tundra Beach Sand with Shells= +Forsaken Desert Sand= +Coral Forest Deep Ocean Sand= +Cursed Lands Deep Ocean Sand= +Cursed Lands Deep Ocean Sand with Crack= +Crystal Forest Deep Ocean Sand= +Mineral Sand= +Frosted Snow Block= +Frosted Ice= +Frosted Ice Translucent= +Frosted Cave Ice= +Bone= +Ancient Emerald Ice= +Dense Emerald Ice= +Emerald Ice= +Cursed Mud= +Cobweb= +Cave Flower= +Cave Flower with Particles= +Lotus Flower pink= +Lotus Flower pink Animated= +Lotus Flower purple= +Lotus Flower purple Animated= +Lotus Flower white= +Lotus Flower white Animated= +Lotus Leaf= +Lotus Leaf Dry= +Forsaken Fire= +Coral Tree Trunk= +Coral Wood Planks= +Coral Tree Bioluminescent= +Cursed Dream Stone= +Dry Tree Trunk= +Baobab Tree Trunk= +Sequoia Tree Trunk= +Willow Tree Trunk= +Willow Wood Planks= +Dry Wood Planks= +Hollow Tree Trunk= +Crystal Tree Trunk= +Crystal Wood Planks= +Mese Tree Trunk= +Palm Tree Trunk= +Palm Tree Leaves= +Palm Tree Wood Planks= +Mese Tree Leaves= +Baobab Tree Leaves= +Sequoia Tree Leaves= +Baobab Fruit= +Baobab Fruit Marker= +Baobab Sapling= +Willow Tree Leaves= +Coral Tree Leaves= +Dry Tree Branches= +Crystal Tree Leaves= +Coral Tree Sapling= +Coral Tree Bioluminescent Sapling= +Dry Tree Sapling= +Cursed Dream Tree Sapling= +Willow Tree Sapling= +Sequoia Tree Sapling= +Crystal Tree Sapling= +Crystal Tree Large Sapling= +Crystal Bush Stem= +Crystal Bush Leaves= +Crystal Bush Sapling= +Cursed Bush Stem= +Cursed Bush Leaves= +Cursed Bush Sapling= +Flowers= +Magenta Flowers= +Coral Burdock= +Coral Bush= +Coral Shrub= +Orange Coral Grass= +Globulagus= +Tall Coral Grass= +Purple Crystal= +Orange Crystal= +Cyan Crystal= +Coral Plant Bioluminescent= +Blooming Cooksonia= +Creeping Moss Spores= +Frosted Icicle= +Frosted Icicle Floor= +Coral Grass= +Baobab Savanna Grass= +Red Castor= +Crystal Mushrooms= +Twisted Crystal Grass= +Crystal Grass= +Marsh Grass= +Forsaken Plant= +Blue Cactus= +Cave Barrel Cactus= +Venus Trap Plant= +Illumi Root= +Crystal Waterlily= +Orange Cactus= +Agave Leaf= +Mese Fruit= +Mese Tree Sapling= +Palm Tree Sapling= +Egg plant= +Ivis Moss= +Ngrass= +Bamboo Sprout= +Blood Spoore Plant= +Blood Spoore Plant Small= +Termite Block= +Bamboo Block= +Bamboo Planks= +Bamboo Mosaic= +Baobab Wood Planks= +Sequoia Wood Planks= +Mese Wood Planks= +Coral Corals= +Coral Frosted= +Coral Starfish= +Spine Kelp= +Coral Bulbs= +Coral Tree= +Coral Palm= +Coral Anemone= +Coral Darkilluma= +Coral Demon= +Crystal Forest Deep Ocean Coral Plant Cyan= +Crystal Forest Deep Ocean Coral Plant Orange= +Crystal Forest Deep Ocean Coral Plant Pink= +Crystal Coral Dark= +Crystal Coral Light= +Coral Forest Deep Ocean Coral Pink= +Coral Forest Deep Ocean Coral Cyan= +Coral Forest Deep Ocean Coral Green= +Coral Forest Deep Ocean Coral Red= +Coral Alcyonacea= +Coral Ostracod= +Coral Octocurse= +Crystal Forest Deep Ocean Coral Green= +Crystal Forest Deep Ocean Coral Orange= +Crystal Forest Deep Ocean Coral Cyan= +Coral Skeleton= +Mineral Water Weed= +Skull with Candle= +Forsythia Bush= +Rose Bush= +Glowing Pillar= +Blue Vine Lantern= +Amaranita Lantern= +Lumecorn= +Everness Glass= +Tinted Glass Red= +Pyrite Lantern= +Pyrite Glass= +Lumabus Vine Lantern= +Eye Vine Lantern= +Cursed Pumpkin Lantern= +Floating Crystal= +Coral Forest Deep Ocean Lantern= +Mineral Water Source= +Flowing Mineral Water= +Lava Source= +Flowing Lava= +Water Geyser= +Water Geyser Active= +Ceramic Pot blank= +Ceramic Pot blank Sherd= +Ceramic Pot flowers= +Ceramic Pot flowers Sherd= +Ceramic Pot lines= +Ceramic Pot lines Sherd= +Ceramic Pot tribal= +Ceramic Pot tribal Sherd= +If destroyed by archelogical pick axe, it will drop ceramic sherds instead of ceramic pot item.= +(owned by @1)= +Sand Castle Wall= +Forsaken Desert Chiseled Stone= +Coral Dirt Soil= +Dirt Soil= +Crystal Dirt Soil= +Crystal Cave Dirt Soil= +Cursed Dirt Soil= +Dry Dirt Soil= +Coral Dirt Wet Soil= +Crystal Dirt Wet Soil= +Crystal Cave Dirt Wet Soil= +Cursed Dirt Wet Soil= +Mineral Cave Stone= +Mineral Cave Cobblestone= +Mineral Lava Stone with lava= +Mineral Lava Stone without lava= +Mineral Lava Stone with moss= +Volcanic Spike @1= +Mineral Lava Stone Spike @1= +Lava Tree Trunk= +Lava Tree Trunk with Lava Veins= +Lava Tree Wood Planks= +Lava Tree Sapling= +Lava Tree Leaves= +Mineral Cave Moss Grass= +Pyrite Glass Pane= +Cursed Steel Bars= +Cursed Steel Bar Door= +Steel Bar Trapdoor= +Dry Tree Trunk Stair= +Dry Tree Trunk Slab= +Forsaken Desert Engraved Stone Stair= +Forsaken Desert Engraved Stone Slab= +Forsaken Desert Cobblestone Stair= +Forsaken Desert Cobblestone Slab= +Forsaken Desert Cobblestone Red Stair= +Forsaken Desert Cobblestone Red Slab= +Everness Glass Stair= +Everness Glass Slab= +Mineral Cave Stone Stair= +Mineral Cave Stone Slab= +Mineral Cave Cobblestone Stair= +Mineral Cave Cobblestone Slab= +Mineral Lava Stone with lava Stair= +Mineral Lava Stone with lava Slab= +Mineral Lava Stone without lava Stair= +Mineral Lava Stone without lava Slab= Vine Shears= +Silk Shovel= +Shell of Underwater Breating= +Hammer= +Sharp Hammer= +Mineral Torch= Cave Vine= -Cave Vine with Mese Leaves= Whispering Gourd Vine= Bulb Vine= Willow Vine= @@ -237,15 +593,27 @@ Lumabus Vine= Ivis Vine= Flowered Vine= Reeds Vine= +Tenanea Flowers Vine= Twisted Vine= Golden Vine= Dense Vine= -Coral Cobblestone Wall= -Coral Mossy Cobblestone Wall= -Cursed Brick Wall= -Forsaken Tundra Cobblestone Wall= -Forsaken Tundra Stone Wall= -Forsaken Tundra Brick Wall= -Magma Cobblestone Wall= -Volcanic Rock Wall= -Volcanic Rock with Magma Wall= +Wall Cave Vine Green= +Wall Cave Vine Blue= +Wall Cave Vine Cyan= +Wall Cave Vine Violet= +Coral Bones Block Wall= +Coral Bones Brick Wall= +Crystal Cobblestone Wall= +Crystal Mossy Cobblestone Wall= +Cursed Sandstone Brick Wall= +Cursed Sandstone Block Wall= +Cursed Stone Carved Wall= +Forsaken Desert Cobblestone Wall= +Forsaken Desert Cobblestone Red Wall= +Forsaken Desert Brick Wall= +Forsaken Desert Brick Red Wall= +Forsaken Desert Engraved Stone Wall= +Mineral Cave Stone Wall= +Mineral Cave Cobblestone Wall= +Mineral Lava Stone with lava Wall= +Mineral Lava Stone without lava Wall= diff --git a/mod_support_mcl.lua b/mod_support_mcl.lua index 2b6cd29..51d2b28 100644 --- a/mod_support_mcl.lua +++ b/mod_support_mcl.lua @@ -930,12 +930,12 @@ mcl_stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Slab'), + S('Mineral Stone Stair'), + S('Mineral Stone Slab'), Everness.node_sound_stone_defaults(), 6, 1.5, - S('Double') .. ' ' .. S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Slab'), + S('Double Mineral Stone Slab'), nil ) @@ -948,12 +948,12 @@ mcl_stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Cobblestone') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Cobblestone') .. ' ' .. S('Slab'), + S('Mineral Cobblestone Stair'), + S('Mineral Cobblestone Slab'), Everness.node_sound_stone_defaults(), 6, 1.5, - S('Double') .. ' ' .. S('Mineral') .. ' ' .. S('Cobblestone') .. ' ' .. S('Slab'), + S('Double Mineral Cobblestone Slab'), nil ) @@ -966,12 +966,12 @@ mcl_stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Block') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Block') .. ' ' .. S('Slab'), + S('Mineral Stone Block Stair'), + S('Mineral Stone Block Slab'), Everness.node_sound_stone_defaults(), 6, 1.5, - S('Double') .. ' ' .. S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Block') .. ' ' .. S('Slab'), + S('Double Mineral Stone Block Slab'), nil ) @@ -984,12 +984,12 @@ mcl_stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('Slab'), + S('Mineral Stone Brick Stair'), + S('Mineral Stone Brick Slab'), Everness.node_sound_stone_defaults(), 6, 1.5, - S('Double') .. ' ' .. S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('Slab'), + S('Double Mineral Stone Brick Slab'), nil ) @@ -998,12 +998,12 @@ mcl_stairs.register_stair_and_slab( 'everness:mineral_sandstone', { pickaxey = 3 }, { 'everness_mineral_sandstone.png' }, - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Slab'), + S('Mineral Sandstone Stair'), + S('Mineral Sandstone Slab'), Everness.node_sound_stone_defaults(), 6, 1.5, - S('Double') .. ' ' .. S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Slab'), + S('Double Mineral Sandstone Slab'), nil ) @@ -1016,12 +1016,12 @@ mcl_stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Block') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Block') .. ' ' .. S('Slab'), + S('Mineral Sandstone Block Stair'), + S('Mineral Sandstone Block Slab'), Everness.node_sound_stone_defaults(), 6, 1.5, - S('Double') .. ' ' .. S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Block') .. ' ' .. S('Slab'), + S('Double Mineral Sandstone Block Slab'), nil ) @@ -1034,12 +1034,12 @@ mcl_stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Slab'), + S('Mineral Sandstone Brick Stair'), + S('Mineral Sandstone Brick Slab'), Everness.node_sound_stone_defaults(), 6, 1.5, - S('Double') .. ' ' .. S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Slab'), + S('Double Mineral Sandstone Brick Slab'), nil ) @@ -1052,12 +1052,12 @@ mcl_stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Block') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Block') .. ' ' .. S('Slab'), + S('Mineral Sandstone Brick Block Stair'), + S('Mineral Sandstone Brick Block Slab'), Everness.node_sound_stone_defaults(), 6, 1.5, - S('Double') .. ' ' .. S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Block') .. ' ' .. S('Slab'), + S('Double Mineral Sandstone Brick Block Slab'), nil ) @@ -1070,12 +1070,12 @@ mcl_stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Growth') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Growth') .. ' ' .. S('Slab'), + S('Mineral Stone Brick with Growth Stair'), + S('Mineral Stone Brick with Growth Slab'), Everness.node_sound_stone_defaults(), 6, 1.5, - S('Double') .. ' ' .. S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Growth') .. ' ' .. S('Slab'), + S('Double Mineral Stone Brick with Growth Slab'), nil ) @@ -1088,12 +1088,12 @@ mcl_stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Flower Growth') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Flower Growth') .. ' ' .. S('Slab'), + S('Mineral Stone Brick with Flower Growth Stair'), + S('Mineral Stone Brick with Flower Growth Slab'), Everness.node_sound_stone_defaults(), 6, 1.5, - S('Double') .. ' ' .. S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Flower Growth') .. ' ' .. S('Slab'), + S('Double Mineral Stone Brick with Flower Growth Slab'), nil ) @@ -1107,12 +1107,12 @@ mcl_stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Wood') .. ' ' .. S('Planks') .. ' ' .. S('Stair'), - S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Wood') .. ' ' .. S('Planks') .. ' ' .. S('Slab'), + S('Palm Tree Wood Planks Stair'), + S('Palm Tree Wood Planks Slab'), Everness.node_sound_wood_defaults(), 6, 2, - S('Double') .. ' ' .. S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Wood') .. ' ' .. S('Planks') .. ' ' .. S('Slab'), + S('Double Palm Tree Wood Planks Slab'), nil ) @@ -1343,7 +1343,7 @@ mcl_buckets.register_liquid({ source_take = { 'everness:mineral_water_source' }, bucketname = 'everness:bucket_mineral_water', inventory_image = 'everness_mcl_bucket_mineral_water.png', - name = S('Mineral') .. ' ' .. S('Water') .. ' ' .. S('Bucket'), + name = S('Mineral Water Bucket'), longdesc = S('A bucket can be used to collect and release liquids. This one is filled with mineral water.'), usagehelp = S('Place it to empty the bucket and create a mineral water source.'), tt_help = S('Places a mineral water source'), diff --git a/mod_support_mtg.lua b/mod_support_mtg.lua index 80cb6f7..451ef0e 100644 --- a/mod_support_mtg.lua +++ b/mod_support_mtg.lua @@ -26,7 +26,7 @@ if minetest.get_modpath('bucket') then 'everness:mineral_water_flowing', 'everness:bucket_mineral_water', 'everness_mtg_bucket_mineral_water.png', - S('Mineral') .. ' ' .. S('Water') .. ' ' .. S('Bucket'), + S('Mineral Water Bucket'), { tool = 1, water_bucket = 1 } ) diff --git a/nodes.lua b/nodes.lua index 2621021..e8d2584 100644 --- a/nodes.lua +++ b/nodes.lua @@ -1928,7 +1928,7 @@ Everness:register_node('everness:cursed_sandstone_brick', { }) Everness:register_node('everness:mineral_stone', { - description = S('Mineral') .. ' ' .. S('Stone'), + description = S('Mineral Stone'), tiles = { { name = 'everness_mineral_stone.png', @@ -1954,7 +1954,7 @@ Everness:register_node('everness:mineral_stone', { }) Everness:register_node('everness:mineral_stone_cobble', { - description = S('Mineral') .. ' ' .. S('Cobblestone'), + description = S('Mineral Cobblestone'), tiles = { { name = 'everness_mineral_cobblestone.png', @@ -1979,7 +1979,7 @@ Everness:register_node('everness:mineral_stone_cobble', { }) Everness:register_node('everness:mineral_stone_block', { - description = S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Block'), + description = S('Mineral Stone Block'), tiles = { { name = 'everness_mineral_stone_block.png', @@ -2006,7 +2006,7 @@ Everness:register_node('everness:mineral_stone_block', { }) Everness:register_node('everness:mineral_stone_brick', { - description = S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick'), + description = S('Mineral Stone Brick'), paramtype2 = 'facedir', is_ground_content = false, place_param2 = 0, @@ -2034,7 +2034,7 @@ Everness:register_node('everness:mineral_stone_brick', { }) Everness:register_node('everness:mineral_sandstone', { - description = S('Mineral') .. ' ' .. S('Sandstone'), + description = S('Mineral Sandstone'), tiles = { 'everness_mineral_sandstone.png' }, groups = { -- MTG @@ -2055,7 +2055,7 @@ Everness:register_node('everness:mineral_sandstone', { }) Everness:register_node('everness:mineral_sandstone_block', { - description = S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Block'), + description = S('Mineral Sandstone Block'), tiles = { { name = 'everness_mineral_sandstone_block.png', @@ -2079,7 +2079,7 @@ Everness:register_node('everness:mineral_sandstone_block', { }) Everness:register_node('everness:mineral_stone_brick_with_growth', { - description = S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Growth'), + description = S('Mineral Stone Brick with Growth'), paramtype2 = 'facedir', is_ground_content = false, place_param2 = 0, @@ -2107,7 +2107,7 @@ Everness:register_node('everness:mineral_stone_brick_with_growth', { }) Everness:register_node('everness:mineral_stone_brick_with_flower_growth', { - description = S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Flower Growth'), + description = S('Mineral Stone Brick with Flower Growth'), paramtype2 = 'facedir', is_ground_content = false, place_param2 = 0, @@ -2135,7 +2135,7 @@ Everness:register_node('everness:mineral_stone_brick_with_flower_growth', { }) Everness:register_node('everness:mineral_sandstone_brick', { - description = S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick'), + description = S('Mineral Sandstone Brick'), paramtype2 = 'facedir', is_ground_content = false, place_param2 = 0, @@ -2163,7 +2163,7 @@ Everness:register_node('everness:mineral_sandstone_brick', { }) Everness:register_node('everness:mineral_sandstone_brick_block', { - description = S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Block'), + description = S('Mineral Sandstone Brick Block'), paramtype2 = 'facedir', is_ground_content = false, place_param2 = 0, @@ -2451,7 +2451,7 @@ Everness:register_node('everness:dry_ocean_dirt', { }) Everness:register_node('everness:gravel', { - description = 'Everness ' .. S('Gravel'), + description = S('Everness Gravel'), tiles = { 'everness_gravel.png' }, groups = { -- MTG @@ -3740,11 +3740,16 @@ local lotus_flower_def = { use_texture_alpha = 'blend' } +-- For detection by update_translations script. +-- S('Lotus Flower pink'); S('Lotus Flower pink Animated') +-- S('Lotus Flower purple'); S('Lotus Flower purple Animated') +-- S('Lotus Flower white'); S('Lotus Flower white Animated') for _, color in ipairs({ 'pink', 'purple', 'white' }) do local def = table.copy(lotus_flower_def) + local flower_name = 'Lotus Flower ' .. color - def.description = S('Lotus') .. ' ' .. S('Flower') .. ' ' .. S(color) - def.short_description = S('Lotus') .. ' ' .. S('Flower') .. ' ' .. S(color) + def.description = S(flower_name) + def.short_description = S(flower_name) def.tiles = { { name = 'everness_lotus_flower_' .. color .. '_mesh.png' }, { name = 'everness_lotus_flower_mesh_not_animated.png' } @@ -3802,8 +3807,8 @@ for _, color in ipairs({ 'pink', 'purple', 'white' }) do -- Animated Def local def_anim = table.copy(def) - def_anim.description = S('Lotus') .. ' ' .. S('Flower') .. ' ' .. S(color) .. ' ' .. S('Animated') - def_anim.short_description = S('Lotus') .. ' ' .. S('Flower') .. ' ' .. S(color) .. ' ' .. S('Animated') + def_anim.description = S(flower_name .. ' Animated') + def_anim.short_description = S(flower_name .. ' Animated') def_anim.tiles = { { name = 'everness_lotus_flower_' .. color .. '_mesh.png' }, { @@ -3850,8 +3855,8 @@ for _, color in ipairs({ 'pink', 'purple', 'white' }) do end Everness:register_node('everness:lotus_leaf', { - description = S('Lotus') .. ' ' .. S('Leaf'), - short_description = S('Lotus') .. ' ' .. S('Leaf'), + description = S('Lotus Leaf'), + short_description = S('Lotus Leaf'), drawtype = 'nodebox', -- Textures of node; +Y, -Y, +X, -X, +Z, -Z tiles = { @@ -3954,8 +3959,8 @@ Everness:register_node('everness:lotus_leaf', { }) Everness:register_node('everness:lotus_leaf_2', { - description = S('Lotus') .. ' ' .. S('Leaf'), - short_description = S('Lotus') .. ' ' .. S('Leaf'), + description = S('Lotus Leaf'), + short_description = S('Lotus Leaf'), drawtype = 'nodebox', -- Textures of node; +Y, -Y, +X, -X, +Z, -Z tiles = { @@ -4058,8 +4063,8 @@ Everness:register_node('everness:lotus_leaf_2', { }) Everness:register_node('everness:lotus_leaf_3', { - description = S('Lotus') .. ' ' .. S('Leaf') .. ' ' .. S('Dry'), - short_description = S('Lotus') .. ' ' .. S('Leaf') .. ' ' .. S('Dry'), + description = S('Lotus Leaf Dry'), + short_description = S('Lotus Leaf Dry'), drawtype = 'nodebox', -- Textures of node; +Y, -Y, +X, -X, +Z, -Z tiles = { @@ -4615,8 +4620,8 @@ Everness:register_node('everness:mese_tree', { }) Everness:register_node('everness:palm_tree', { - description = S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Trunk'), - short_description = S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Trunk'), + description = S('Palm Tree Trunk'), + short_description = S('Palm Tree Trunk'), tiles = { 'everness_palm_tree_top.png', 'everness_palm_tree_top.png', 'everness_palm_tree_side.png' }, paramtype2 = 'facedir', use_texture_alpha = 'blend', -- only needed for stairs API @@ -4643,8 +4648,8 @@ Everness:register_node('everness:palm_tree', { }) Everness:register_node('everness:palm_leaves', { - description = S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Leaves'), - short_description = S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Leaves'), + description = S('Palm Tree Leaves'), + short_description = S('Palm Tree Leaves'), drawtype = 'allfaces_optional', waving = 1, tiles = { 'everness_palm_tree_leaves.png' }, @@ -4698,7 +4703,7 @@ Everness:register_node('everness:palm_leaves', { }) Everness:register_node('everness:palm_tree_wood', { - description = S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Wood') .. ' ' .. S('Planks'), + description = S('Palm Tree Wood Planks'), paramtype2 = 'facedir', place_param2 = 0, tiles = { @@ -4979,7 +4984,7 @@ Everness:register_node('everness:baobab_fruit_mark', { }) Everness:register_node('everness:baobab_fruit', { - description = S('Baobab Fruit') .. '\n'.. minetest.colorize(Everness.colors.brown, S('Hunger') .. ': 2'), + description = S('Baobab Fruit') .. '\n'.. minetest.colorize(Everness.colors.brown, S('Hunger: @1', 2)), short_description = S('Baobab Fruit'), drawtype = 'plantlike', paramtype2 = 'wallmounted', @@ -7495,7 +7500,7 @@ for i = 2, 4 do end Everness:register_node('everness:crystal_mushrooms', { - description = S('Crystal Mushrooms') .. '\n'.. minetest.colorize(Everness.colors.brown, S('Hunger') .. ': 1'), + description = S('Crystal Mushrooms') .. '\n'.. minetest.colorize(Everness.colors.brown, S('Hunger: @1', 1)), tiles = { 'everness_crystal_mushrooms.png' }, inventory_image = 'everness_crystal_mushrooms.png', wield_image = 'everness_crystal_mushrooms.png', @@ -8385,8 +8390,8 @@ Everness:register_node('everness:mese_tree_sapling', { }) Everness:register_node('everness:palm_tree_sapling', { - description = S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Sapling'), - short_description = S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Sapling'), + description = S('Palm Tree Sapling'), + short_description = S('Palm Tree Sapling'), drawtype = 'plantlike', tiles = { 'everness_palm_tree_sapling.png' }, inventory_image = 'everness_palm_tree_sapling.png', @@ -11594,7 +11599,7 @@ minetest.register_node('everness:lava_flowing', { }) Everness:register_node('everness:water_geyser', { - description = S('Water') .. ' ' .. S('Geyser'), + description = S('Water Geyser'), drawtype = 'mesh', mesh = 'everness_water_geyser.obj', tiles = { @@ -11622,7 +11627,7 @@ Everness:register_node('everness:water_geyser', { }) Everness:register_node('everness:water_geyser_active', { - description = S('Water') .. ' ' .. S('Geyser') .. ' ' .. S('Active'), + description = S('Water Geyser Active'), drawtype = 'mesh', mesh = 'everness_water_geyser.obj', tiles = { @@ -11666,10 +11671,16 @@ Everness:register_node('everness:water_geyser_active', { end }) +-- For detection by update_translations script. +-- S('Ceramic Pot blank'); S('Ceramic Pot blank Sherd') +-- S('Ceramic Pot flowers'); S('Ceramic Pot flowers Sherd') +-- S('Ceramic Pot lines'); S('Ceramic Pot lines Sherd') +-- S('Ceramic Pot tribal'); S('Ceramic Pot tribal Sherd') for i, v in ipairs({ 'blank', 'flowers', 'lines', 'tribal' }) do + local pot_name = 'Ceramic Pot ' .. v Everness:register_node('everness:ceramic_pot_' .. v, { - description = S('Ceramic') .. ' ' .. S('Pot') .. ' ' .. S(v) .. '. ' .. S('If destroyed by archelogical pick axe, it will drop ceramic sherds instead of ceramic pot item.'), - short_description = S('Ceramic') .. ' ' .. S('Pot') .. ' ' .. S(v), + description = S(pot_name) .. '. ' .. S('If destroyed by archelogical pick axe, it will drop ceramic sherds instead of ceramic pot item.'), + short_description = S(pot_name), drawtype = 'mesh', mesh = 'everness_ceramic_pot.obj', tiles = { 'everness_ceramic_pot_' .. v .. '_mesh.png' }, @@ -11714,7 +11725,7 @@ for i, v in ipairs({ 'blank', 'flowers', 'lines', 'tribal' }) do on_construct = function(pos) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() - meta:set_string('infotext', S('Ceramic') .. ' ' .. S('Pot') .. ' ' .. S(v)) + meta:set_string('infotext', S(pot_name)) meta:set_string('owner', '') inv:set_size('main', 1) end, @@ -11734,11 +11745,11 @@ for i, v in ipairs({ 'blank', 'flowers', 'lines', 'tribal' }) do local inv = meta:get_inventory() local inv_stack = inv:get_stack('main', 1) local label_copy = { - S('Ceramic') .. ' ' .. S('Pot') .. ' ' .. S(v) + S(pot_name) } if meta:get_string('owner') ~= '' then - label_copy[#label_copy + 1] = ' (' .. S('owned by') .. ' ' .. meta:get_string('owner') .. ')' + label_copy[#label_copy + 1] = ' ' .. S('(owned by @1)', meta:get_string('owner')) end label_copy[#label_copy + 1] = '\n' .. inv_stack:get_description() @@ -11813,11 +11824,11 @@ for i, v in ipairs({ 'blank', 'flowers', 'lines', 'tribal' }) do local inv = meta:get_inventory() local inv_stack = inv:get_stack('main', 1) local label_copy = { - S('Ceramic') .. ' ' .. S('Pot') .. ' ' .. S(v) + S(pot_name) } if meta:get_string('owner') ~= '' then - label_copy[#label_copy + 1] = ' (' .. S('owned by') .. ' ' .. meta:get_string('owner') .. ')' + label_copy[#label_copy + 1] = ' ' .. S('(owned by @1)', meta:get_string('owner')) end label_copy[#label_copy + 1] = '\n' .. inv_stack:get_description() @@ -11832,11 +11843,11 @@ for i, v in ipairs({ 'blank', 'flowers', 'lines', 'tribal' }) do local inv = meta:get_inventory() local inv_stack = inv:get_stack('main', 1) local label_copy = { - S('Ceramic') .. ' ' .. S('Pot') .. ' ' .. S(v) + S(pot_name) } if meta:get_string('owner') ~= '' then - label_copy[#label_copy + 1] = ' (' .. S('owned by') .. ' ' .. meta:get_string('owner') .. ')' + label_copy[#label_copy + 1] = ' ' .. S('(owned by @1)', meta:get_string('owner')) end label_copy[#label_copy + 1] = '\n' .. inv_stack:get_description() @@ -11848,7 +11859,7 @@ for i, v in ipairs({ 'blank', 'flowers', 'lines', 'tribal' }) do }) Everness:register_craftitem('everness:ceramic_pot_sherd_' .. v, { - description = S('Ceramic') .. ' ' .. S('Pot') .. ' ' .. S(v) .. ' ' .. S('Sherd'), + description = S(pot_name .. ' Sherd'), inventory_image = 'everness_ceramic_pot_' .. v .. '_sherd.png', }) @@ -11874,7 +11885,7 @@ end local fence_collision_extra = minetest.settings:get_bool('enable_fence_tall') and 3/8 or 0 Everness:register_node('everness:sand_castle_wall', { - description = S('Sand') .. ' ' .. S('Castle') .. ' ' .. S('Wall'), + description = S('Sand Castle Wall'), drawtype = 'nodebox', node_box = { type = 'connected', diff --git a/nodes_mineral_waters_under.lua b/nodes_mineral_waters_under.lua index 41c16ed..7e65dc1 100644 --- a/nodes_mineral_waters_under.lua +++ b/nodes_mineral_waters_under.lua @@ -195,7 +195,7 @@ for i = 1, 7 do local last = i == 7 Everness:register_node('everness:volcanic_spike_' .. i, { - description = S('Volcanic Spike') .. ' ' .. i, + description = S('Volcanic Spike @1', i), tiles = { 'everness_volcanic_rock.png' }, sounds = Everness.node_sound_stone_defaults(), drawtype = 'nodebox', @@ -255,7 +255,7 @@ for i = 1, 7 do }) Everness:register_node('everness:mineral_cave_stone_spike_' .. i, { - description = S('Mineral Lava Stone Spike') .. ' ' .. i, + description = S('Mineral Lava Stone Spike @1', i), -- Textures of node; +Y, -Y, +X, -X, +Z, -Z tiles = { { @@ -333,7 +333,7 @@ for i = 1, 7 do }) Everness:register_node('everness:mineral_lava_stone_spike_' .. i, { - description = S('Mineral Lava Stone Spike') .. ' ' .. i, + description = S('Mineral Lava Stone Spike @1', i), -- Textures of node; +Y, -Y, +X, -X, +Z, -Z tiles = { { @@ -520,8 +520,8 @@ Everness:register_node('everness:lava_tree_wood', { }) Everness:register_node('everness:lava_tree_sapling', { - description = S('Lava') .. ' ' .. S('Tree') .. ' ' .. S('Sapling'), - short_description = S('Lava') .. ' ' .. S('Tree') .. ' ' .. S('Sapling'), + description = S('Lava Tree Sapling'), + short_description = S('Lava Tree Sapling'), drawtype = 'plantlike', tiles = { 'everness_lava_tree_sapling.png' }, inventory_image = 'everness_lava_tree_sapling.png', @@ -574,8 +574,8 @@ Everness:register_node('everness:lava_tree_sapling', { }) Everness:register_node('everness:lava_tree_leaves', { - description = S('Lava') .. ' ' .. S('Tree') .. ' ' .. S('Leaves'), - short_description = S('Lava') .. ' ' .. S('Tree') .. ' ' .. S('Leaves'), + description = S('Lava Tree Leaves'), + short_description = S('Lava Tree Leaves'), drawtype = 'allfaces_optional', tiles = { { diff --git a/stairs.lua b/stairs.lua index 5c40e51..3d69c80 100644 --- a/stairs.lua +++ b/stairs.lua @@ -700,8 +700,8 @@ stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Slab'), + S('Mineral Stone Stair'), + S('Mineral Stone Slab'), Everness.node_sound_stone_defaults(), true ) @@ -715,8 +715,8 @@ stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Cobblestone') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Cobblestone') .. ' ' .. S('Slab'), + S('Mineral Cobblestone Stair'), + S('Mineral Cobblestone Slab'), Everness.node_sound_stone_defaults(), true ) @@ -730,8 +730,8 @@ stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Block') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Block') .. ' ' .. S('Slab'), + S('Mineral Stone Block Stair'), + S('Mineral Stone Block Slab'), Everness.node_sound_stone_defaults(), true ) @@ -745,8 +745,8 @@ stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('Slab'), + S('Mineral Stone Brick Stair'), + S('Mineral Stone Brick Slab'), Everness.node_sound_stone_defaults(), true ) @@ -756,8 +756,8 @@ stairs.register_stair_and_slab( 'everness:mineral_sandstone', { cracky = 3 }, { 'everness_mineral_sandstone.png' }, - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Slab'), + S('Mineral Sandstone Stair'), + S('Mineral Sandstone Slab'), Everness.node_sound_stone_defaults(), true ) @@ -771,8 +771,8 @@ stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Block') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Block') .. ' ' .. S('Slab'), + S('Mineral Sandstone Block Stair'), + S('Mineral Sandstone Block Slab'), Everness.node_sound_stone_defaults(), true ) @@ -786,8 +786,8 @@ stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Slab'), + S('Mineral Sandstone Brick Stair'), + S('Mineral Sandstone Brick Slab'), Everness.node_sound_stone_defaults(), true ) @@ -805,8 +805,8 @@ stairs.register_stair_and_slab( scale = 2 } }, - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Block') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Sandstone') .. ' ' .. S('Brick') .. ' ' .. S('Block') .. ' ' .. S('Slab'), + S('Mineral Sandstone Brick Block Stair'), + S('Mineral Sandstone Brick Block Slab'), Everness.node_sound_stone_defaults(), true ) @@ -820,8 +820,8 @@ stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Growth') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Growth') .. ' ' .. S('Slab'), + S('Mineral Stone Brick with Growth Stair'), + S('Mineral Stone Brick with Growth Slab'), Everness.node_sound_stone_defaults(), true ) @@ -835,8 +835,8 @@ stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Flower Growth') .. ' ' .. S('Stair'), - S('Mineral') .. ' ' .. S('Stone') .. ' ' .. S('Brick') .. ' ' .. S('with Flower Growth') .. ' ' .. S('Slab'), + S('Mineral Stone Brick with Flower Growth Stair'), + S('Mineral Stone Brick with Flower Growth Slab'), Everness.node_sound_stone_defaults(), true ) @@ -851,8 +851,8 @@ stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Wood') .. ' ' .. S('Planks') .. ' ' .. S('Stair'), - S('Palm') .. ' ' .. S('Tree') .. ' ' .. S('Wood') .. ' ' .. S('Planks') .. ' ' .. S('Slab'), + S('Palm Tree Wood Planks Stair'), + S('Palm Tree Wood Planks Slab'), Everness.node_sound_wood_defaults(), true ) @@ -882,7 +882,7 @@ stairs.register_stair_and_slab( align_style = 'world', scale = 2 }}, - S('Mineral Cave Cobblestone Stair'), + S ('Mineral Cave Cobblestone Stair'), S('Mineral Cave Cobblestone Slab'), Everness.node_sound_stone_defaults(), true diff --git a/tools.lua b/tools.lua index 7f0e30c..aa33bba 100644 --- a/tools.lua +++ b/tools.lua @@ -346,7 +346,7 @@ Everness:register_node('everness:hammer', { }) Everness:register_node('everness:hammer_sharp', { - description = S('Sharp') .. ' ' .. S('Hammer'), + description = S('Sharp Hammer'), mod_origin = 'evermess', inventory_image = 'everness_hammer_sharp_item.png', use_texture_alpha = 'clip', diff --git a/torches.lua b/torches.lua index e14ae3b..89f4df4 100644 --- a/torches.lua +++ b/torches.lua @@ -49,7 +49,7 @@ local function on_flood(pos, oldnode, newnode) end Everness:register_node('everness:mineral_torch', { - description = S('Mineral') .. ' ' .. S('Torch'), + description = S('Mineral Torch'), drawtype = 'mesh', mesh = 'everness_mineral_torch.obj', inventory_image = 'everness_mineral_torch_item.png',