GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,023 Commits 290 Branches 260 Tags
Commit Graph

32023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joey de l'Arago
04adf487f3 Merge remote-tracking branch 'origin/updated_elegoo_definitions' into updated_elegoo_definitions 2023-04-12 10:19:03 +02:00
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
Jelle Spijker
47a248e825
Bump-up settings version to 22 
for Creality ender 3 S1 pro
 2023-04-08 10:42:48 +02:00
Jelle Spijker
0ad2687bdb
Run conan profile detection after switching compiler 
Should fix failing UT
 2023-04-08 10:25:51 +02:00
Jelle Spijker
82ad1cbff3
Update unit-test.yml 2023-04-08 09:39:20 +02:00
Casper Lamboo
2e4d580277
Merge pull request #14272 from sparkym3/Make_Creality_Ender_3_S1_consistent 
Make Creality Ender 3 S1 consistent
 2023-04-07 16:11:49 +02:00
c.lamboo
cf7bc063f1 Fix: Make "add printer" sections individually collapsable 
One variable was incorrectly named

CURA-10484
 2023-04-06 21:52:50 +02:00
c.lamboo
20b171dbeb Make "add printer" sections individually collapsable 
CURA-10484
 2023-04-06 21:46:51 +02:00
jellespijker
66d43d52aa update translations 2023-04-06 15:56:17 +00:00
Jelle Spijker
06e140a0fa
Merge branch '5.3' 
# Conflicts:
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
 2023-04-06 17:52:54 +02:00
Jelle Spijker
061a09f8b8
Merge branch 'CURA-10376_fix_TM' into 5.3 2023-04-06 14:35:57 +02:00
Jelle Spijker
43f6d89c1c
Merge Smartling translations 
Contribute to CURA-10376
 2023-04-06 14:24:34 +02:00
Jelle Spijker
01d22d1ad4
Also check on Uranium.pot 
Contribute to CURA-10376
 2023-04-05 12:35:23 +02:00
Jelle Spijker
1763b9bf9d
filter on relevant cura files 
Contribute to CURA-10376
 2023-04-04 15:47:56 +02:00
c.lamboo
af4efad1cf Don't capitalize "UltiMaker" for brand names 
CURA-10376
 2023-04-03 21:46:51 +02:00
c.lamboo
ef09fe640b Fix removing tu elements 
CURA-10376
 2023-04-03 21:46:24 +02:00
Jelle Spijker
19b3c93a0c
Hand-over 
Contribute to CURA-10376
 2023-04-03 13:51:03 +02:00
Jelle Spijker
0feda7fe08
Sanitize the fuzzy key string before match 
Contribute to CURA-10376
 2023-04-03 13:29:05 +02:00
Jelle Spijker
1792f80ac8
Sanitize the string before write 
Contribute to CURA-10376
 2023-04-03 13:12:23 +02:00
Jelle Spijker
95962b2914
Set fuzz_match_key 
Contribute to CURA-10376
 2023-04-03 12:42:04 +02:00
Jelle Spijker
f190b0395d
Added script to fix a tmx file with existing po files 
Contribute to CURA-10376
 2023-04-03 10:54:45 +02:00
Jelle Spijker
37a446a4ff
Update conan-recipe-version.yml 2023-03-31 08:17:49 +02:00
Jelle Spijker
28d6e993df
Bump up setting version to 22 2023-03-31 07:24:43 +02:00
Jelle Spijker
5680ea8ee8
Merge pull request #15092 from Ultimaker/5.3 
5.3
 2023-03-30 15:07:45 +00:00
Jelle Spijker
980de97162 Set FileMode ExistingFile in the open file dialog 2023-03-30 15:05:25 +02:00
Remco Burema
c3ca642a78
Merge pull request #15057 from Ultimaker/CURA-10317_other_inconsitent_material_profiles_in_internal_builds 
Cura 10317 other inconsistent material profiles in internal builds
 2023-03-29 20:54:21 +02:00
Jelle Spijker
b7498e81a9
set version to 5.4.0-alpha when None 2023-03-29 08:00:50 +02:00
Remco Burema
066b07160c Defensive programming for unit-test result publising. 
Make it slightly more robust, since there have been problems with this in the past aparently (see github.com/ations/runner/1722). Manual rewrite of earlier pull-request Cura/pull/13497

Co-authored-by: 0r31 <orel@dagoma.fr>
 2023-03-28 16:31:00 +02:00
Jelle Spijker
87fb723fdd
Merge pull request #15067 from Ultimaker/CURA-10394_remove_wireprinting 
[CURA-10394] Remove wire-printing options
 2023-03-28 13:49:37 +00:00
rburema
4091800340 update translations 2023-03-28 11:58:00 +00:00
Remco Burema
5b209161ac Remove wireprinting options. 
Wireprinting wasn't actively maintained, and almost an entire different min-engine. It's also rarely used, and presumed broken. Remove it, so it doesn't have to be maintained or clog up other maintanance and/or refactor tasks.

frontend part of CURA-10394
 2023-03-28 13:50:20 +02:00
Jelle Spijker
230182d85c
Merge remote-tracking branch 'origin/main' into CURA-10317_other_inconsitent_material_profiles_in_internal_builds 2023-03-28 11:27:57 +02:00
Jelle Spijker
551036352d
Copy private data and materials from new location 
Contributes to CURA-10317
 2023-03-28 11:26:46 +02:00
Jelle Spijker
734d72dcc8
Modernize copy during deploy 
Contributes to CURA-10317
 2023-03-28 10:51:48 +02:00
Jaime van Kessel
e2d248b0c9
Merge pull request #15007 from Ultimaker/CURA-10451_fix_pause_at_um 
[CURA-10451] Pause at height was not working for UM printers.
 2023-03-28 10:25:05 +02:00
Jelle Spijker
30e671a94c
Merge pull request #15066 from Ultimaker/CURA-10032 
Make smart brim settable per extruder
 2023-03-28 09:33:52 +02:00
Jelle Spijker
2d5be9a88a
copy cura from the package folder 
Contributes to CURA-10317
 2023-03-27 13:44:26 +02:00
Jelle Spijker
d9bc5e0ad6
Fix missing jinja templates 
Contributes to CURA-10317
 2023-03-27 13:15:21 +02:00
Jelle Spijker
51b81a9fd8
don't use format 
The install command at the private repo, can't
seem to override it from the commandline then

Contributes to CURA-10317
 2023-03-27 12:37:40 +02:00
Jelle Spijker
d2644df7b6
Make it work with the export_sources method 
Contributes to CURA-10317
 2023-03-27 11:54:10 +02:00
Jelle Spijker
1f4956de1b
Make it work with the export_sources method 
Contributes to CURA-10317
 2023-03-27 11:46:39 +02:00
Jelle Spijker
c2721abf87
use copy_deps for copying curaengine 
conf doesn't work as expected in Conan<2.0

Contributes to CURA-10317
 2023-03-27 11:24:24 +02:00
Jelle Spijker
374a42dea9
Merge branch 'main' into CURA-10317_other_inconsitent_material_profiles_in_internal_builds 2023-03-27 11:05:21 +02:00
Jelle Spijker
20492a1ae9
Add private Cura Artifactory 
Contributes to CURA-10317
 2023-03-27 11:04:42 +02:00
jellespijker
3d88c3c105 Applied printer-linter format 2023-03-27 08:58:42 +00:00
Jelle Spijker
b88576bd25
Merge branch 'main' into CURA-10317_other_inconsitent_material_profiles_in_internal_builds 2023-03-27 10:56:13 +02:00
casperlamboo
06482c1937
Applied printer-linter format 
(cherry picked from commit 5037d2f6429989f5ebb4b6ea355da2905f122f47)
 2023-03-27 09:21:25 +02:00
c.lamboo
7e8229a976
Fix gcode flavors in profiles 
For some printer definitions the `machine_gcode_flavor` was entered incorrectly (the display name was used rather than the flavor-key). Previously in combo boxes the flavour would default to the first key (which is "marlin"). Due to recent changes we will not default anymore to the first option, but instead show nothing. By changing the flavor to the correct key the flavors will show up correctly again.

CURA-10374

(cherry picked from commit 2181bbceb3091ce00e24bdd88e4bdcb395402f9b)
 2023-03-27 09:21:25 +02:00
Remco Burema
a5fbb21fa7 Disable hold-steppers option completely for Griffin-flavour. 
Users could still set the option first, _then_ switch to Griffin, giving the same problems before the default was switched to false (since the setting is disabled for Griffin flavour anyway).

part of CURA-10451
 2023-03-24 20:12:35 +01:00
Remco Burema
3fa555bd58 Users where not shown some errors from cloud. 
CURA-10442 and CURA-10443
 2023-03-24 14:31:49 +01:00