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,026 Commits 290 Branches 260 Tags
Commit Graph

9368 Commits

Author SHA1 Message Date
Joey de l'Arago
ed1b844b41 Remove random string and format 2023-04-12 15:43:03 +02:00
Joey de l'Arago
ee0b14fcac Update update script. Deleted qualities will now be replaced with new ones. 2023-04-12 15:40:13 +02:00
Jelle Spijker
5680ea8ee8
Merge pull request #15092 from Ultimaker/5.3 
5.3
 2023-03-30 15:07:45 +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
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
Remco Burema
47ef9d623e Pause at height was not working for UM printers. 
Hold-stepper-motor (and maybe beep) options, newly introduced previously, _and on by default_ (even though it was clear they where not meant for Griffin flavour GCode -- because at least the hold-motor option was not even visible for Griffin) where causing UltiMaker printers with prints that had the pause-at-height script enabled to fail.

should fix internal ticket CURA-10451
 2023-03-23 16:21:59 +01:00
Jelle Spijker
e7b5ec1c5b
Don't spam logs 
With failed serial stacktraces
 2023-03-21 15:09:48 +01:00
c.lamboo
86d95f8375 Merge branch 'main' into CURA-10406_fix_project_loading 
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
 2023-03-17 17:34:13 +01:00
c.lamboo
3186f2d0d5 Boyscouting 
CURA-10406
 2023-03-17 17:30:32 +01:00
Jaime van Kessel
7b84b38a1e Fix lookup for upgraded intents 
CURA-10406
 2023-03-17 17:30:03 +01:00
Jaime van Kessel
f6460e23be Convert to new style type hint annotation 
Boyscouting

CURA-10406
 2023-03-17 17:29:55 +01:00
Jaime van Kessel
4c2037b258 Add missing typing to the container info objects 
Boyscouting

CURA-10406
 2023-03-17 17:29:47 +01:00
Jaime van Kessel
65cf64bd00 Don't upgrade during pre-read 
This doesn't seem to be needed and it breaks when profiles have been
renamed.

CURA-10406
 2023-03-17 17:29:41 +01:00
c.lamboo
b19b229752 Boyscouting 
CURA-10406
 2023-03-17 17:02:42 +01:00
Jaime van Kessel
14ec6560e4
Fix lookup for upgraded intents 
CURA-10406
 2023-03-17 16:20:11 +01:00
Jaime van Kessel
1e0fc60008
Merge branch '5.3' of github.com:Ultimaker/Cura 2023-03-17 10:42:36 +01:00
c.lamboo
71a0044bf8 Fix extruder number 
most important change was changing
```
        currentIndex: function () {
          ...
        }
```
to
        currentIndex: {
          ...
        }
```
This changed the behavior so that the variables inside the code blocked are watched so that `currentIndex` is automatically updated. No longer needed to set the `currentIndex` from any where else anymore.

CURA-10374
 2023-03-15 18:18:31 +01:00
c.lamboo
84bb820e33 Update copy in pause at height to reflect that the first layer is 0 
CURA-10391
 2023-03-15 10:42:07 +01:00
Jaime van Kessel
884ec911e7
Convert to new style type hint annotation 
Boyscouting

CURA-10406
 2023-03-15 10:30:27 +01:00
Jaime van Kessel
336906deb5
Add missing typing to the container info objects 
Boyscouting

CURA-10406
 2023-03-15 10:28:13 +01:00
Jaime van Kessel
6a9f1f519d
Don't upgrade during pre-read 
This doesn't seem to be needed and it breaks when profiles have been
renamed.

CURA-10406
 2023-03-15 10:23:31 +01:00
jspijker
52a58374a8 Merge branch '5.3' 
# Conflicts:
#	conanfile.py
 2023-03-07 13:48:39 +01:00
jspijker
ea1a6d1a6e capitalize M 
Contribute to CURA-10208
 2023-03-07 07:57:59 +01:00
jspijker
4bc11c5138 Merge remote-tracking branch 'origin/5.3' 
# Conflicts:
#	conanfile.py
 2023-03-06 23:13:21 +01:00
jspijker
8a38eb79e2 Merge remote-tracking branch 'origin/CURA-10182_add_sign_in_wall_enterprise' into 5.3 
# Conflicts:
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
 2023-03-06 22:53:16 +01:00
jspijker
a570914410 Capitalized M 
Contribute to CURA-10208
 2023-03-06 13:51:47 +01:00
jspijker
4999f0ff76 Capitalized M 
Contribute to CURA-10208
 2023-03-06 13:49:17 +01:00
jspijker
ebc50d65f1 Various small fixes 
Contribute to CURA-10208
 2023-03-06 12:31:39 +01:00
jspijker
397533b806 Rerun the sort 
Contribute to CURA-10208
 2023-03-06 12:02:44 +01:00
Casper Lamboo
4b43677086
Reset last slice dat in resetAndReturnLastSliceTimeStats 
CURA-10299
 2023-02-27 11:03:36 +01:00
Casper Lamboo
422e39f9f9
Use correct file header 
CURA-10299
 2023-02-27 11:01:44 +01:00
Remco Burema
4efa8e3ab4 Put slice-time in slice-data-sharing. 
part of CURA-10299
 2023-02-23 16:03:20 +01:00
Joey de l'Arago
848b8e1398 Add try catch when fetching material diameter. 
CURA-10183
 2023-02-22 10:55:40 +01:00
Joey de l'Arago
1133e76e66 Add sign in wall 
CURA-10183
 2023-02-09 17:41:08 +01:00
Joey de l'Arago
ba63109d84 Catch error when loading gcode with more extruders than the current machine. 
CURA-10183
 2023-02-09 16:47:49 +01:00
jspijker
a4cf044825 removed filename mapping 
Contributes to CURA-10077
 2023-01-30 11:41:06 +01:00
jspijker
40bdea0716 Map updated profiles 
Contributes to CURA-10077
 2023-01-30 11:19:28 +01:00
jspijker
ab82414a3e update plugin description 
Contributes to CURA-10077
 2023-01-30 11:18:39 +01:00
jspijker
5aa95a362f Add the changed profile mappings 
Contributes to CURA-10077
 2023-01-30 10:30:49 +01:00
jspijker
a2fb12eb0f Remove old settings from resource files 
Contributes to CURA-10077
 2023-01-27 17:15:16 +01:00
jspijker
871017da73 Remove old settings from resource files 
Contributes to CURA-10077
 2023-01-27 17:13:06 +01:00
Remco Burema
36bb016a9b Merge branch 'CURA-9822_pause_at_height_improvements' 2023-01-26 13:17:32 +01:00
Greg Valiant
725d1026dd Revised PauseAtHeight.py. The changes are: 
For non-Repetier and non-Ultimaker printers - Move the prime extrusion so it occurs while the print head is still in the parked position so the blob doesn't happen over the print (GitHub #13584 and #11471 for reference).

Add a user option to use M104 or M109 for the resume temperature to avoid an unnecessary delay if the resume temperature is the same as the standby temperature.

committed as part of CURA-9822
 2023-01-26 13:15:09 +01:00
Jaime van Kessel
f0944fd98e
Merge branch 'CURA-10092_fix_relative_retractcontinue' of github.com:Ultimaker/Cura 2023-01-26 13:01:40 +01:00
Remco Burema
1b12e99869 Merge remote-tracking branch 'easygo/EasyG0ing1' into CURA-9822_pause_at_height_improvements 2023-01-26 10:05:17 +01:00
Remco Burema
883a3039e5 Remove old 'newline' solution. Will be fixed in the next commit(s). 
In retrospect, using ';' for the newline seperation was a bit daft, given that comments also start with that.

done as part of CURA-9822
 2023-01-25 17:48:36 +01:00
Remco Burema
7e695908cf Rename confusing parameter. 
part of CURA-10092
 2023-01-25 11:44:46 +01:00
jspijker
d0c7a48b47 Add S7 image to Network Plugin 2023-01-24 17:26:50 +01:00
Remco Burema
e2f7ef8b8b Add typing to Retract-Continue script. 
part of CURA-10092
 2023-01-20 17:58:42 +01:00