GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 21:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,329 Commits 290 Branches 265 Tags
Commit Graph

6307 Commits

Author SHA1 Message Date
Ghostkeeper
846cbe79a3
Rename Orthogonal to Orthographic everywhere 2019-07-30 17:35:40 +02:00
Ghostkeeper
7883cf1807
Remove start_layers_at_same_position from user profiles 
There shouldn't be any since the setting was invisible, but just to be sure.
 2019-07-26 17:28:44 +02:00
Jaime van Kessel
e0c2611a0a Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-26 12:47:13 +02:00
ChrisTerBeke
87517a77c2
Merge pull request #6057 from Ultimaker/network-plugin-remove-hardcoded-references 
Get rid of any hard-coded references to machines
 2019-07-25 16:02:29 +02:00
ChrisTerBeke
96cf235d8c Get rid of any hardcoded references to machines 2019-07-25 14:56:46 +02:00
Lipu Fei
9f18ceda51 Merge remote-tracking branch 'origin/master' into add_42_43_version_upgrader 2019-07-25 14:56:27 +02:00
Jaime van Kessel
8311a39f08 Fix case where an error in the stack would not prevent slicing 
CURA-6680
 2019-07-25 09:42:00 +02:00
Jaime van Kessel
004297b936
Merge pull request #6028 from sgtnoodle/stretch_retract 
Preserve extruder-only moves in post stretch script
 2019-07-24 17:05:41 +02:00
Lipu Fei
80bf8c22ee Merge remote-tracking branch 'origin/4.2' 2019-07-24 10:56:48 +02:00
Lipu Fei
33739ea7a8 Fix profile upgrade in profile importing 
CURA-6681
 2019-07-24 10:55:38 +02:00
Jaime van Kessel
e630cb3480 Merge branch 'fixes_toolbox' of github.com:Ultimaker/Cura 2019-07-24 09:53:51 +02:00
Diego Prado Gesto
8411d43ecd Merge branch 'fixes_toolbox' of github.com:Ultimaker/Cura into fixes_toolbox 2019-07-23 16:19:21 +02:00
Diego Prado Gesto
46e6baf6ae Make suggested changes 
Add anchors instead of using width

Contributes to CURA-6518.
 2019-07-23 16:17:54 +02:00
Jaime van Kessel
3e5d81ddb6 Merge branch 'patch-2' of https://github.com/adecastilho/Cura 2019-07-23 15:48:57 +02:00
Jaime van Kessel
5e94e51e0c Add default for max_layer setting in postprocessing script 2019-07-23 15:36:04 +02:00
Jaime van Kessel
a330ae12dc Merge branch 'patch-2' of https://github.com/N95JPL/Cura 2019-07-23 15:28:32 +02:00
Jaime van Kessel
23e295e9e7 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-23 15:26:13 +02:00
Diego Prado Gesto
1d6ba3ffb0 Merge branch 'master' into fixes_toolbox 2019-07-23 15:15:02 +02:00
Jaime van Kessel
42abece298 Fix crash when a corrupted and unkown message was returned 
This is should be pretty rare, but we got a single crash report for it.
 2019-07-23 14:54:40 +02:00
Jaime van Kessel
757988a7f4 Merge branch 'master' of github.com:Ultimaker/Cura into fixes_toolbox 2019-07-23 14:04:40 +02:00
Jaime van Kessel
1e7875de48 Merge branch 'prevent_throwing_exception_when_not_connected' of github.com:Ultimaker/Cura 2019-07-23 13:57:31 +02:00
Jaime van Kessel
87666eb6a1 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-23 13:42:29 +02:00
Jaime van Kessel
d8ddcba091 Fix typing ignore for breath frist iterator 2019-07-23 13:40:40 +02:00
Ghostkeeper
f69eb05636
Merge branch '4.2' 2019-07-23 13:33:58 +02:00
Jaime van Kessel
9ceb9ce18b Fix typing issues 
They were caused by upgrading to a higher mypy version, which found more mistakes
 2019-07-23 12:58:46 +02:00
Jaime van Kessel
9cdf18525c Merge branch 'master' of github.com:Ultimaker/Cura into add_42_43_version_upgrader 2019-07-23 11:33:52 +02:00
Jaime van Kessel
57eb47e267 Named the imade profiles back again and added upgrade step for it 
The proposed new name is better and since we have an upgrader now, it's best to change it.
 2019-07-23 11:23:42 +02:00
Jaime van Kessel
e56e355e79 Added upgrader for 4.3 2019-07-23 11:15:13 +02:00
ChrisTerBeke
7300f95a42
Hide incorrect tooltip 
The preffered solution was to change the copywriting, but since we are after stringfreeze we cannot do this. This is the next best solution to prevent user confusion.
 2019-07-22 21:21:18 +02:00
Ghostkeeper
ca48f9171f
Merge branch '4.2' 2019-07-22 17:32:21 +02:00
Ghostkeeper
02ff433c92
Use set for unordered collections of things 
Contributes to issue CURA-6672.
 2019-07-22 17:07:07 +02:00
Jaime van Kessel
203ea2a83f Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-22 16:52:16 +02:00
Jaime van Kessel
00f21069e7 Ensure that metadata entries in cura namespace are stored correctly 
CURA-6672
 2019-07-22 16:41:08 +02:00
Lipu Fei
4b8a216771 Fix typing 2019-07-22 09:34:00 +02:00
Jaime van Kessel
e6512e748c Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-19 10:58:45 +02:00
Jaime van Kessel
ee05dc7b47 Minor codestyle fixes 2019-07-19 10:55:22 +02:00
Jaime van Kessel
b8d27b9ce3 Fix definition_changes not being updated properly 
CURA-6667
 2019-07-19 10:53:11 +02:00
Jaime van Kessel
a7ddab3c60 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-19 10:38:39 +02:00
Jaime van Kessel
c67f2cfcf5
Merge pull request #6004 from Ultimaker/add_camera_view_stats 
Add camera_view as stats
 2019-07-19 10:38:25 +02:00
Jeff Rogers
5ee31a1983 Preserve extruder-only moves in post stretch script 2019-07-18 16:52:59 -07:00
Ghostkeeper
cc9609738c
Show a message when trying to print via USB while already printing 
Otherwise the button does nothing and gives no feedback of why it does nothing.

Fixes #6026.
 2019-07-18 11:55:26 +02:00
Ghostkeeper
f334fa8578
Spelling of log entries and code style 2019-07-18 11:49:18 +02:00
Jaime van Kessel
ea5c34868e Merge branch 'revert_correct_depriming_settings' of github.com:Ultimaker/Cura into 4.2 2019-07-17 12:51:56 +02:00
Lipu Fei
0dfa7f1f84 Fix typing 2019-07-16 14:56:30 +02:00
Jaime van Kessel
e8350547b7
Merge pull request #5999 from Ultimaker/CURA-6659_fix_import_quality 
CURA-6659 Use VersionUpgradeManager to update the imported quality
 2019-07-16 14:33:26 +02:00
Jaime van Kessel
2ca39c8e7f Don't reparse entire file when checking for already extracted version 
CURA-6659
 2019-07-16 14:31:38 +02:00
Lipu Fei
1e7c682382 Use default variant if empty in project loading 
CURA-6654
 2019-07-16 11:24:19 +02:00
Diego Prado Gesto
9590262f18 Change the name of the original depriming settings 
Change to align with the name in the XML material files.

Contributes to CURA-6662.
 2019-07-16 09:55:50 +02:00
Lipu Fei
9da6044a72 Simplify camera_view data collection 2019-07-15 17:00:56 +02:00
Lipu Fei
64b23758c5 Add camera_view as stats 2019-07-12 14:35:06 +02:00