mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 00:27:28 +08:00

Go to file

c.lamboo 61aff1756e Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter

# Conflicts:
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po

2023-03-15 12:50:29 +01:00

.github

Revert "Upload CCI packages"

2023-03-13 11:50:02 +01:00

.run_templates

Moved pycharm_targets to conandata

2022-08-11 18:01:45 +02:00

cura

Merge remote-tracking branch 'origin/5.3'

2023-03-06 23:13:21 +01:00

docs

Moved PR template to .github

2023-01-07 14:45:51 +01:00

packaging

Pass the app name into the build_macos script so that it matches the app name used in UltiMaker-Cura.spec.jinja

2023-01-16 15:29:38 +01:00

plugins

Update copy in pause at height to reflect that the first layer is 0

2023-03-15 10:42:07 +01:00

printer-linter

Ignore redundant-override in the machine_* types

2023-01-10 11:02:08 +01:00

resources

Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter

2023-03-15 12:50:29 +01:00

scripts

Remove unused scripts

2023-01-20 11:49:34 +01:00

tests

Update extrudermanager in tests to mock Application.

2022-12-12 14:06:45 +01:00

.gitignore

Update gitignore with python build files

2022-11-20 12:38:22 +01:00

.printer-linter

Ignore redundant-override in the machine_* types

2023-01-10 11:02:08 +01:00

.pylintrc

…

CITATION.cff

improve CITATION.cff formatting && add keywords

2022-10-20 08:58:10 +02:00

CMakeLists.txt

Add CMakeLists.txt back for translation scripts.

2022-09-06 10:25:14 +02:00

conandata.yml

Merge branch '5.3'

2023-02-23 13:41:00 +01:00

conanfile.py

Merge branch '5.3'

2023-03-08 13:25:22 +01:00

contributing.md

Add link to style guide

2022-07-28 11:18:16 +02:00

cura_app.py

Merge branch '4.13' of github.com:Ultimaker/Cura

2022-05-17 15:32:48 +02:00

cura-logo-dark.PNG

Update README.md, use dark mode or light mode image depending on github theme.

2022-08-24 14:59:18 +02:00

cura-logo.PNG

Update README.md, use dark mode or light mode image depending on github theme.

2022-08-24 14:59:18 +02:00

cura.sharedmimeinfo

…

CuraVersion.py.jinja

Update copyright using UltiMaker

2022-11-28 10:48:38 +01:00

LICENSE

…

pytest.ini

Re-add pytest.ini

2022-09-08 13:15:37 +02:00

README.md

One of us... One of us...

2023-03-10 09:17:46 +01:00

requirements-dev.txt

Bumped up pyinstaller version

2023-02-23 13:24:30 +01:00

requirements-ultimaker.txt

use new master/s-line as tip

2022-10-16 18:00:31 +02:00

requirements.txt

Bump up pyclipper to same version used by Uranium

2023-02-21 07:51:24 +01:00

SECURITY.md

…

UltiMaker-Cura.spec.jinja

Pass the app name into the build_macos script so that it matches the app name used in UltiMaker-Cura.spec.jinja

2023-01-16 15:29:38 +01:00

README.md

Work with us!

If you're interested in working with us on Cura and Thingiverse, please apply to one of the open positions below.

Software Engineer C++ & Python for Cura

DevOps Engineer Community Software for Cura and Thingiverse

QA / Test Engineer Cura (3D printing) for Cura and Thingiverse