Skip to content

Commit

Permalink
Merge branch 'main' into pr/tadeu2/2499
Browse files Browse the repository at this point in the history
# Conflicts:
#	localization/i18n/OrcaSlicer.pot
#	localization/i18n/cs/OrcaSlicer_cs.po
#	localization/i18n/de/OrcaSlicer_de.po
#	localization/i18n/en/OrcaSlicer_en.po
#	localization/i18n/es/OrcaSlicer_es.po
#	localization/i18n/fr/OrcaSlicer_fr.po
#	localization/i18n/hu/OrcaSlicer_hu.po
#	localization/i18n/it/OrcaSlicer_it.po
#	localization/i18n/ja/OrcaSlicer_ja.po
#	localization/i18n/ko/OrcaSlicer_ko.po
#	localization/i18n/nl/OrcaSlicer_nl.po
#	localization/i18n/ru/OrcaSlicer_ru.po
#	localization/i18n/sv/OrcaSlicer_sv.po
#	localization/i18n/tr/OrcaSlicer_tr.po
#	localization/i18n/uk/OrcaSlicer_uk.po
#	localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
#	localization/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	src/libslic3r/GCode/GCodeProcessor.cpp
  • Loading branch information
SoftFever committed Oct 24, 2023
2 parents 476a7d6 + dcb23ab commit df64575
Show file tree
Hide file tree
Showing 31 changed files with 5,305 additions and 1,966 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build_orca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ jobs:
- name: Install nsis
if: matrix.os == 'windows-latest'
run: |
dir "C:/Program Files (x86)/Windows Kits/10/Include"
choco install nsis
- name: download deps
Expand Down
Loading

0 comments on commit df64575

Please sign in to comment.