Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.21.3' into 1.21.3
Browse files Browse the repository at this point in the history
  • Loading branch information
BlayTheNinth committed Nov 25, 2024
2 parents f9f8c3a + 5ce4f8e commit 38154f4
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 0 deletions.
33 changes: 33 additions & 0 deletions common/src/main/resources/assets/balm/lang/ru_ru.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"tag.item.c.dyes.black": "Черный краситель",
"tag.item.c.dyes.blue": "Синий краситель",
"tag.item.c.dyes.brown": "Коричневый краситель",
"tag.item.c.dyes.cyan": "Бирюзовый краситель",
"tag.item.c.dyes.gray": "Серый краситель",
"tag.item.c.dyes.green": "Зеленый краситель",
"tag.item.c.dyes.light_blue": "Голубой краситель",
"tag.item.c.dyes.light_gray": "Светло-серый краситель",
"tag.item.c.dyes.lime": "Лаймовый краситель",
"tag.item.c.dyes.magenta": "Пурпурный краситель",
"tag.item.c.dyes.orange": "Оранжевый краситель",
"tag.item.c.dyes.pink": "Розовый краситель",
"tag.item.c.dyes.purple": "Фиолетовый краситель",
"tag.item.c.dyes.red": "Красный краситель",
"tag.item.c.dyes.white": "Белый краситель",
"tag.item.c.dyes.yellow": "Желтый краситель",
"tag.item.c.cooking_oil": "Кулинарное масло",
"tag.item.c.gems.diamond": "Алмазы",
"tag.item.c.dyes": "Красители",
"tag.item.c.eggs": "Яйца",
"tag.item.c.gems.emerald": "Изумруды",
"tag.item.c.gems": "Самоцветы",
"tag.item.c.nuggets.gold": "Золотые самородки",
"tag.item.c.ingots": "Слитки",
"tag.item.c.ingots.iron": "Железные слитки",
"tag.item.c.nuggets.iron": "Железные самородки",
"tag.item.c.nuggets": "Самородки",
"tag.item.c.ores": "Руды",
"tag.item.c.stones": "Камни",
"tag.item.c.chests.chests": "Деревянные сундуки",
"tag.item.c.rods.wooden": "Деревянные палки"
}
45 changes: 45 additions & 0 deletions common/src/main/resources/assets/balm/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"tag.item.c.dyes.black": "黑色染料",
"tag.item.c.dyes.blue": "蓝色染料",
"tag.item.c.dyes.brown": "棕色染料",
"tag.item.c.dyes.cyan": "青色染料",
"tag.item.c.dyes.gray": "灰色染料",
"tag.item.c.dyes.green": "绿色染料",
"tag.item.c.dyes.light_blue": "淡蓝色染料",
"tag.item.c.dyes.light_gray": "淡灰色染料",
"tag.item.c.dyes.lime": "黄绿色染料",
"tag.item.c.dyes.magenta": "品红色染料",
"tag.item.c.dyes.orange": "橙色染料",
"tag.item.c.dyes.pink": "粉红色染料",
"tag.item.c.dyes.purple": "紫色染料",
"tag.item.c.dyes.red": "红色染料",
"tag.item.c.dyes.white": "白色染料",
"tag.item.c.dyes.yellow": "黄色染料",
"tag.item.c.cooking_oil": "食用油",
"tag.item.c.gems.diamond": "钻石",
"tag.item.c.dyes": "染料",
"tag.item.c.eggs": "鸡蛋",
"tag.item.c.gems.emerald": "绿宝石",
"tag.item.c.gems": "宝石",
"tag.item.c.nuggets.gold": "金粒",
"tag.item.c.ingots": "金属锭",
"tag.item.c.ingots.iron": "铁锭",
"tag.item.c.nuggets.iron": "铁粒",
"tag.item.c.nuggets": "金属粒",
"tag.item.c.ores": "矿石",
"tag.item.c.stones": "石头",
"tag.item.c.chests.chests": "木箱子",
"tag.item.c.rods.wooden": "木棍",
"config.balm.exampleBoolean": "样例布尔类",
"config.balm.exampleInt": "样例整数类",
"config.balm.exampleString": "样例字符串类",
"config.balm.exampleMultilineString": "样例多行字符串类",
"config.balm.exampleEnum": "样例枚举类",
"config.balm.exampleStringList": "样例字符串列表类",
"config.balm.exampleResourceLocationSet": "样例资源路径类",
"config.balm.exampleIntList": "样例整数列表类",
"config.balm.exampleEnumList": "样例枚举列表类",
"config.balm.exampleCategory.innerField": "样例内部类",
"config.balm.exampleCategory.exampleFloat": "样例浮点数类",
"balm.configuration.exampleCategory": "样例分类"
}

0 comments on commit 38154f4

Please sign in to comment.