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

9346 Commits

Author SHA1 Message Date
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
Remco Burema
9861e450a0 Fix/rewrite for relative extrusion mode. 
For relative mode, not only needs the retractions created to be actually relative, but it also needs to compensate on the next G1 (as opposed to absolute mode, where you'd want to go to the same absolute E position after). Rather than massively complicating the already gnarly code (once it found a G1 retraction, it scanned forwards to find G0 statements (which it rewrote to G1), so it would go over those _again_ in the middle (layer) loop). While this worked for absolute mode, but would be a nightmare to make work for relative mode as-is (if only because the compensation could _also_ potentially involve keeping track of things over the outer loop). As a bonus I think the resulting code is actually easier to read.

part of CURA-10092 -- should fix #14100
 2023-01-20 17:34:39 +01:00
Jaime van Kessel
feff96288f
Remove stray comma from json 2023-01-20 11:26:00 +01:00
Jaime van Kessel
e8528e6735
Merge branch 'script' of github.com:brunohenriquy/Cura 2023-01-20 11:20:45 +01:00
Jelle Spijker
7ccb361b8f
Merge pull request #14202 from Ultimaker/CURA-10118_Enable_all_USB_ports_for_Mac 
[CURA-10118] Change Only_List_USB
 2023-01-17 15:51:37 +01:00
Joey de l'Arago
6054473036 Remove unused environment variable 2023-01-17 15:38:23 +01:00
Joey de l'Arago
1bc764f019 Only search for non usb device printers when using Linux or MacOS 
CURA-10118
 2023-01-16 11:07:55 +01:00
c.lamboo
6ef0a35c15 Fix error where icon in the marketplace would not show 
CURA-10139
 2023-01-11 18:23:42 +01:00
Joey de l'Arago
55531ab04b Remove old references to buildplate. 
CURA-6867
 2023-01-10 10:31:08 +01:00
MariMakes
6def3dcb5e Change Only_List_USB 
Apply Sovengers so more Macusers can print over USB as mentioned in https://community.ultimaker.com/topic/42417-fix-for-connecting-creality-ender-3-neo-to-mac-via-usb/
 2023-01-04 10:15:27 +01:00
Remco Burema
0a079d9794 Account for setting-function value that evaluates to another setting-function. 
part of CURA-9859
 2022-12-23 18:05:28 +01:00
Casper Lamboo
06f230dd39
Merge pull request #13852 from victornpb/support-custom-gcode-macro-on-filament-change-plugin 
Support custom gcode macro on filament change plugin
 2022-12-20 13:51:42 +01:00
Victor
51a6afb58f
Apply suggestions from code review 
Co-authored-by: Casper Lamboo <casperlamboo@gmail.com>
 2022-12-19 14:42:19 -03:00
Casper Lamboo
e558752ed0
Merge pull request #13972 from Ultimaker/CURA-9793_extend_recommended_print_settings 
[CURA-9793] Extend recommended print settings
 2022-12-12 14:38:46 +01:00
c.lamboo
ca290a32fb Display "move to top" button in monitor page 
CURA-9940
 2022-12-09 14:05:03 +01:00
Joey de l'Arago
f034c115be Rename slider theme items 
CURA-9793
 2022-12-05 15:11:48 +01:00
c.lamboo
e60b96ac9a Fix selecting printer in monitor page 
CURA-9940
 2022-11-30 15:42:43 +01:00
Casper Lamboo
1672cd639f
Merge pull request #13914 from Ultimaker/CURA-9808_UltiMaker 
CURA 9808 UltiMaker
 2022-11-29 16:36:07 +01:00
c.lamboo
b22fafadbe Don't capitalise "M" in "Ultimaker Digital Library" and "Ultimaker Digital Factory" 
because these are brand names.

CURA-9793
 2022-11-29 15:26:51 +01:00
c.lamboo
7efbf6ed1e Translate string 
CURA-9793
 2022-11-29 15:26:15 +01:00
jspijker
f76f711790 Update mentions to UltiMaker 
Contributes to CURA-9808
 2022-11-28 14:11:21 +01:00
Joey de l'Arago
ff65c1a670
Merge pull request #13886 from Ultimaker/9773-add_quality_type_to_ufp_files 
Add quality type to ufp files
 2022-11-28 13:19:09 +01:00
c.lamboo
be40920042 Fix cura crashing 
`activeQualityDisplayNameMap` no longer returned a dict and could thus not be a pyqt property

Cura-9773
 2022-11-28 13:14:47 +01:00