diff --git a/game_api.txt b/game_api.txt index c8b4cec3..8d3653d5 100644 --- a/game_api.txt +++ b/game_api.txt @@ -49,6 +49,8 @@ Beds API * `beds.read_spawns() ` Returns a table containing players respawn positions * `beds.kick_players()` Forces all players to leave bed * `beds.skip_night()` Sets world time to morning and saves respawn position of all players currently sleeping + * `beds.day_interval` Is a table with keys "start" and "finish". Allows you + to set the period of the day (timeofday format). Default: `{ start = 0.2, finish = 0.805 }`. ### Bed definition diff --git a/mods/beds/functions.lua b/mods/beds/functions.lua index 409aa376..99e4dd72 100644 --- a/mods/beds/functions.lua +++ b/mods/beds/functions.lua @@ -186,7 +186,7 @@ function beds.on_rightclick(pos, player) local ppos = player:get_pos() local tod = minetest.get_timeofday() - if tod > 0.2 and tod < 0.805 then + if tod > beds.day_interval.start and tod < beds.day_interval.finish then if beds.player[name] then lay_down(player, nil, nil, false) end diff --git a/mods/beds/init.lua b/mods/beds/init.lua index a1a46ce9..14ced8ba 100644 --- a/mods/beds/init.lua +++ b/mods/beds/init.lua @@ -16,6 +16,11 @@ beds.formspec = "size[8,11;true]" .. "bgcolor[#080808BB;true]" .. "button_exit[2,10;4,0.75;leave;" .. esc(S("Leave Bed")) .. "]" +beds.day_interval = { + start = 0.2, + finish = 0.805, +} + local modpath = minetest.get_modpath("beds") -- Load files diff --git a/mods/beds/locale/beds.id.tr b/mods/beds/locale/beds.id.tr index 7bcbb5df..d87c933c 100644 --- a/mods/beds/locale/beds.id.tr +++ b/mods/beds/locale/beds.id.tr @@ -1,10 +1,10 @@ # textdomain: beds Fancy Bed=Ranjang Mewah Simple Bed=Ranjang Sederhana -This bed is already occupied!= -You have to stop moving before going to bed!= +This bed is already occupied!=Ranjang telah terisi! +You have to stop moving before going to bed!=Anda harus diam untuk tidur! Good morning.=Selamat pagi. @1 of @2 players are in bed=@1 dari @2 pemain sedang tidur Force night skip=Paksa lewati malam -You can only sleep at night.=Anda hanya dapat tidur pada waktu malam. +You can only sleep at night.=Anda hanya bisa tidur pada waktu malam. Leave Bed=Tinggalkan Ranjang diff --git a/mods/beds/locale/beds.zh_TW.tr b/mods/beds/locale/beds.zh_TW.tr index b19b4814..a0428b4e 100644 --- a/mods/beds/locale/beds.zh_TW.tr +++ b/mods/beds/locale/beds.zh_TW.tr @@ -1,8 +1,8 @@ # textdomain: beds Fancy Bed=花式床 Simple Bed=簡易床 -This bed is already occupied!= -You have to stop moving before going to bed!= +This bed is already occupied!=這個床已經被占據了！ +You have to stop moving before going to bed!=你必須在上床前停止移動！ Good morning.=早安！ @1 of @2 players are in bed=@2位玩家中的@1位在床上 Force night skip=強制跳過夜晚 diff --git a/mods/binoculars/locale/binoculars.id.tr b/mods/binoculars/locale/binoculars.id.tr index 9a340443..3719d644 100644 --- a/mods/binoculars/locale/binoculars.id.tr +++ b/mods/binoculars/locale/binoculars.id.tr @@ -1,3 +1,3 @@ # textdomain: binoculars Binoculars=Teropong -Use with 'Zoom' key=Pakai dengan tombol 'Zoom' +Use with 'Zoom' key=Pakai dengan tombol 'Zum' diff --git a/mods/boats/locale/boats.ru.tr b/mods/boats/locale/boats.ru.tr index 43270984..972bfb07 100644 --- a/mods/boats/locale/boats.ru.tr +++ b/mods/boats/locale/boats.ru.tr @@ -1,4 +1,4 @@ # textdomain: boats -Boat cruise mode on=Режим путешествия на лодке включен -Boat cruise mode off=Режим путешествия на лодке выключен +Boat cruise mode on=Автоход лодки включен +Boat cruise mode off=Автоход лодки выключен Boat=Лодка diff --git a/mods/bones/locale/bones.sv.tr b/mods/bones/locale/bones.sv.tr index 1323c590..9df9b0f0 100644 --- a/mods/bones/locale/bones.sv.tr +++ b/mods/bones/locale/bones.sv.tr @@ -1,8 +1,8 @@ # textdomain: bones Bones=Ben @1's old bones=@1s Gamla ben -@1 died at @2.=@1 dog på @a. -@1 died at @2, and dropped their inventory.=@1 dog på @a, och tappade deras saker. +@1 died at @2.=@1 dog på @2. +@1 died at @2, and dropped their inventory.=@1 dog på @2, och tappade deras saker. @1 died at @2, and bones were placed.=@1 dog på @2, och deras ben var placerade. @1's fresh bones=@1s färska ben @1's bones=@1s ben diff --git a/mods/bucket/locale/bucket.ja.tr b/mods/bucket/locale/bucket.ja.tr index df3bbb63..06a401ab 100644 --- a/mods/bucket/locale/bucket.ja.tr +++ b/mods/bucket/locale/bucket.ja.tr @@ -1,5 +1,5 @@ # textdomain: bucket Empty Bucket=空のバケツ Water Bucket=水入りバケツ -River Water Bucket=川の水入りバケツ +River Water Bucket=河川水入りバケツ Lava Bucket=溶岩入りバケツ diff --git a/mods/creative/init.lua b/mods/creative/init.lua index f3134858..f345697e 100644 --- a/mods/creative/init.lua +++ b/mods/creative/init.lua @@ -46,34 +46,36 @@ end dofile(minetest.get_modpath("creative") .. "/inventory.lua") if minetest.is_creative_enabled("") then - -- Dig time is modified according to difference (leveldiff) between tool - -- 'maxlevel' and node 'level'. Digtime is divided by the larger of - -- leveldiff and 1. - -- To speed up digging in creative, hand 'maxlevel' and 'digtime' have been - -- increased such that nodes of differing levels have an insignificant - -- effect on digtime. - local digtime = 42 - local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 256} + minetest.register_on_mods_loaded(function() + -- Dig time is modified according to difference (leveldiff) between tool + -- 'maxlevel' and node 'level'. Digtime is divided by the larger of + -- leveldiff and 1. + -- To speed up digging in creative, hand 'maxlevel' and 'digtime' have been + -- increased such that nodes of differing levels have an insignificant + -- effect on digtime. + local digtime = 42 + local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 256} - -- Override the hand tool - minetest.override_item("", { - range = 10, - tool_capabilities = { - full_punch_interval = 0.5, - max_drop_level = 3, - groupcaps = { - crumbly = caps, - cracky = caps, - snappy = caps, - choppy = caps, - oddly_breakable_by_hand = caps, - -- dig_immediate group doesn't use value 1. Value 3 is instant dig - dig_immediate = - {times = {[2] = digtime, [3] = 0}, uses = 0, maxlevel = 256}, - }, - damage_groups = {fleshy = 10}, - } - }) + -- Override the hand tool + minetest.override_item("", { + range = 10, + tool_capabilities = { + full_punch_interval = 0.5, + max_drop_level = 3, + groupcaps = { + crumbly = caps, + cracky = caps, + snappy = caps, + choppy = caps, + oddly_breakable_by_hand = caps, + -- dig_immediate group doesn't use value 1. Value 3 is instant dig + dig_immediate = + {times = {[2] = digtime, [3] = 0}, uses = 0, maxlevel = 256}, + }, + damage_groups = {fleshy = 10}, + } + }) + end) end -- Unlimited node placement diff --git a/mods/creative/inventory.lua b/mods/creative/inventory.lua index 1f9a1d50..3f0a12df 100644 --- a/mods/creative/inventory.lua +++ b/mods/creative/inventory.lua @@ -150,9 +150,10 @@ function creative.register_tab(name, title, items) creative.update_creative_inventory(player_name, items) local inv = player_inventory[player_name] local pagenum = math.floor(inv.start_i / (4*8) + 1) - local pagemax = math.ceil(inv.size / (4*8)) + local pagemax = math.max(math.ceil(inv.size / (4*8)), 1) local esc = minetest.formspec_escape return sfinv.make_formspec(player, context, + (inv.size == 0 and ("label[3,2;"..esc(S("No items to show.")).."]") or "") .. "label[5.8,4.15;" .. minetest.colorize("#FFFF00", tostring(pagenum)) .. " / " .. tostring(pagemax) .. "]" .. [[ image[4.08,4.2;0.8,0.8;creative_trash_icon.png] @@ -160,7 +161,7 @@ function creative.register_tab(name, title, items) list[detached:trash;main;4.02,4.1;1,1;] listring[] image_button[5,4.05;0.8,0.8;creative_prev_icon.png;creative_prev;] - image_button[7.2,4.05;0.8,0.8;creative_next_icon.png;creative_next;] + image_button[7.25,4.05;0.8,0.8;creative_next_icon.png;creative_next;] image_button[2.63,4.05;0.8,0.8;creative_search_icon.png;creative_search;] image_button[3.25,4.05;0.8,0.8;creative_clear_icon.png;creative_clear;] ]] .. @@ -191,10 +192,13 @@ function creative.register_tab(name, title, items) inv.start_i = 0 inv.filter = "" sfinv.set_player_inventory_formspec(player, context) - elseif fields.creative_search or - fields.key_enter_field == "creative_filter" then + elseif (fields.creative_search or + fields.key_enter_field == "creative_filter") + and fields.creative_filter then inv.start_i = 0 - inv.filter = fields.creative_filter:lower() + inv.filter = fields.creative_filter:sub(1, 128) -- truncate to a sane length + :gsub("[%z\1-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n) + :lower() -- search is case insensitive sfinv.set_player_inventory_formspec(player, context) elseif not fields.quit then local start_i = inv.start_i or 0 diff --git a/mods/creative/mod.conf b/mods/creative/mod.conf index 8f3fcd9f..37d0d67e 100644 --- a/mods/creative/mod.conf +++ b/mods/creative/mod.conf @@ -1,4 +1,3 @@ name = creative description = Minetest Game mod: creative depends = sfinv -optional_depends = default diff --git a/mods/default/chests.lua b/mods/default/chests.lua index 585b5f7c..e340416f 100644 --- a/mods/default/chests.lua +++ b/mods/default/chests.lua @@ -53,19 +53,22 @@ end default.chest.open_chests = {} minetest.register_on_player_receive_fields(function(player, formname, fields) - if formname ~= "default:chest" then - return - end - if not player or not fields.quit then - return - end local pn = player:get_player_name() - if not default.chest.open_chests[pn] then + if formname ~= "default:chest" then + if default.chest.open_chests[pn] then + default.chest.chest_lid_close(pn) + end + + return + end + + if not (fields.quit and default.chest.open_chests[pn]) then return end default.chest.chest_lid_close(pn) + return true end) @@ -129,6 +132,12 @@ function default.chest.register_chest(prefixed_name, d) return itemstack end + local cn = clicker:get_player_name() + + if default.chest.open_chests[cn] then + default.chest.chest_lid_close(cn) + end + minetest.sound_play(def.sound_open, {gain = 0.3, pos = pos, max_hear_distance = 10}, true) if not default.chest.chest_lid_obstructed(pos) then @@ -136,10 +145,9 @@ function default.chest.register_chest(prefixed_name, d) { name = name .. "_open", param2 = node.param2 }) end - minetest.after(0.2, minetest.show_formspec, - clicker:get_player_name(), + minetest.after(0.2, minetest.show_formspec, cn, "default:chest", default.chest.get_chest_formspec(pos)) - default.chest.open_chests[clicker:get_player_name()] = { pos = pos, + default.chest.open_chests[cn] = { pos = pos, sound = def.sound_close, swap = name } end def.on_blast = function() end @@ -200,6 +208,12 @@ function default.chest.register_chest(prefixed_name, d) return inv:is_empty("main") end def.on_rightclick = function(pos, node, clicker) + local cn = clicker:get_player_name() + + if default.chest.open_chests[cn] then + default.chest.chest_lid_close(cn) + end + minetest.sound_play(def.sound_open, {gain = 0.3, pos = pos, max_hear_distance = 10}, true) if not default.chest.chest_lid_obstructed(pos) then @@ -208,9 +222,9 @@ function default.chest.register_chest(prefixed_name, d) param2 = node.param2 }) end minetest.after(0.2, minetest.show_formspec, - clicker:get_player_name(), + cn, "default:chest", default.chest.get_chest_formspec(pos)) - default.chest.open_chests[clicker:get_player_name()] = { pos = pos, + default.chest.open_chests[cn] = { pos = pos, sound = def.sound_close, swap = name } end def.on_blast = function(pos) @@ -274,6 +288,18 @@ function default.chest.register_chest(prefixed_name, d) end }) end + + -- close opened chests on load + minetest.register_lbm({ + label = "close opened chests on load", + name = "default:close_" .. prefixed_name:gsub(":", "_") .. "_open", + nodenames = {prefixed_name .. "_open"}, + run_at_every_load = true, + action = function(pos, node) + node.name = prefixed_name + minetest.swap_node(pos, node) + end + }) end default.chest.register_chest("default:chest", { diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index d2e827f4..3cd5da7d 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -148,7 +148,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) return end - if fields.close then + if fields.quit then book_writers[player_name] = nil end @@ -179,6 +179,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) data.description = S("\"@1\" by @2", short_title, data.owner) data.text = fields.text:sub(1, max_text_size) data.text = data.text:gsub("\r\n", "\n"):gsub("\r", "\n") + data.text = data.text:gsub("[%z\1-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n) data.page = 1 data.page_max = math.ceil((#data.text:gsub("[^\n]", "") + 1) / lpp) diff --git a/mods/default/locale/default.eo.tr b/mods/default/locale/default.eo.tr index d50f3b43..98b5966d 100644 --- a/mods/default/locale/default.eo.tr +++ b/mods/default/locale/default.eo.tr @@ -162,6 +162,7 @@ Empty Bookshelf=Malplena Librobreto Bookshelf (@1 written, @2 empty books)=Librobreto (@1 skriba(j), @2 malplena(j) libro(j)) Bookshelf=Librobreto Text too long=Tro longa teksto +"@1"= Wooden Sign=Ligna Signo Steel Sign=Ŝtala Signo Wooden Ladder=Ligna Ŝtupetaro @@ -217,4 +218,3 @@ Torch=Torĉo ##### not used anymore ##### Mese Post Light=Mesea Fosta Lampo - diff --git a/mods/default/locale/default.id.tr b/mods/default/locale/default.id.tr index fbeec327..c60b5b08 100644 --- a/mods/default/locale/default.id.tr +++ b/mods/default/locale/default.id.tr @@ -4,16 +4,16 @@ Locked Chest (owned by @1)=Peti Terkunci (milik @1) You do not own this chest.=Anda bukan pemilik peti ini. a locked chest=peti terkunci Chest=Peti -Write= -Read= +Write=Tulis +Read=Baca Title:=Judul: Contents:=Isi: Save=Simpan by @1=oleh @1 Page @1 of @2=Halaman @1 dari @2 -The book you were writing to mysteriously disappeared.= +The book you were writing to mysteriously disappeared.=Buku yang Anda tulis menghilang secara misterius. "@1" by @2="@1" oleh @2 -Blueberries=Blueberry +Blueberries=Bluberi Book=Buku Book with Text=Buku Tertulis Bronze Ingot=Perunggu Batangan @@ -38,7 +38,7 @@ Tin Lump=Bongkahan Timah Furnace is empty=Tungku kosong 100% (output full)=100% (keluaran penuh) @1%=@1% -Not cookable=Tidak dapat dimasak +Not cookable=Tidak bisa dimasak Empty=Kosong Furnace active=Tungku nyala Furnace inactive=Tungku mati @@ -85,7 +85,7 @@ Clay=Tanah Liat Snow=Salju Snow Block=Balok Salju Ice=Es -Cave Ice=Gua Es +Cave Ice=Es Gua Apple Tree=Pohon Apel Apple Wood Planks=Papan Kayu Pohon Apel Apple Tree Sapling=Anak Pohon Apel @@ -132,13 +132,13 @@ Jungle Grass=Rumput Rimba Grass=Rumput Savanna Grass=Rumput Sabana Fern=Pakis -Marram Grass=Rumput Maram +Marram Grass=Rumput Pantai Bush Stem=Batang Semak Bush Leaves=Daun Semak Bush Sapling=Anak Semak -Blueberry Bush Leaves with Berries=Daun Semak Blueberry Berbuah -Blueberry Bush Leaves=Daun Semak Blueberry -Blueberry Bush Sapling=Anak Semak Blueberry +Blueberry Bush Leaves with Berries=Daun Semak Bluberi Berbuah +Blueberry Bush Leaves=Daun Semak Bluberi +Blueberry Bush Sapling=Anak Semak Bluberi Acacia Bush Stem=Batang Semak Akasia Acacia Bush Leaves=Daun Semak Akasia Acacia Bush Sapling=Bibit Semak Akasia @@ -147,7 +147,7 @@ Pine Bush Needles=Daun Semak Pinus Pine Bush Sapling=Bibit Semak Pinus Kelp=Kelp Green Coral=Koral Hijau -Pink Coral=Koral Jambon +Pink Coral=Koral Merah Muda Cyan Coral=Koral Sian Brown Coral=Koral Cokelat Orange Coral=Koral Oranye @@ -181,18 +181,18 @@ Glass=Kaca Obsidian Glass=Kaca Obsidian Brick Block=Balok 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 Taman Mese Kayu Apel +Acacia Wood Mese Post Light=Lampu Taman Mese Kayu Akasia +Jungle Wood Mese Post Light=Lampu Taman Mese Kayu Rimba +Pine Wood Mese Post Light=Lampu Taman Mese Kayu Pinus +Aspen Wood Mese Post Light=Lampu Taman Mese Kayu Aspen Cloud=Awan -Wooden Pickaxe=Gancu Kayu -Stone Pickaxe=Gancu Batu -Bronze Pickaxe=Gancu Perunggu -Steel Pickaxe=Gancu Baja -Mese Pickaxe=Gancu Mese -Diamond Pickaxe=Gancu Berlian +Wooden Pickaxe=Belencong Kayu +Stone Pickaxe=Belencong Batu +Bronze Pickaxe=Belencong Perunggu +Steel Pickaxe=Belencong Baja +Mese Pickaxe=Belencong Mese +Diamond Pickaxe=Belencong Berlian Wooden Shovel=Sekop Kayu Stone Shovel=Sekop Batu Bronze Shovel=Sekop Perunggu diff --git a/mods/default/locale/default.ja.tr b/mods/default/locale/default.ja.tr index e6249d93..cf30e45f 100644 --- a/mods/default/locale/default.ja.tr +++ b/mods/default/locale/default.ja.tr @@ -4,37 +4,37 @@ Locked Chest (owned by @1)=鍵のかかったチェスト(@1所有) You do not own this chest.=あなたはこのチェストの所有者ではありません。 a locked chest=ロックされたチェスト Chest=チェスト -Write= -Read= +Write=書き込む +Read=読む Title:=題名 Contents:=内容 Save=保存 by @1=@1著 Page @1 of @2=@1 / @2 ページ -The book you were writing to mysteriously disappeared.= +The book you were writing to mysteriously disappeared.=あなたが書いていた本が、不思議なことに消えました。 "@1" by @2=@2著「@1」 Blueberries=ブルーベリー Book=本 -Book with Text=テキストが書かれた本 +Book with Text=記入済みの本 Bronze Ingot=青銅インゴット Clay Brick=粘土レンガ -Clay Lump=粘土の塊 +Clay Lump=粘土玉 Coal Lump=石炭 Copper Ingot=銅インゴット -Copper Lump=銅の塊 +Copper Lump=銅の粗鉱 Diamond=ダイヤモンド Flint=火打ち石 Gold Ingot=金インゴット -Gold Lump=金の塊 -Iron Lump=鉄の塊 +Gold Lump=金の粗鉱 +Iron Lump=鉄の粗鉱 Mese Crystal=メセクリスタル Mese Crystal Fragment=メセクリスタルの破片 -Obsidian Shard=黒曜石の破片 +Obsidian Shard=黒曜石の欠片 Paper=紙 Steel Ingot=鉄インゴット Stick=棒 Tin Ingot=スズインゴット -Tin Lump=スズの塊 +Tin Lump=スズの粗鉱 Furnace is empty=かまどは空です 100% (output full)=100%(フル出力) @1%=@1% @@ -59,70 +59,70 @@ Sandstone Block=砂岩ブロック Desert Sandstone=砂漠の砂岩 Desert Sandstone Brick=砂漠の砂岩レンガ Desert Sandstone Block=砂漠の砂岩ブロック -Silver Sandstone=銀の砂岩 -Silver Sandstone Brick=銀の砂岩レンガ -Silver Sandstone Block=銀の砂岩ブロック +Silver Sandstone=銀色の砂岩 +Silver Sandstone Brick=銀色の砂岩レンガ +Silver Sandstone Block=銀色の砂岩ブロック Obsidian=黒曜石 Obsidian Brick=黒曜石レンガ Obsidian Block=黒曜石ブロック Dirt=土 -Dirt with Grass=草のついた土 -Dirt with Grass and Footsteps=足あとと草のついた土 -Dirt with Savanna Grass=サバンナの草のついた土 -Dirt with Snow=雪のついた土 -Dirt with Rainforest Litter=熱帯雨林のよごれた土 -Dirt with Coniferous Litter=針葉樹のよごれた土 +Dirt with Grass=草に覆われた土 +Dirt with Grass and Footsteps=足跡と草に覆われた土 +Dirt with Savanna Grass=サバンナの草に覆われた土 +Dirt with Snow=雪に覆われた土 +Dirt with Rainforest Litter=熱帯雨林の落葉に覆われた土 +Dirt with Coniferous Litter=針葉樹の落葉に覆われた土 Savanna Dirt=サバンナの土 -Savanna Dirt with Savanna Grass=サバンナの草のついたサバンナの土 +Savanna Dirt with Savanna Grass=サバンナの草に覆われたサバンナの土 Permafrost=永久凍土 -Permafrost with Stones=石のついた永久凍土 -Permafrost with Moss=苔のついた永久凍土 +Permafrost with Stones=石に覆われた永久凍土 +Permafrost with Moss=苔に覆われた永久凍土 Sand=砂 Desert Sand=砂漠の砂 -Silver Sand=銀の砂 +Silver Sand=銀色の砂 Gravel=砂利 Clay=粘土 Snow=雪 Snow Block=雪ブロック Ice=氷 Cave Ice=洞窟の氷 -Apple Tree=リンゴの木 -Apple Wood Planks=リンゴの板材 -Apple Tree Sapling=リンゴの苗木 -Apple Tree Leaves=リンゴの葉 +Apple Tree=リンゴの原木 +Apple Wood Planks=リンゴの木の板材 +Apple Tree Sapling=リンゴの木の苗木 +Apple Tree Leaves=リンゴの木の葉 Apple=リンゴ Apple Marker=リンゴのマーカー -Jungle Tree=ジャングルの木 -Jungle Wood Planks=ジャングルの板材 +Jungle Tree=ジャングルの原木 +Jungle Wood Planks=ジャングルの木の板材 Jungle Tree Leaves=ジャングルの木の葉 Jungle Tree Sapling=ジャングルの木の苗木 -Emergent Jungle Tree Sapling=新芽のジャングルの木の苗木 -Pine Tree=マツの木 -Pine Wood Planks=マツの板材 -Pine Needles=マツの葉 -Pine Tree Sapling=マツの苗木 -Acacia Tree=アカシアの木 -Acacia Wood Planks=アカシアの板材 -Acacia Tree Leaves=アカシアの葉 -Acacia Tree Sapling=アカシアの苗木 -Aspen Tree=ポプラの木 -Aspen Wood Planks=ポプラの板材 -Aspen Tree Leaves=ポプラの葉 -Aspen Tree Sapling=ポプラの苗木 +Emergent Jungle Tree Sapling=ジャングルの超高木の苗木 +Pine Tree=マツの原木 +Pine Wood Planks=マツの木の板材 +Pine Needles=マツの木の葉 +Pine Tree Sapling=マツの木の苗木 +Acacia Tree=アカシアの原木 +Acacia Wood Planks=アカシアの木の板材 +Acacia Tree Leaves=アカシアの木の葉 +Acacia Tree Sapling=アカシアの木の苗木 +Aspen Tree=ポプラの原木 +Aspen Wood Planks=ポプラの木の板材 +Aspen Tree Leaves=ポプラの木の葉 +Aspen Tree Sapling=ポプラの木の苗木 Coal Ore=石炭鉱石 Coal Block=石炭ブロック -Iron Ore=鉄の鉱石 +Iron Ore=鉄鉱石 Steel Block=鉄ブロック -Copper Ore=銅の鉱石 +Copper Ore=銅鉱石 Copper Block=銅ブロック -Tin Ore=スズの鉱石 +Tin Ore=スズ鉱石 Tin Block=スズブロック Bronze Block=青銅ブロック Mese Ore=メセ鉱石 Mese Block=メセブロック -Gold Ore=金の鉱石 +Gold Ore=金鉱石 Gold Block=金ブロック -Diamond Ore=ダイヤモンドの鉱石 +Diamond Ore=ダイヤモンド鉱石 Diamond Block=ダイヤモンドブロック Cactus=サボテン Large Cactus Seedling=大きなサボテンの苗 @@ -136,7 +136,7 @@ Marram Grass=マラムの草 Bush Stem=低木の幹 Bush Leaves=低木の葉 Bush Sapling=低木の苗木 -Blueberry Bush Leaves with Berries=ブルーベリーの低木と実 +Blueberry Bush Leaves with Berries=ブルーベリーの実った低木 Blueberry Bush Leaves=ブルーベリーの低木の葉 Blueberry Bush Sapling=ブルーベリーの低木の苗木 Acacia Bush Stem=アカシアの低木の幹 @@ -153,9 +153,9 @@ Brown Coral=茶色のサンゴ Orange Coral=橙色のサンゴ Coral Skeleton=サンゴのしがい Water Source=水源 -Flowing Water=水流 -River Water Source=川の水源 -Flowing River Water=川の水流 +Flowing Water=流れる水 +River Water Source=河川水源 +Flowing River Water=流れる河川水 Lava Source=溶岩 Flowing Lava=流れる溶岩 Empty Bookshelf=空の本棚 @@ -163,49 +163,49 @@ Bookshelf (@1 written, @2 empty books)=本棚(記述済み @1 冊, 未記述 @2 Bookshelf=本棚 Text too long=テキストが長すぎます "@1"=「@1」 -Wooden Sign=木の看板 +Wooden Sign=木製の看板 Steel Sign=鉄の看板 -Wooden Ladder=木のはしご +Wooden Ladder=木製のはしご Steel Ladder=鉄のはしご -Apple Wood Fence=リンゴのフェンス -Acacia Wood Fence=アカシアのフェンス -Jungle Wood Fence=ジャングルのフェンス -Pine Wood Fence=マツのフェンス -Aspen Wood Fence=ポプラのフェンス -Apple Wood Fence Rail=リンゴのフェンスレール -Acacia Wood Fence Rail=アカシアのフェンスレール -Jungle Wood Fence Rail=ジャングルのフェンスレール -Pine Wood Fence Rail=マツのフェンスレール -Aspen Wood Fence Rail=ポプラのフェンスレール +Apple Wood Fence=リンゴ材のフェンス +Acacia Wood Fence=アカシア材のフェンス +Jungle Wood Fence=ジャングル材のフェンス +Pine Wood Fence=マツ材のフェンス +Aspen Wood Fence=ポプラ材のフェンス +Apple Wood Fence Rail=リンゴ材のフェンスレール +Acacia Wood Fence Rail=アカシア材のフェンスレール +Jungle Wood Fence Rail=ジャングル材のフェンスレール +Pine Wood Fence Rail=マツ材のフェンスレール +Aspen Wood Fence Rail=ポプラ材のフェンスレール Glass=ガラス -Obsidian Glass=黒曜石のガラス +Obsidian Glass=黒曜石ガラス Brick Block=レンガブロック -Mese Lamp=メセの塊 -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=ポプラのメセ灯柱 +Mese Lamp=メセのランプ +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=ポプラ材のメセ灯柱 Cloud=雲 -Wooden Pickaxe=木のつるはし -Stone Pickaxe=石のつるはし -Bronze Pickaxe=青銅のつるはし -Steel Pickaxe=鉄のつるはし -Mese Pickaxe=メセのつるはし -Diamond Pickaxe=ダイヤモンドのつるはし -Wooden Shovel=木のシャベル +Wooden Pickaxe=木製のツルハシ +Stone Pickaxe=石のツルハシ +Bronze Pickaxe=青銅のツルハシ +Steel Pickaxe=鉄のツルハシ +Mese Pickaxe=メセのツルハシ +Diamond Pickaxe=ダイヤモンドのツルハシ +Wooden Shovel=木製のシャベル Stone Shovel=石のシャベル Bronze Shovel=青銅のシャベル Steel Shovel=鉄のシャベル Mese Shovel=メセのシャベル Diamond Shovel=ダイヤモンドのシャベル -Wooden Axe=木の斧 +Wooden Axe=木製の斧 Stone Axe=石の斧 Bronze Axe=青銅の斧 Steel Axe=鉄の斧 Mese Axe=メセの斧 Diamond Axe=ダイヤモンドの斧 -Wooden Sword=木の剣 +Wooden Sword=木製の剣 Stone Sword=石の剣 Bronze Sword=青銅の剣 Steel Sword=鉄の剣 diff --git a/mods/default/locale/default.zh_CN.tr b/mods/default/locale/default.zh_CN.tr index e4ef9463..c887df87 100644 --- a/mods/default/locale/default.zh_CN.tr +++ b/mods/default/locale/default.zh_CN.tr @@ -4,14 +4,14 @@ Locked Chest (owned by @1)=已上锁的箱子（属于@1） You do not own this chest.=这个箱子不属于你所有。 a locked chest=一个已上锁的箱子 Chest=箱子 -Write= -Read= +Write=写 +Read=读 Title:=标题： Contents:=内容： Save=保存 by @1=由@1 Page @1 of @2=第@1页，共@2页。 -The book you were writing to mysteriously disappeared.= +The book you were writing to mysteriously disappeared.=你正在写的书不知为何消失了。 "@1" by @2="@1" by @2 Blueberries=蓝莓 Book=书 diff --git a/mods/default/locale/default.zh_TW.tr b/mods/default/locale/default.zh_TW.tr index 8fcbd60b..bd638b4a 100644 --- a/mods/default/locale/default.zh_TW.tr +++ b/mods/default/locale/default.zh_TW.tr @@ -4,14 +4,14 @@ Locked Chest (owned by @1)=已上鎖的箱子（屬於@1所有） You do not own this chest.=這個箱子不屬於你所有。 a locked chest=一個已上鎖的箱子 Chest=箱子 -Write= -Read= +Write=寫 +Read=讀 Title:=標題： Contents:=內容： Save=保存 by @1=由@1 Page @1 of @2=第@1頁，共@2頁。 -The book you were writing to mysteriously disappeared.= +The book you were writing to mysteriously disappeared.=你正在寫的書神秘消失了。 "@1" by @2="@1" by @2 Blueberries=藍莓 Book=書 diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 41d50199..d59f6384 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -2597,12 +2597,12 @@ local function register_sign(material, desc, def) if not text then return end - if string.len(text) > 512 then + if #text > 512 then minetest.chat_send_player(player_name, S("Text too long")) return end - default.log_player_action(sender, "wrote \"" .. text .. - "\" to the sign at", pos) + text = text:gsub("[%z-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n) + default.log_player_action(sender, ("wrote %q to the sign at"):format(text), pos) local meta = minetest.get_meta(pos) meta:set_string("text", text) diff --git a/mods/doors/locale/doors.ja.tr b/mods/doors/locale/doors.ja.tr index 910e0ae1..b173504b 100644 --- a/mods/doors/locale/doors.ja.tr +++ b/mods/doors/locale/doors.ja.tr @@ -3,16 +3,16 @@ Hidden Door Segment=隠しドアの区切り Owned by @1=所有者 @1 You do not own this locked door.=あなたはこのロックされたドアの所有者ではありません。 a locked door=ロックされたドア -Wooden Door=木のドア +Wooden Door=木製のドア Steel Door=鉄のドア Glass Door=ガラスのドア -Obsidian Glass Door=黒曜石のガラスのドア +Obsidian Glass Door=黒曜石ガラスのドア You do not own this trapdoor.=あなたはこのトラップドアの所有者ではありません。 a locked trapdoor=ロックされたトラップドア -Wooden Trapdoor=木のトラップドア +Wooden Trapdoor=木製のトラップドア Steel Trapdoor=鉄のトラップドア -Apple Wood Fence Gate=リンゴのフェンスゲート -Acacia Wood Fence Gate=アカシアのフェンスゲート -Jungle Wood Fence Gate=ジャングルのフェンスゲート -Pine Wood Fence Gate=マツのフェンスゲート -Aspen Wood Fence Gate=ポプラのフェンスゲート +Apple Wood Fence Gate=リンゴ材のフェンスゲート +Acacia Wood Fence Gate=アカシア材のフェンスゲート +Jungle Wood Fence Gate=ジャングル材のフェンスゲート +Pine Wood Fence Gate=マツ材のフェンスゲート +Aspen Wood Fence Gate=ポプラ材のフェンスゲート diff --git a/mods/doors/textures/doors_item_glass.png b/mods/doors/textures/doors_item_glass.png index fcdb153d..d883f6e6 100644 Binary files a/mods/doors/textures/doors_item_glass.png and b/mods/doors/textures/doors_item_glass.png differ diff --git a/mods/doors/textures/doors_item_obsidian_glass.png b/mods/doors/textures/doors_item_obsidian_glass.png index 5780ad8f..8c7920c5 100644 Binary files a/mods/doors/textures/doors_item_obsidian_glass.png and b/mods/doors/textures/doors_item_obsidian_glass.png differ diff --git a/mods/dye/locale/dye.id.tr b/mods/dye/locale/dye.id.tr index 4122875f..d5871075 100644 --- a/mods/dye/locale/dye.id.tr +++ b/mods/dye/locale/dye.id.tr @@ -13,4 +13,4 @@ Brown Dye=Pewarna Cokelat Orange Dye=Pewarna Oranye Red Dye=Pewarna Merah Magenta Dye=Pewarna Magenta -Pink Dye=Pewarna Merah Jambu +Pink Dye=Pewarna Merah Muda diff --git a/mods/farming/locale/farming.ja.tr b/mods/farming/locale/farming.ja.tr index a95d40c8..887d839e 100644 --- a/mods/farming/locale/farming.ja.tr +++ b/mods/farming/locale/farming.ja.tr @@ -1,7 +1,7 @@ # textdomain: farming Hoe=クワ Seed=種 -Wooden Hoe=木のクワ +Wooden Hoe=木製のクワ Stone Hoe=石のクワ Steel Hoe=鉄のクワ Bronze Hoe=青銅のクワ @@ -22,7 +22,7 @@ Desert Sand Soil=砂漠の砂の土壌 Wet Desert Sand Soil=湿った砂漠の砂の土壌 Straw=ワラ Straw Stair=ワラの階段 -Inner Straw Stair=へっこんだワラの階段 -Outer Straw Stair=でっぱったワラの階段 -Straw Slab=ワラのハーフブロック +Inner Straw Stair=ワラの凹階段 +Outer Straw Stair=ワラの凸階段 +Straw Slab=ワラの厚板 Wild Cotton=天然綿 diff --git a/mods/farming/locale/farming.zh_TW.tr b/mods/farming/locale/farming.zh_TW.tr index e6a1f35d..36037af0 100644 --- a/mods/farming/locale/farming.zh_TW.tr +++ b/mods/farming/locale/farming.zh_TW.tr @@ -1,6 +1,6 @@ # textdomain: farming -Hoe= -Seed= +Hoe=鋤頭 +Seed=種子 Wooden Hoe=木鋤頭 Stone Hoe=石鋤頭 Steel Hoe=鐵鋤頭 @@ -16,8 +16,8 @@ Cotton=棉 String=線 Soil=土 Wet Soil=溼土 -Savanna Soil= -Wet Savanna Soil= +Savanna Soil=草原土 +Wet Savanna Soil=溼草原土 Desert Sand Soil=沙漠沙土 Wet Desert Sand Soil=溼沙漠沙土 Straw=稻草 @@ -25,7 +25,7 @@ Straw Stair=稻草臺階 Inner Straw Stair=稻草內樓梯 Outer Straw Stair=稻草外樓梯 Straw Slab=稻草板 -Wild Cotton= +Wild Cotton=野生棉花 ##### not used anymore ##### diff --git a/mods/mtg_craftguide/init.lua b/mods/mtg_craftguide/init.lua index f3de3db5..55b76d75 100644 --- a/mods/mtg_craftguide/init.lua +++ b/mods/mtg_craftguide/init.lua @@ -345,8 +345,11 @@ local function on_receive_fields(player, fields) data.items = init_items return true - elseif fields.key_enter_field == "filter" or fields.search then - local new = fields.filter:lower() + elseif (fields.key_enter_field == "filter" or fields.search) + and fields.filter then + local new = fields.filter:sub(1, 128) -- truncate to a sane length + :gsub("[%z\1-\8\11-\31\127]", "") -- strip naughty control characters (keeps \t and \n) + :lower() -- search is case insensitive if data.filter == new then return end diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.id.tr b/mods/mtg_craftguide/locale/mtg_craftguide.id.tr new file mode 100644 index 00000000..1498a0ae --- /dev/null +++ b/mods/mtg_craftguide/locale/mtg_craftguide.id.tr @@ -0,0 +1,53 @@ +# textdomain: mtg_craftguide +Any coal=Batu bara apa pun +Any sand=Pasir apa pun +Any wool=Wol apa pun +Any stick=Tongkat apa pun +Any vessel=Bejana apa pun +Any wood planks=Papan kayu apa pun +Any kind of stone block=Blok batu apa pun +Any red flower=Bunga merah apa pun +Any blue flower=Bunga biru apa pun +Any black flower=Bunga hitam apa pun +Any green flower=Bunga hijau apa pun +Any white flower=Bunga putih apa pun +Any orange flower=Bunga oranye apa pun +Any violet flower=Bunga ungu apa pun +Any yellow flower=Bunga kuning apa pun +Any red dye=Pewarna merah apa pun +Any blue dye=Pewarna biru apa pun +Any cyan dye=Pewarna sian apa pun +Any grey dye=Pewarna abu apa pun +Any pink dye=Pewarna merah jambu apa pun +Any black dye=Pewarna hitam apa pun +Any brown dye=Pewarna cokelat apa pun +Any green dye=Pewarna hijau apa pun +Any white dye=Pewarna putih apa pun +Any orange dye=Pewarna oranye apa pun +Any violet dye=Pewarna ungu apa pun +Any yellow dye=Pewarna kuning apa pun +Any magenta dye=Pewarna magenta apa pun +Any dark grey dye=Pewarna abu tua apa pun +Any dark green dye=Pewarna hijau tua apa pun +# Label for group ingredients +G=G +Any item belonging to the group(s): @1=Barang apa pun yang termasuk grup: @1 +Unknown Item=Barang Tak Diketahui +Fuel=Bahan Bakar +Usage @1 of @2=Pemakaian @1 dari @2 +Recipe @1 of @2=Resep @1 dari @2 +Previous recipe=Resep sebelumnya +Next recipe=Resep selanjutnya +Recipe is too big to be displayed.=Resep terlalu besar untuk ditampilkan. +Shapeless=Tak berbentuk +Cooking time: @1=Waktu memasak: @1 +Search=Cari +Reset=Atur ulang +Previous page=Halaman sebelumnya +Next page=Halaman selanjutnya +No items to show.=Tiada barang untuk ditampilkan. +No usages.=Tiada pemakaian. +Click again to show recipes.=Klik lagi untuk menampilkan resep. +No recipes.=Tiada resep. +Click again to show usages.=Klik lagi untuk menampilkan pemakaian. +Recipes=Resep diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr b/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr index dde5f120..6c0aae0c 100644 --- a/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr +++ b/mods/mtg_craftguide/locale/mtg_craftguide.ru.tr @@ -31,7 +31,7 @@ Any dark grey dye=Любая тёмно-серая краска Any dark green dye=Любая тёмно-зелёная краска # Label for group ingredients G=Г -Any item belonging to the group(s): @1=Любой предмет принадлежащий группам: @1 +Any item belonging to the group(s): @1=Любой предмет из групп(ы): @1 Unknown Item=Неизвестный предмет Fuel=Топливо Usage @1 of @2=Использование @1 из @2 diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index e39847db..f8ff598a 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -67,7 +67,11 @@ function player_api.set_model(player, model_name) if player_data.model == model_name then return end + -- Update data player_data.model = model_name + -- Clear animation data as the model has changed + -- (required for setting the `stand` animation not to be a no-op) + player_data.animation, player_data.animation_speed = nil, nil local model = models[model_name] if model then diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua index 48684cfb..e7227bf0 100644 --- a/mods/screwdriver/init.lua +++ b/mods/screwdriver/init.lua @@ -60,6 +60,19 @@ end screwdriver.rotate.colorfacedir = screwdriver.rotate.facedir +screwdriver.rotate["4dir"] = function(pos, node, mode) + if mode ~= screwdriver.ROTATE_FACE then + -- Can only rotate 4dir nodes in face mode + return nil + end + local rotation = node.param2 % 4 -- get first 2 bits + local other = node.param2 - rotation + rotation = (rotation + 1) % 4 + return rotation + other +end + +screwdriver.rotate["color4dir"] = screwdriver.rotate["4dir"] + local wallmounted_tbl = { [screwdriver.ROTATE_FACE] = {[2] = 5, [3] = 4, [4] = 2, [5] = 3, [1] = 0, [0] = 1}, [screwdriver.ROTATE_AXIS] = {[2] = 5, [3] = 4, [4] = 2, [5] = 1, [1] = 0, [0] = 3} @@ -113,6 +126,10 @@ screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses) local new_param2 if fn then new_param2 = fn(pos, node, mode) + if not new_param2 then + -- rotation refused + return itemstack + end else new_param2 = node.param2 end diff --git a/mods/sethome/init.lua b/mods/sethome/init.lua index 9fc8e6ac..19de9581 100644 --- a/mods/sethome/init.lua +++ b/mods/sethome/init.lua @@ -52,6 +52,9 @@ end sethome.get = function(name) local player = minetest.get_player_by_name(name) + if not player then + return false, S("This command can only be executed in-game!") + end local player_meta = player:get_meta() local pos = minetest.string_to_pos(player_meta:get_string("sethome:home")) if pos then @@ -86,6 +89,10 @@ minetest.register_chatcommand("home", { description = S("Teleport you to your home point"), privs = {home = true}, func = function(name) + local player = minetest.get_player_by_name(name) + if not player then + return false, S("This command can only be executed in-game!") + end if sethome.go(name) then return true, S("Teleported to home!") end diff --git a/mods/sethome/locale/sethome.de.tr b/mods/sethome/locale/sethome.de.tr index 46279dd5..c59b26ef 100644 --- a/mods/sethome/locale/sethome.de.tr +++ b/mods/sethome/locale/sethome.de.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!=Dieser Befehl kann nur im Spiel ausgeführt werden! Can use /sethome and /home=Kann /sethome und /home benutzen Teleport you to your home point=Teleportieren Sie sich zu Ihrem Zuhause-Punkt Teleported to home!=Nach Hause teleportiert! diff --git a/mods/sethome/locale/sethome.eo.tr b/mods/sethome/locale/sethome.eo.tr index eb8f0a61..86ef8149 100644 --- a/mods/sethome/locale/sethome.eo.tr +++ b/mods/sethome/locale/sethome.eo.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Povas uzi /sethome kaj /home Teleport you to your home point=Teletransporti vin al via hejmo Teleported to home!=Teletransportita al hejmo! diff --git a/mods/sethome/locale/sethome.es.tr b/mods/sethome/locale/sethome.es.tr index 7c04ee3c..661bc621 100644 --- a/mods/sethome/locale/sethome.es.tr +++ b/mods/sethome/locale/sethome.es.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Puedes usar /sethome y /home Teleport you to your home point=Teletranspórtate a tu hogar Teleported to home!=¡Teletransportado a tu hogar! diff --git a/mods/sethome/locale/sethome.fr.tr b/mods/sethome/locale/sethome.fr.tr index 852621d6..d1af03b0 100644 --- a/mods/sethome/locale/sethome.fr.tr +++ b/mods/sethome/locale/sethome.fr.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Peut utiliser /sethome et /home Teleport you to your home point=Vous téléporter à votre domicile Teleported to home!=Téléporté à votre domicile ! diff --git a/mods/sethome/locale/sethome.id.tr b/mods/sethome/locale/sethome.id.tr index 1966978c..6193446d 100644 --- a/mods/sethome/locale/sethome.id.tr +++ b/mods/sethome/locale/sethome.id.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Boleh pakai /sethome dan /home Teleport you to your home point=Teleportasi ke rumah Anda Teleported to home!=Teleportasi ke rumah! diff --git a/mods/sethome/locale/sethome.it.tr b/mods/sethome/locale/sethome.it.tr index 6bdf11ca..4f1d7575 100644 --- a/mods/sethome/locale/sethome.it.tr +++ b/mods/sethome/locale/sethome.it.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Può usare /sethome e /home Teleport you to your home point=Ti teletrasporta al tuo punto di domicilio Teleported to home!=Teletrasportato a casa! diff --git a/mods/sethome/locale/sethome.ja.tr b/mods/sethome/locale/sethome.ja.tr index 3d636b59..e6523878 100644 --- a/mods/sethome/locale/sethome.ja.tr +++ b/mods/sethome/locale/sethome.ja.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=/sethomeと/homeが使えます Teleport you to your home point=ホーム地点にテレポートします Teleported to home!=ホームにテレポート！ diff --git a/mods/sethome/locale/sethome.jbo.tr b/mods/sethome/locale/sethome.jbo.tr index 90ac1a35..2fe7bf0d 100644 --- a/mods/sethome/locale/sethome.jbo.tr +++ b/mods/sethome/locale/sethome.jbo.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=kakne lo nu pilno lo me zoi gy./sethome.gy. ku .e lo me zoi gy./home.gy. Teleport you to your home point=sukmu'u lo do zdani mokca Teleported to home!=puba'o sukmu'u lo zdani diff --git a/mods/sethome/locale/sethome.ms.tr b/mods/sethome/locale/sethome.ms.tr index 7e9ec760..26a771c3 100644 --- a/mods/sethome/locale/sethome.ms.tr +++ b/mods/sethome/locale/sethome.ms.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Boleh guna /sethome dan /home Teleport you to your home point=Teleportasikan anda ke titik rumah anda Teleported to home!=Diteleportasikan ke rumah! diff --git a/mods/sethome/locale/sethome.pl.tr b/mods/sethome/locale/sethome.pl.tr index 981a8c45..b45cb463 100644 --- a/mods/sethome/locale/sethome.pl.tr +++ b/mods/sethome/locale/sethome.pl.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Może używać /sethome i /home Teleport you to your home point=Teleportuj się do swojego punktu domowego Teleported to home!=Teleportowano do punktu domowego diff --git a/mods/sethome/locale/sethome.pt_BR.tr b/mods/sethome/locale/sethome.pt_BR.tr index fe2c35c8..6abd416d 100644 --- a/mods/sethome/locale/sethome.pt_BR.tr +++ b/mods/sethome/locale/sethome.pt_BR.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Pode usar /sethome e /home Teleport you to your home point=Teletransportá-lo para seu ponto de origem Teleported to home!=Teletransportado para o ponto de origem! diff --git a/mods/sethome/locale/sethome.ru.tr b/mods/sethome/locale/sethome.ru.tr index 67388245..75b2d49b 100644 --- a/mods/sethome/locale/sethome.ru.tr +++ b/mods/sethome/locale/sethome.ru.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!=Эта команда может быть использована только в игре! Can use /sethome and /home=Возможность использовать /sethome и /home Teleport you to your home point=Вы телепортируетесь в свою домашнюю точку Teleported to home!=Вы телепортировались домой! diff --git a/mods/sethome/locale/sethome.sk.tr b/mods/sethome/locale/sethome.sk.tr index be5233ef..c0e6cee8 100644 --- a/mods/sethome/locale/sethome.sk.tr +++ b/mods/sethome/locale/sethome.sk.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Môžeš použivať /sethome a /home Teleport you to your home point=Teleportuj sa domov Teleported to home!=Teleportovaný domov! diff --git a/mods/sethome/locale/sethome.sv.tr b/mods/sethome/locale/sethome.sv.tr index 60673ae5..4e100b8b 100644 --- a/mods/sethome/locale/sethome.sv.tr +++ b/mods/sethome/locale/sethome.sv.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Kan använda /sethome och /home Teleport you to your home point=Teleportera dig till din hempunkt Teleported to home!=Teleporterad hem! diff --git a/mods/sethome/locale/sethome.uk.tr b/mods/sethome/locale/sethome.uk.tr index d8d4a8fc..a7e310ad 100644 --- a/mods/sethome/locale/sethome.uk.tr +++ b/mods/sethome/locale/sethome.uk.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home=Можливість використання /sethome та /home Teleport you to your home point=Ви телепортуєтесь у свою домашню точку Teleported to home!=Ви телепортувались додому! diff --git a/mods/sethome/locale/sethome.zh_CN.tr b/mods/sethome/locale/sethome.zh_CN.tr index 0af54ce7..6e05576b 100644 --- a/mods/sethome/locale/sethome.zh_CN.tr +++ b/mods/sethome/locale/sethome.zh_CN.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!=该指令只能在游戏内使用！ Can use /sethome and /home=可以使用/sethome和/home Teleport you to your home point=将您传送到家 Teleported to home!=已传送到家！ diff --git a/mods/sethome/locale/sethome.zh_TW.tr b/mods/sethome/locale/sethome.zh_TW.tr index 43e14aaa..c5e455cc 100644 --- a/mods/sethome/locale/sethome.zh_TW.tr +++ b/mods/sethome/locale/sethome.zh_TW.tr @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!=此指令僅能在游戲内使用！ Can use /sethome and /home=可以使用/sethome和/home Teleport you to your home point=傳送您到您家的地點 Teleported to home!=已傳送到家！ diff --git a/mods/sethome/locale/template.txt b/mods/sethome/locale/template.txt index d04bd50a..f91c719c 100644 --- a/mods/sethome/locale/template.txt +++ b/mods/sethome/locale/template.txt @@ -1,4 +1,5 @@ # textdomain: sethome +This command can only be executed in-game!= Can use /sethome and /home= Teleport you to your home point= Teleported to home!= diff --git a/mods/stairs/locale/stairs.ja.tr b/mods/stairs/locale/stairs.ja.tr index 73e2703c..02576cd6 100644 --- a/mods/stairs/locale/stairs.ja.tr +++ b/mods/stairs/locale/stairs.ja.tr @@ -1,145 +1,145 @@ # textdomain: stairs Glass Stair=ガラスの階段 -Glass Slab=ガラスのハーフブロック -Inner Glass Stair=へっこんだガラスの階段 -Outer Glass Stair=でっぱったガラスの階段 +Glass Slab=ガラスの厚板 +Inner Glass Stair=ガラスの凹階段 +Outer Glass Stair=ガラスの凸階段 Obsidian Glass Stair=黒曜石ガラスの階段 -Obsidian Glass Slab=黒曜石ガラスのハーフブロック -Inner Obsidian Glass Stair=へっこんだ黒曜石ガラスの階段 -Outer Obsidian Glass Stair=でっぱった黒曜石ガラスの階段 -Wooden Stair=木の階段 -Inner Wooden Stair=へっこんだ木の階段 -Outer Wooden Stair=でっぱった木の階段 -Wooden Slab=木のハーフブロック -Jungle Wood Stair=ジャングルの階段 -Inner Jungle Wood Stair=へっこんだジャングルの階段 -Outer Jungle Wood Stair=でっぱったジャングルの階段 -Jungle Wood Slab=ジャングルのハーフブロック -Pine Wood Stair=マツの木の階段 -Inner Pine Wood Stair=へっこんだマツの階段 -Outer Pine Wood Stair=でっぱったマツの階段 -Pine Wood Slab=マツのハーフブロック -Acacia Wood Stair=アカシアの階段 -Inner Acacia Wood Stair=へっこんだアカシアの階段 -Outer Acacia Wood Stair=でっぱったアカシアの階段 -Acacia Wood Slab=アカシアのハーフブロック -Aspen Wood Stair=ポプラの階段 -Inner Aspen Wood Stair=へっこんだポプラの階段 -Outer Aspen Wood Stair=でっぱったポプラの階段 -Aspen Wood Slab=ポプラのハーフブロック +Obsidian Glass Slab=黒曜石ガラスの厚板 +Inner Obsidian Glass Stair=黒曜石ガラスの凹階段 +Outer Obsidian Glass Stair=黒曜石ガラスの凸階段 +Wooden Stair=木製の階段 +Inner Wooden Stair=木製の凹階段 +Outer Wooden Stair=木製の凸階段 +Wooden Slab=木製の厚板 +Jungle Wood Stair=ジャングル材の階段 +Inner Jungle Wood Stair=ジャングル材の凹階段 +Outer Jungle Wood Stair=ジャングル材の凸階段 +Jungle Wood Slab=ジャングル材の厚板 +Pine Wood Stair=マツ材の階段 +Inner Pine Wood Stair=マツ材の凹階段 +Outer Pine Wood Stair=マツ材の凸階段 +Pine Wood Slab=マツ材の厚板 +Acacia Wood Stair=アカシア材の階段 +Inner Acacia Wood Stair=アカシア材の凹階段 +Outer Acacia Wood Stair=アカシア材の凸階段 +Acacia Wood Slab=アカシア材の厚板 +Aspen Wood Stair=ポプラ材の階段 +Inner Aspen Wood Stair=ポプラ材の凹階段 +Outer Aspen Wood Stair=ポプラ材の凸階段 +Aspen Wood Slab=ポプラ材の厚板 Stone Stair=石の階段 -Inner Stone Stair=へっこんだ石の階段 -Outer Stone Stair=でっぱった石の階段 -Stone Slab=石のハーフブロック +Inner Stone Stair=石の凹階段 +Outer Stone Stair=石の凸階段 +Stone Slab=石の厚板 Cobblestone Stair=丸石の階段 -Inner Cobblestone Stair=へっこんだ丸石の階段 -Outer Cobblestone Stair=でっぱった丸石の階段 -Cobblestone Slab=丸石のハーフブロック +Inner Cobblestone Stair=丸石の凹階段 +Outer Cobblestone Stair=丸石の凸階段 +Cobblestone Slab=丸石の厚板 Mossy Cobblestone Stair=苔むした丸石の階段 -Inner Mossy Cobblestone Stair=へっこんだ苔むした丸石の階段 -Outer Mossy Cobblestone Stair=でっぱった苔むした丸石の階段 -Mossy Cobblestone Slab=苔むした丸石のハーフブロック +Inner Mossy Cobblestone Stair=苔むした丸石の凹階段 +Outer Mossy Cobblestone Stair=苔むした丸石の凸階段 +Mossy Cobblestone Slab=苔むした丸石の厚板 Stone Brick Stair=石レンガの階段 -Inner Stone Brick Stair=へっこんだ石レンガの階段 -Outer Stone Brick Stair=でっぱった石レンガの階段 -Stone Brick Slab=石レンガのハーフブロック +Inner Stone Brick Stair=石レンガの凹階段 +Outer Stone Brick Stair=石レンガの凸階段 +Stone Brick Slab=石レンガの厚板 Stone Block Stair=石ブロックの階段 -Inner Stone Block Stair=へっこんだ石ブロックの階段 -Outer Stone Block Stair=でっぱった石ブロックの階段 -Stone Block Slab=石ブロックのハーフブロック +Inner Stone Block Stair=石ブロックの凹階段 +Outer Stone Block Stair=石ブロックの凸階段 +Stone Block Slab=石ブロックの厚板 Desert Stone Stair=砂漠の石の階段 -Inner Desert Stone Stair=へっこんだ砂漠の石の階段 -Outer Desert Stone Stair=でっぱった砂漠の石の階段 -Desert Stone Slab=砂漠の石のハーフブロック +Inner Desert Stone Stair=砂漠の石の凹階段 +Outer Desert Stone Stair=砂漠の石の凸階段 +Desert Stone Slab=砂漠の石の厚板 Desert Cobblestone Stair=砂漠の丸石の階段 -Inner Desert Cobblestone Stair=へっこんだ砂漠の丸石の階段 -Outer Desert Cobblestone Stair=でっぱった砂漠の丸石の階段 -Desert Cobblestone Slab=砂漠の丸石のハーフブロック +Inner Desert Cobblestone Stair=砂漠の丸石の凹階段 +Outer Desert Cobblestone Stair=砂漠の丸石の凸階段 +Desert Cobblestone Slab=砂漠の丸石の厚板 Desert Stone Brick Stair=砂漠の石レンガの階段 -Inner Desert Stone Brick Stair=へっこんだ砂漠の石レンガの階段 -Outer Desert Stone Brick Stair=でっぱった砂漠の石レンガの階段 -Desert Stone Brick Slab=砂漠の石レンガのハーフブロック +Inner Desert Stone Brick Stair=砂漠の石レンガの凹階段 +Outer Desert Stone Brick Stair=砂漠の石レンガの凸階段 +Desert Stone Brick Slab=砂漠の石レンガの厚板 Desert Stone Block Stair=砂漠の石ブロックの階段 -Inner Desert Stone Block Stair=へっこんだ砂漠の石ブロックの階段 -Outer Desert Stone Block Stair=でっぱった砂漠の石ブロックの階段 -Desert Stone Block Slab=砂漠の石ブロックのハーフブロック +Inner Desert Stone Block Stair=砂漠の石ブロックの凹階段 +Outer Desert Stone Block Stair=砂漠の石ブロックの凸階段 +Desert Stone Block Slab=砂漠の石ブロックの厚板 Sandstone Stair=砂岩の階段 -Inner Sandstone Stair=へっこんだ砂岩の階段 -Outer Sandstone Stair=でっぱった砂岩の階段 -Sandstone Slab=砂岩のハーフブロック +Inner Sandstone Stair=砂岩の凹階段 +Outer Sandstone Stair=砂岩の凸階段 +Sandstone Slab=砂岩の厚板 Sandstone Brick Stair=砂岩レンガの階段 -Inner Sandstone Brick Stair=へっこんだ砂岩レンガの階段 -Outer Sandstone Brick Stair=でっぱった砂岩レンガの階段 -Sandstone Brick Slab=砂岩レンガのハーフブロック +Inner Sandstone Brick Stair=砂岩レンガの凹階段 +Outer Sandstone Brick Stair=砂岩レンガの凸階段 +Sandstone Brick Slab=砂岩レンガの厚板 Sandstone Block Stair=砂岩ブロックの階段 -Inner Sandstone Block Stair=へっこんだ砂岩ブロックの階段 -Outer Sandstone Block Stair=でっぱった砂岩ブロックの階段 -Sandstone Block Slab=砂岩ブロックのハーフブロック +Inner Sandstone Block Stair=砂岩ブロックの凹階段 +Outer Sandstone Block Stair=砂岩ブロックの凸階段 +Sandstone Block Slab=砂岩ブロックの厚板 Desert Sandstone Stair=砂漠の砂岩の階段 -Inner Desert Sandstone Stair=へっこんだ砂漠の砂岩の階段 -Outer Desert Sandstone Stair=でっぱった砂漠の砂岩の階段 -Desert Sandstone Slab=砂漠の砂岩のハーフブロック +Inner Desert Sandstone Stair=砂漠の砂岩の凹階段 +Outer Desert Sandstone Stair=砂漠の砂岩の凸階段 +Desert Sandstone Slab=砂漠の砂岩の厚板 Desert Sandstone Brick Stair=砂漠の砂岩レンガの階段 -Inner Desert Sandstone Brick Stair=へっこんだ砂漠の砂岩レンガの階段 -Outer Desert Sandstone Brick Stair=でっぱった砂漠の砂岩レンガの階段 -Desert Sandstone Brick Slab=砂漠の砂岩レンガのハーフブロック +Inner Desert Sandstone Brick Stair=砂漠の砂岩レンガの凹階段 +Outer Desert Sandstone Brick Stair=砂漠の砂岩レンガの凸階段 +Desert Sandstone Brick Slab=砂漠の砂岩レンガの厚板 Desert Sandstone Block Stair=砂漠の砂岩ブロックの階段 -Inner Desert Sandstone Block Stair=へっこんだ砂漠の砂岩ブロックの階段 -Outer Desert Sandstone Block Stair=でっぱった砂漠の砂岩ブロックの階段 -Desert Sandstone Block Slab=砂漠の砂岩ブロックのハーフブロック -Silver Sandstone Stair=銀の砂岩の階段 -Inner Silver Sandstone Stair=へっこんだ銀の砂岩の階段 -Outer Silver Sandstone Stair=でっぱった銀の砂岩の階段 -Silver Sandstone Slab=銀の砂岩のハーフブロック -Silver Sandstone Brick Stair=銀の砂岩レンガの階段 -Inner Silver Sandstone Brick Stair=へっこんだ銀の砂岩レンガの階段 -Outer Silver Sandstone Brick Stair=でっぱった銀の砂岩レンガの階段 -Silver Sandstone Brick Slab=銀の砂岩レンガのハーフブロック -Silver Sandstone Block Stair=銀の砂岩ブロックの階段 -Inner Silver Sandstone Block Stair=へっこんだ銀の砂岩ブロックの階段 -Outer Silver Sandstone Block Stair=でっぱった銀の砂岩ブロックの階段 -Silver Sandstone Block Slab=銀の砂岩ブロックのハーフブロック +Inner Desert Sandstone Block Stair=砂漠の砂岩ブロックの凹階段 +Outer Desert Sandstone Block Stair=砂漠の砂岩ブロックの凸階段 +Desert Sandstone Block Slab=砂漠の砂岩ブロックの厚板 +Silver Sandstone Stair=銀色の砂岩の階段 +Inner Silver Sandstone Stair=銀色の砂岩の凹階段 +Outer Silver Sandstone Stair=銀色の砂岩の凸階段 +Silver Sandstone Slab=銀色の砂岩の厚板 +Silver Sandstone Brick Stair=銀色の砂岩レンガの階段 +Inner Silver Sandstone Brick Stair=銀色の砂岩レンガの凹階段 +Outer Silver Sandstone Brick Stair=銀色の砂岩レンガの凸階段 +Silver Sandstone Brick Slab=銀色の砂岩レンガの厚板 +Silver Sandstone Block Stair=銀色の砂岩ブロックの階段 +Inner Silver Sandstone Block Stair=銀色の砂岩ブロックの凹階段 +Outer Silver Sandstone Block Stair=銀色の砂岩ブロックの凸階段 +Silver Sandstone Block Slab=銀色の砂岩ブロックの厚板 Obsidian Stair=黒曜石の階段 -Inner Obsidian Stair=へっこんだ黒曜石の階段 -Outer Obsidian Stair=でっぱった黒曜石の階段 -Obsidian Slab=黒曜石のハーフブロック +Inner Obsidian Stair=黒曜石の凹階段 +Outer Obsidian Stair=黒曜石の凸階段 +Obsidian Slab=黒曜石の厚板 Obsidian Brick Stair=黒曜石レンガの階段 -Inner Obsidian Brick Stair=へっこんだ黒曜石レンガの階段 -Outer Obsidian Brick Stair=でっぱった黒曜石レンガの階段 -Obsidian Brick Slab=黒曜石レンガのハーフブロック +Inner Obsidian Brick Stair=黒曜石レンガの凹階段 +Outer Obsidian Brick Stair=黒曜石レンガの凸階段 +Obsidian Brick Slab=黒曜石レンガの厚板 Obsidian Block Stair=黒曜石ブロックの階段 -Inner Obsidian Block Stair=へっこんだ黒曜石ブロックの階段 -Outer Obsidian Block Stair=でっぱった黒曜石ブロックの階段 -Obsidian Block Slab=黒曜石ブロックのハーフブロック +Inner Obsidian Block Stair=黒曜石ブロックの凹階段 +Outer Obsidian Block Stair=黒曜石ブロックの凸階段 +Obsidian Block Slab=黒曜石ブロックの厚板 Brick Stair=レンガの階段 -Inner Brick Stair=へっこんだレンガの階段 -Outer Brick Stair=でっぱったレンガの階段 -Brick Slab=レンガのハーフブロック +Inner Brick Stair=レンガの凹階段 +Outer Brick Stair=レンガの凸階段 +Brick Slab=レンガの厚板 Steel Block Stair=鉄ブロックの階段 -Inner Steel Block Stair=へっこんだ鉄ブロックの階段 -Outer Steel Block Stair=でっぱった鉄ブロックの階段 -Steel Block Slab=鉄ブロックのハーフブロック +Inner Steel Block Stair=鉄ブロックの凹階段 +Outer Steel Block Stair=鉄ブロックの凸階段 +Steel Block Slab=鉄ブロックの厚板 Tin Block Stair=スズの階段 -Inner Tin Block Stair=へっこんだスズの階段 -Outer Tin Block Stair=でっぱったスズの階段 -Tin Block Slab=スズのハーフブロック +Inner Tin Block Stair=スズの凹階段 +Outer Tin Block Stair=スズの凸階段 +Tin Block Slab=スズの厚板 Copper Block Stair=銅ブロックの階段 -Inner Copper Block Stair=へっこんだ銅ブロックの階段 -Outer Copper Block Stair=でっぱった銅ブロックの階段 -Copper Block Slab=銅ブロックのハーフブロック +Inner Copper Block Stair=銅ブロックの凹階段 +Outer Copper Block Stair=銅ブロックの凸階段 +Copper Block Slab=銅ブロックの厚板 Bronze Block Stair=青銅ブロックの階段 -Inner Bronze Block Stair=へっこんだ青銅ブロックの階段 -Outer Bronze Block Stair=でっぱった青銅ブロックの階段 -Bronze Block Slab=青銅ブロックのハーフブロック +Inner Bronze Block Stair=青銅ブロックの凹階段 +Outer Bronze Block Stair=青銅ブロックの凸階段 +Bronze Block Slab=青銅ブロックの厚板 Gold Block Stair=金ブロックの階段 -Inner Gold Block Stair=へっこんだ金ブロックの階段 -Outer Gold Block Stair=でっぱった金ブロックの階段 -Gold Block Slab=金ブロックのハーフブロック +Inner Gold Block Stair=金ブロックの凹階段 +Outer Gold Block Stair=金ブロックの凸階段 +Gold Block Slab=金ブロックの厚板 Ice Stair=氷の階段 -Inner Ice Stair=へっこんだ氷の階段 -Outer Ice Stair=でっぱった氷の階段 -Ice Slab=氷のハーフブロック +Inner Ice Stair=氷の凹階段 +Outer Ice Stair=氷の凸階段 +Ice Slab=氷の厚板 Snow Block Stair=雪の階段 -Inner Snow Block Stair=へっこんだ雪の階段 -Outer Snow Block Stair=でっぱった雪の階段 -Snow Block Slab=雪のハーフブロック +Inner Snow Block Stair=雪の凹階段 +Outer Snow Block Stair=雪の凸階段 +Snow Block Slab=雪の厚板 diff --git a/mods/walls/init.lua b/mods/walls/init.lua index b2a163fc..120f65fa 100644 --- a/mods/walls/init.lua +++ b/mods/walls/init.lua @@ -45,6 +45,12 @@ walls.register = function(wall_name, wall_desc, wall_texture_table, wall_mat, wa }) -- crafting recipe + -- HACK: + -- Walls have no crafts, when register new wall via API from another mod, but in the same namespace (`walls`). + -- So we should remove `":"` at the beginning of the name. + if wall_name:sub(1, 1) == ":" then + wall_name = wall_name:sub(2) + end minetest.register_craft({ output = wall_name .. " 6", recipe = { diff --git a/mods/walls/locale/walls.ja.tr b/mods/walls/locale/walls.ja.tr index 66e497d0..c907aed5 100644 --- a/mods/walls/locale/walls.ja.tr +++ b/mods/walls/locale/walls.ja.tr @@ -1,4 +1,4 @@ # textdomain: walls -Cobblestone Wall=丸石の壁 -Mossy Cobblestone Wall=苔むした丸石の壁 -Desert Cobblestone Wall=砂漠の丸石の壁 +Cobblestone Wall=丸石の塀 +Mossy Cobblestone Wall=苔むした丸石の塀 +Desert Cobblestone Wall=砂漠の丸石の塀 diff --git a/mods/wool/init.lua b/mods/wool/init.lua index 4cf7dc3a..87bd4274 100644 --- a/mods/wool/init.lua +++ b/mods/wool/init.lua @@ -8,19 +8,21 @@ local dyes = dye.dyes for i = 1, #dyes do local name, desc = unpack(dyes[i]) + local color_group = "color_" .. name + minetest.register_node("wool:" .. name, { description = S(desc .. " Wool"), tiles = {"wool_" .. name .. ".png"}, is_ground_content = false, groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, - flammable = 3, wool = 1}, + flammable = 3, wool = 1, [color_group] = 1}, sounds = default.node_sound_defaults(), }) minetest.register_craft{ type = "shapeless", output = "wool:" .. name, - recipe = {"group:dye,color_" .. name, "group:wool"}, + recipe = {"group:dye," .. color_group, "group:wool"}, } end diff --git a/mods/wool/locale/wool.id.tr b/mods/wool/locale/wool.id.tr index 2448e436..603277fd 100644 --- a/mods/wool/locale/wool.id.tr +++ b/mods/wool/locale/wool.id.tr @@ -13,4 +13,4 @@ Brown Wool=Wol Cokelat Orange Wool=Wol Oranye Red Wool=Wol Merah Magenta Wool=Wol Magenta -Pink Wool=Wol Merah Jambu +Pink Wool=Wol Merah Muda