Merge remote-tracking branch 'upstream/master'

2020-08-19 21:24:25 +02:00 · 2020-08-19 21:24:25 +02:00 · 7be2f3bd63
parent ca10e7e1f6 fd1807e746
commit 7be2f3bd63
3 changed files with 16 additions and 13 deletions
--- a/locale/template.txt
+++ b/locale/template.txt
@ -14,6 +14,7 @@ Dungeon Master =
 Lava Flan =
 Lava orb =
 Lava Pickaxe =
+Obsidian Flan =

 #mese_monster.lua
 Mese Monster =
--- a/locale/zh_CN.txt
+++ b/locale/zh_CN.txt
@ -14,6 +14,7 @@ Dungeon Master = 地穴之主
 Lava Flan = 岩浆饼
 Lava orb = 岩浆球
 Lava Pickaxe = 岩浆镐
+Obsidian Flan = 黑耀石饼

 #mese_monster.lua
 Mese Monster = 黄石怪
--- a/locale/zh_TW.txt
+++ b/locale/zh_TW.txt
@ -14,6 +14,7 @@ Dungeon Master = 地穴之主
 Lava Flan = 岩漿餅
 Lava orb = 岩漿球
 Lava Pickaxe = 岩漿鎬
+Obsidian Flan = 黑耀石餅

 #mese_monster.lua
 Mese Monster = 黃石怪