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

Go to file

Joey de l'Arago a70e212124 Merge branch 'main' into updated_elegoo_definitions

# Conflicts:
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg
#	resources/quality/elegoo/base/abs040/abs_040024.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg
#	resources/quality/elegoo/base/asa040/asa_040024.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg
#	resources/quality/elegoo/base/petg040/petg_040028.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040012.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040016.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040020.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040024.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040028.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg

2023-04-11 19:07:27 +02:00

.github

Run conan profile detection after switching compiler

2023-04-08 10:25:51 +02:00

.run_templates

Moved pycharm_targets to conandata

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

cura

Bump up setting version to 22

2023-03-31 07:24:43 +02:00

docs

Moved PR template to .github

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

packaging

Change Shebang from Bourne to Bash

2023-03-22 07:27:36 +01:00

plugins

Merge pull request #15092 from Ultimaker/5.3

2023-03-30 15:07:45 +00:00

printer-linter

Ignore redundant-override in the machine_* types

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

resources

Merge branch 'main' into updated_elegoo_definitions

2023-04-11 19:07:27 +02:00

scripts

Also check on Uranium.pot

2023-04-05 12:35:23 +02:00

tests

Update extrudermanager in tests to mock Application.

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

.gitignore

Remove wireprinting options.

2023-03-28 13:50:20 +02:00

.printer-linter

Ignore redundant-override in the machine_* types

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

.pylintrc

Fix regex for private & long functions

2020-01-10 17:43:40 +01:00

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

Copy private data and materials from new location

2023-03-28 11:26:46 +02:00

conanfile.py

Merge pull request #15057 from Ultimaker/CURA-10317_other_inconsitent_material_profiles_in_internal_builds

2023-03-29 20:54:21 +02: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

Update desktop and mimeinfo to add gcode mime type

2018-11-22 15:47:12 +01:00

CuraVersion.py.jinja

Update copyright using UltiMaker

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

LICENSE

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

pytest.ini

Re-add pytest.ini

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

README.md

Add openssf scorecard to readme.

2023-03-23 13:04:06 +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

Update PyQt6 to use 6.4.2

2023-03-13 08:30:14 +01:00

SECURITY.md

Add security policy

2022-03-23 09:51:36 +01:00

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