Skip to content

Commit

Permalink
Merge branch 'ReactiveDrop:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Duke-M-commits authored Oct 15, 2024
2 parents d21e0c3 + bfd7edd commit 5441e05
Show file tree
Hide file tree
Showing 176 changed files with 23,573 additions and 20,328 deletions.
27 changes: 24 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@ jobs:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}

# setup go
- uses: actions/setup-go@v3
with:
go-version: '^1.17'

# byte order mark
- name: Byte order mark check
working-directory: utils
run: |
go run . -fix-bom-only
- name: Renormalize line endings if needed
continue-on-error: true
uses: EndBug/add-and-commit@v9
Expand All @@ -36,17 +47,27 @@ jobs:
default_author: github_actions
add: '. --renormalize'

# setup go
- uses: actions/setup-go@v3
- name: Check if rendered files are changed
id: changed-rendered-files
uses: tj-actions/changed-files@v45
with:
go-version: '^1.17'
files: |
achievements/*.vdf
rich_presence/*.vdf
# build PR
- name: Build translations
working-directory: utils
if: steps.changed-rendered-files.outputs.test_any_changed != 'true'
run: |
go run .
- name: Build translations and rendered files
working-directory: utils
if: steps.changed-rendered-files.outputs.test_any_changed == 'true'
run: |
go run . -render
# check for unwanted differences from commit
- name: Check for unintended changes
run: |
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Use an editor to make your changes and integrate them through github. Read more

## File encoding
Make sure your text editor preserves file encodings.
New files need to have the same encoding as their english counterparts (eg. labsmail1_czech.txt needs to be UTF-8 encoded just like labsmail1_english.txt). If you use Notepad++ you can see the file's encoding in the menu Encoding. Visual Studio Code shows the files encoding in its status bar.
New files need to have the same encoding as their english counterparts (eg. labsmail1_czech.txt needs to be UTF-8 encoded just like labsmail1_english.txt). If you use Notepad++ you can see the file's encoding in the menu Encoding. Visual Studio Code shows the files encoding in its status bar. Most files use UTF-8 with BOM.

## Special characters and placeholders
Quotation marks inside your translations need to be escaped like this `\"Space Station\"`.
Expand Down
160 changes: 24 additions & 136 deletions PROGRESS.md

Large diffs are not rendered by default.

278 changes: 139 additions & 139 deletions achievements/563560_loc_brazilian.vdf

Large diffs are not rendered by default.

792 changes: 396 additions & 396 deletions achievements/563560_loc_indonesian.vdf

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions achievements/563560_loc_koreana.vdf
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"NEW_ACHIEVEMENT_147_10_NAME" "성난 말벌처럼"
"NEW_ACHIEVEMENT_147_10_DESC" "집중 유도탄을 이용해 외계 무리 100마리를 죽이십시오."
"NEW_ACHIEVEMENT_147_11_NAME" "전략적 폭파 전문가"
"NEW_ACHIEVEMENT_147_11_DESC" "채광 레이저를 이용해 외계 무리 100마리를 죽이십시오."
"NEW_ACHIEVEMENT_147_11_DESC" "레이저 감지식 지뢰를 이용해 외계 무리 100마리를 죽이십시오."
"NEW_ACHIEVEMENT_147_12_NAME" "불지옥은 내가 내린다"
"NEW_ACHIEVEMENT_147_12_DESC" "소이 지뢰를 이용해 외계 무리 100마리를 죽이십시오."
"NEW_ACHIEVEMENT_147_13_NAME" "무기고 출입증"
Expand Down Expand Up @@ -295,24 +295,24 @@
"NEW_ACHIEVEMENT_1517_5_DESC" "중형 돌격 소총으로 500의 외계 무리를 사살하십시오."
"NEW_ACHIEVEMENT_1517_6_NAME" "전투 의무병"
"NEW_ACHIEVEMENT_1517_6_DESC" "치료용 기관단총으로 500의 외계 무리를 사살하십시오."
"NEW_ACHIEVEMENT_1517_7_NAME" "쉬운 캠페인: 남 휴머니움"
"NEW_ACHIEVEMENT_1517_7_DESC" "쉬움 난이도 이상에서 남 휴머니움 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_8_NAME" "보통 캠페인: 남 휴머니움"
"NEW_ACHIEVEMENT_1517_8_DESC" "보통 난이도 이상에서 남 휴머니움 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_9_NAME" "어려움 캠페인: 남 휴머니움"
"NEW_ACHIEVEMENT_1517_9_DESC" "어려움 난이도 이상에서 남 휴머니움 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_10_NAME" "광란 캠페인: 남 휴머니움"
"NEW_ACHIEVEMENT_1517_10_DESC" "광란 난이도 이상에서 남 휴머니움 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_11_NAME" "잔혹함 캠페인: 남 휴머니움"
"NEW_ACHIEVEMENT_1517_11_DESC" "잔혹함 난이도에서 남 휴머니움 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_7_NAME" "쉬운 캠페인: 남 휴머넘"
"NEW_ACHIEVEMENT_1517_7_DESC" "쉬움 난이도 이상에서 남 휴머넘 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_8_NAME" "보통 캠페인: 남 휴머넘"
"NEW_ACHIEVEMENT_1517_8_DESC" "보통 난이도 이상에서 남 휴머넘 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_9_NAME" "어려움 캠페인: 남 휴머넘"
"NEW_ACHIEVEMENT_1517_9_DESC" "어려움 난이도 이상에서 남 휴머넘 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_10_NAME" "광란 캠페인: 남 휴머넘"
"NEW_ACHIEVEMENT_1517_10_DESC" "광란 난이도 이상에서 남 휴머넘 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_11_NAME" "잔혹함 캠페인: 남 휴머넘"
"NEW_ACHIEVEMENT_1517_11_DESC" "잔혹함 난이도에서 남 휴머넘 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_12_NAME" "물류 지역 스피드 런"
"NEW_ACHIEVEMENT_1517_12_DESC" "보통 난이도 이상에서 단 한 명의 해병도 전사하는 일 없이 물류 지역을 1:15 이내에 주파하십시오."
"NEW_ACHIEVEMENT_1517_13_NAME" "플렛폼 XVII 스피드 런"
"NEW_ACHIEVEMENT_1517_13_DESC" "보통 난이도 이상에서 단 한 명의 해병도 전사하는 일 없이 플렛폼 XVII을 3:10 이내에 주파하십시오."
"NEW_ACHIEVEMENT_1517_14_NAME" "지상 작업 연구소 스피드 런"
"NEW_ACHIEVEMENT_1517_14_DESC" "보통 난이도 이상에서 단 한 명의 해병도 전사하는 일 없이 지상 작업 연구소를 2:25 이내에 주파하십시오."
"NEW_ACHIEVEMENT_1517_15_NAME" "뛰어난 수행: 남 휴머니움"
"NEW_ACHIEVEMENT_1517_15_DESC" "보통 난이도 이상에서 단 한 명의 해병도 전사하는 일 없이 남 휴머니움 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_15_NAME" "뛰어난 수행: 남 휴머넘"
"NEW_ACHIEVEMENT_1517_15_DESC" "보통 난이도 이상에서 단 한 명의 해병도 전사하는 일 없이 남 휴머넘 작전을 완료하십시오."
"NEW_ACHIEVEMENT_1517_16_NAME" "진보의 선택"
"NEW_ACHIEVEMENT_1517_16_DESC" "지상 작업 연구소에서, 금지된 데이터를 선박에 업로드하십시오."
"NEW_ACHIEVEMENT_1517_17_NAME" "쉬운 캠페인: 바이오젠 공업"
Expand Down Expand Up @@ -374,7 +374,7 @@
"NEW_ACHIEVEMENT_2557_27_NAME" "세계 여행자"
"NEW_ACHIEVEMENT_2557_27_DESC" "해병대 학교의 각 구역 (로비 제외) 을 정확히 한 번 방문하십시오."
"NEW_ACHIEVEMENT_2557_28_NAME" "시간 낭비 금지"
"NEW_ACHIEVEMENT_2557_28_DESC" "실험실 폐허에서, Muon Gem 보스를 세 번의 공격으로 물리치십시오."
"NEW_ACHIEVEMENT_2557_28_DESC" "실험실 폐허에서, 뮤온 젬 보스를 세 번의 공격으로 물리치십시오."
"NEW_ACHIEVEMENT_2557_29_NAME" "쉬운 캠페인: 하락"
"NEW_ACHIEVEMENT_2557_29_DESC" "쉬움 난이도 이상에서 하락 작전을 완료하십시오."
"NEW_ACHIEVEMENT_2557_30_NAME" "보통 캠페인: 하락"
Expand Down
Loading

0 comments on commit 5441e05

Please sign in to comment.