1
0
mirror of https://github.com/minetest/minetest_game.git synced 2025-06-30 05:40:24 +02:00

Merge remote-tracking branch 'upstream/master' into dev

This commit is contained in:
2023-12-13 20:38:59 +01:00
15 changed files with 93 additions and 42 deletions

View File

@ -4,14 +4,14 @@ Locked Chest (owned by @1)=Peti Berkunci (milik @1)
You do not own this chest.=Ini bukan peti milik anda.
a locked chest=peti berkunci
Chest=Peti
Write=
Read=
Write=Tulis
Read=Baca
Title:=Tajuk:
Contents:=Kandungan:
Save=Simpan
by @1=oleh @1
Page @1 of @2=Ms. @1 / @2
The book you were writing to mysteriously disappeared.=
Page @1 of @2=Halaman @1 daripada @2
The book you were writing to mysteriously disappeared.=Buku yang anda tulis hilang secara misterinya.
"@1" by @2="@1" oleh @2
Blueberries=Beri Biru
Book=Buku
@ -28,7 +28,7 @@ Gold Ingot=Jongkong Emas
Gold Lump=Longgokan Emas
Iron Lump=Longgokan Besi
Mese Crystal=Kristal Mese
Mese Crystal Fragment=Serpihan Mese
Mese Crystal Fragment=Serpihan Kristal Mese
Obsidian Shard=Serpihan Obsidia
Paper=Kertas
Steel Ingot=Jongkong Keluli
@ -68,12 +68,12 @@ Obsidian Block=Bongkah Obsidia
Dirt=Tanah
Dirt with Grass=Tanah Berumput
Dirt with Grass and Footsteps=Tanah Berumput dan Tapak Kaki
Dirt with Savanna Grass=
Dirt with Savanna Grass=Tanah Berumput Savana
Dirt with Snow=Tanah Bersalji
Dirt with Rainforest Litter=Tanah Bersarap Hutan Hujan
Dirt with Coniferous Litter=Tanah Bersarap Hutan Konifer
Savanna Dirt=
Savanna Dirt with Savanna Grass=
Savanna Dirt=Tanah Savana
Savanna Dirt with Savanna Grass=Tanah Savana Berumput Savana
Permafrost=Ibun Abadi
Permafrost with Stones=Ibun Abadi Berbatu
Permafrost with Moss=Ibun Abadi Berlumut
@ -130,7 +130,7 @@ Papyrus=Papirus
Dry Shrub=Pokok Renek Kering
Jungle Grass=Rumput Hutan
Grass=Rumput
Savanna Grass=
Savanna Grass=Rumput Savana
Fern=Paku Pakis
Marram Grass=Rumput Maram
Bush Stem=Batang Belukar
@ -181,11 +181,11 @@ Glass=Kaca
Obsidian Glass=Kaca Obsidia
Brick Block=Bongkah Bata
Mese Lamp=Lampu Mese
Apple Wood Mese Post Light=
Acacia Wood Mese Post Light=
Jungle Wood Mese Post Light=
Pine Wood Mese Post Light=
Aspen Wood Mese Post Light=
Apple Wood Mese Post Light=Lampu Tiang Mese Kayu Epal
Acacia Wood Mese Post Light=Lampu Tiang Mese Kayu Akasia
Jungle Wood Mese Post Light=Lampu Tiang Mese Kayu Hutan
Pine Wood Mese Post Light=Lampu Tiang Mese Kayu Pain
Aspen Wood Mese Post Light=Lampu Tiang Mese Kayu Aspen
Cloud=Awan
Wooden Pickaxe=Beliung Kayu
Stone Pickaxe=Beliung Batu

View File

@ -2476,9 +2476,6 @@ end
-- Detect mapgen to select functions
--
minetest.clear_registered_biomes()
minetest.clear_registered_ores()
minetest.clear_registered_decorations()
local mg_name = minetest.get_mapgen_setting("mg_name")