Skip to content

Commit

Permalink
merge 1.19.x
Browse files Browse the repository at this point in the history
  • Loading branch information
PssbleTrngle committed Mar 15, 2024
2 parents fb59ade + 189103a commit ebf1d9a
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Analyze
on:
push:
branches: [1.20.x]
branches: ["[0-9]+.[0-9]+.x"]

jobs:
build:
Expand Down
25 changes: 20 additions & 5 deletions src/main/resources/assets/create_jetpack/lang/ko_kr.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
{
"block.create_jetpack.jetpack": "제트팩",
"block.create_jetpack.netherite_jetpack": "네더라이트 제트팩",
"item.create_jetpack.jetpack": "제트팩",
"item.create_jetpack.jetpack.tooltip": "",
"item.create_jetpack.jetpack.tooltip.summary": "가압된 공기를 사용하여 비행 기능을 제공합니다",
"item.create_jetpack.jetpack.tooltip.control1": "[점프]를 눌러서",
"item.create_jetpack.jetpack.tooltip.action1": "상승",
"item.create_jetpack.jetpack.tooltip.control2": "[SHIFT]를 눌러서",
"item.create_jetpack.jetpack.tooltip.action2": "하강",
"item.create_jetpack.jetpack.tooltip.control3": "[G]로",
"item.create_jetpack.jetpack.tooltip.action3": "엔진 켜기/끄기",
"item.create_jetpack.jetpack.tooltip.action4": "호버 모드 켜기/끄기",
"item.create_jetpack.jetpack.tooltip.control1": "[점프]를 눌러서",
"item.create_jetpack.jetpack.tooltip.control2": "[SHIFT]를 눌러서",
"item.create_jetpack.jetpack.tooltip.control3": "[G]로",
"item.create_jetpack.jetpack.tooltip.control4": "[H]로",
"item.create_jetpack.jetpack.tooltip.action4": "호버 모드 켜기/끄기"
"item.create_jetpack.jetpack.tooltip.summary": "가압된 공기를 사용하여 비행 기능을 제공합니다",
"item.create_jetpack.jetpack_placeable": "제트팩",
"item.create_jetpack.netherite_jetpack": "네더라이트 제트팩",
"item.create_jetpack.netherite_jetpack.tooltip": "",
"item.create_jetpack.netherite_jetpack.tooltip.action1": "상승",
"item.create_jetpack.netherite_jetpack.tooltip.action2": "하강",
"item.create_jetpack.netherite_jetpack.tooltip.action3": "엔진 켜기/끄기",
"item.create_jetpack.netherite_jetpack.tooltip.action4": "호버 모드 켜기/끄기",
"item.create_jetpack.netherite_jetpack.tooltip.control1": "[점프]를 눌러서",
"item.create_jetpack.netherite_jetpack.tooltip.control2": "[SHIFT]를 눌러서",
"item.create_jetpack.netherite_jetpack.tooltip.control3": "[G]를 눌러서",
"item.create_jetpack.netherite_jetpack.tooltip.control4": "[H]를 눌러서",
"item.create_jetpack.netherite_jetpack.tooltip.summary": "가압된 공기를 사용하여 비행 기능을 제공합니다",
"item.create_jetpack.netherite_jetpack_placeable": "네더라이트 제트팩"
}
28 changes: 22 additions & 6 deletions src/main/resources/assets/create_jetpack/lang/ru_ru.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
{
"block.create_jetpack.jetpack": "Реактивный ранец",
"block.create_jetpack.netherite_jetpack": "Незеритовый реактивный ранец",
"item.create_jetpack.jetpack": "Реактивный ранец",
"item.create_jetpack.jetpack.tooltip": "РЕАКТИВНЫЙ РАНЕЦ",
"item.create_jetpack.jetpack.tooltip.summary": "Позволяет летать с помощью сжатого воздуха",
"item.create_jetpack.jetpack.tooltip.control1": "Нажмите [ПРЫЖОК]",
"item.create_jetpack.jetpack.tooltip.action1": "Полёт вверх",
"item.create_jetpack.jetpack.tooltip.control2": "Нажмите [SHIFT]",
"item.create_jetpack.jetpack.tooltip.action2": "Полёт вниз",
"item.create_jetpack.jetpack.tooltip.control3": "Нажмите [G]",
"item.create_jetpack.jetpack.tooltip.action3": "Включение/выключение реактивного ранца",
"item.create_jetpack.jetpack.tooltip.action4": "Включение/выключение режима наведения",
"item.create_jetpack.jetpack.tooltip.control1": "Нажмите [ПРЫЖОК]",
"item.create_jetpack.jetpack.tooltip.control2": "Нажмите [SHIFT]",
"item.create_jetpack.jetpack.tooltip.control3": "Нажмите [G]",
"item.create_jetpack.jetpack.tooltip.control4": "Нажмите [H]",
"item.create_jetpack.jetpack.tooltip.action4": "Включение/выключение режима наведения"
}
"item.create_jetpack.jetpack.tooltip.summary": "Позволяет летать с помощью сжатого воздуха.",
"item.create_jetpack.jetpack_placeable": "Размещаемый реактивный ранец",
"item.create_jetpack.netherite_jetpack": "Незеритовый реактивный ранец",
"item.create_jetpack.netherite_jetpack.tooltip": "НЕЗЕРИТОВЫЙ РЕАКТИВНЫЙ РАНЕЦ",
"item.create_jetpack.netherite_jetpack.tooltip.action1": "Полёт вверх",
"item.create_jetpack.netherite_jetpack.tooltip.action2": "Полёт вниз",
"item.create_jetpack.netherite_jetpack.tooltip.action3": "Включение/выключение реактивного ранца",
"item.create_jetpack.netherite_jetpack.tooltip.action4": "Включение/выключение режима наведения",
"item.create_jetpack.netherite_jetpack.tooltip.control1": "Нажмите [ПРЫЖОК]",
"item.create_jetpack.netherite_jetpack.tooltip.control2": "Нажмите [SHIFT]",
"item.create_jetpack.netherite_jetpack.tooltip.control3": "Нажмите [G]",
"item.create_jetpack.netherite_jetpack.tooltip.control4": "Нажмите [H]",
"item.create_jetpack.netherite_jetpack.tooltip.summary": "Позволяет летать с помощью сжатого воздуха.",
"item.create_jetpack.netherite_jetpack_placeable": "Размещаемый незеритовый реактивный ранец",
"key.categories.movement.jetpack": "Create: Jetpack"
}

0 comments on commit ebf1d9a

Please sign in to comment.