GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 20:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,667 Commits 295 Branches 268 Tags
Commit Graph

7667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Kuipers
f321417d9e Merge branch '2.5' 2017-03-10 16:03:38 +01:00
Tim Kuipers
5e782ae85b fix: type fix for last commit (CURA-3440) 2017-03-10 16:03:23 +01:00
Tim Kuipers
0f6c47f467 Merge branch '2.5' 2017-03-10 16:00:57 +01:00
Tim Kuipers
b03ac3ea78 JSON fix: skin angle for expansion is max angle; better description (CURA-3440) 2017-03-10 15:59:47 +01:00
Jaime van Kessel
d93b137c95 No longer add nodes that don't have children or MeshData 
CURA-3493
 2017-03-10 15:48:29 +01:00
Jaime van Kessel
370f90db68 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-10 14:24:05 +01:00
Jaime van Kessel
1d7bf51152 Added confirmation message for starting new project 
CURA-3494
 2017-03-10 14:10:24 +01:00
MaukCC
0ea296f240 Update cartesio.def.json 2017-03-10 13:55:08 +01:00
MaukCC
e5e518ba76 Update cartesio.def.json 2017-03-10 13:52:24 +01:00
MaukCC
e451737faf Update cartesio.def.json 2017-03-10 13:29:34 +01:00
Lipu Fei
c9d223acd4 CURA-3452 Save spool cost and weight upon change 2017-03-10 12:41:28 +01:00
Jaime van Kessel
66afc2a391 Added new project option 
CURA-3494
 2017-03-10 11:02:27 +01:00
Ghostkeeper
039c1b92de
Add profiles for 0.8mm nozzle sizes 2017-03-09 18:11:06 +01:00
Jaime van Kessel
fc929428d4 Merge branch 'bugfix_CURA-3480' of github.com:Ultimaker/Cura 2017-03-09 14:25:39 +01:00
Lipu Fei
2ac4a7aca9 CURA-3482 _onMaterialMetaDataChanged() should take argument(s) 2017-03-09 14:17:25 +01:00
Lipu Fei
fa71f22bf6 CURA-3480 Fix boolean values for Cartesio config files 2017-03-09 14:14:05 +01:00
MaukCC
fb7c0e3fea Create extra_coarse.inst.cfg 2017-03-09 10:37:35 +01:00
MaukCC
68017996a0 Create coarse.inst.cfg 2017-03-09 10:33:47 +01:00
MaukCC
00bcc1e6aa Update cartesio.def.json 2017-03-09 10:32:48 +01:00
MaukCC
2ea8029a81 Update cartesio.def.json 2017-03-09 09:43:43 +01:00
Lipu Fei
e67aecb041 CURA-3221 Translate column name "Default" 2017-03-08 15:36:11 +01:00
Lipu Fei
8b8fb8db95 Coding style fixes 2017-03-08 15:09:02 +01:00
Lipu Fei
5724ee71d0 CURA-3221 Group items into categories for the profile change summary 2017-03-08 15:08:45 +01:00
Tim Kuipers
3be6a0966b Merge branch 'smartavionics-mb-combing-retract-before-outer-wall' 2017-03-08 13:11:57 +01:00
Jack Ha
af6506e4bb Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-08 12:56:58 +01:00
Jack Ha
fc8bd75ffe Added changelog line for layerview slider. 2017-03-08 12:56:47 +01:00
Tim Kuipers
e20b4ef179 Merge branch 'mb-combing-retract-before-outer-wall' of https://github.com/smartavionics/Cura into smartavionics-mb-combing-retract-before-outer-wall 2017-03-08 11:35:07 +01:00
Tim Kuipers
0f5f163fdf fix: prime tower thickness has rounding (CURA-3180) 2017-03-08 11:05:37 +01:00
jack
c154ce07f8 Merge pull request #1499 from LipuFei/feature_CURA-3397-override-profile-dialog 
CURA-3397 Set override profile preference option upon visibility change
 2017-03-08 10:32:14 +01:00
Mark Burton
5a7812b4b7 Rename combing_retract_before_outer_wall setting to travel_retract_before_outer_wall. 
The forced retraction can now occur irrespective of whether combing is in use or not.
 2017-03-08 09:30:58 +00:00
MaukCC
ba6677636e Update cartesio.def.json 2017-03-08 09:56:21 +01:00
jack
4a68f25769 Merge pull request #1502 from LipuFei/feature_CURA-3221-improve-override-profile-dialog 
CURA-3221 improve override profile dialog
 2017-03-08 09:52:32 +01:00
jack
2a6ae17514 Merge pull request #1504 from LipuFei/bugfix_CURA-3470-crash-qvariantlist-set 
CURA-3470 Return list instead of set for QVariantList
 2017-03-08 09:29:28 +01:00
jack
3c8a6a6691 Merge pull request #1505 from LipuFei/bugfix_CURA-3471-crash-on-drag-stl 
CURA-3471 Crash on drag and drop STL
 2017-03-08 09:23:33 +01:00
MaukCC
7f5619bf1b Update cartesio_0.8.inst.cfg 2017-03-08 08:37:36 +01:00
MaukCC
c3cd13c1bf Update cartesio_0.4.inst.cfg 2017-03-08 08:37:21 +01:00
MaukCC
c2057b3118 Update cartesio_0.25.inst.cfg 2017-03-08 08:37:06 +01:00
Lipu Fei
a20fb7a479 Fix some coding style 2017-03-07 20:18:31 +01:00
Lipu Fei
a3dce9f6d1 CURA-3471 importProfiles() takes QVariantList 2017-03-07 20:17:29 +01:00
Jack Ha
f47ec27014 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-07 16:44:41 +01:00
jack
07e6da71d4 Merge pull request #1501 from Ultimaker/layer_view3_layout 
Layer view3 layout: Single Slider by fieldOfView
 2017-03-07 16:44:29 +01:00
Lipu Fei
ba79f44783 CURA-3470 Return list instead of set for QVariantList 2017-03-07 16:42:56 +01:00
MaukCC
df86760f97 Update cartesio_0.8.inst.cfg 2017-03-07 16:08:17 +01:00
MaukCC
3dd1235879 Update cartesio_0.4.inst.cfg 2017-03-07 16:08:01 +01:00
MaukCC
6848c4d1cf Update cartesio_0.25.inst.cfg 2017-03-07 16:07:43 +01:00
MaukCC
f3600f2935 Update cartesio_0.8.inst.cfg 2017-03-07 15:38:06 +01:00
MaukCC
944422d316 Update cartesio_0.4.inst.cfg 2017-03-07 15:37:52 +01:00
MaukCC
41eca74855 Update cartesio_0.25.inst.cfg 2017-03-07 15:37:36 +01:00
Tim Kuipers
3047ff26f1 fix: min warning for skin angle (CURA-3440) 2017-03-07 13:09:30 +01:00
Lipu Fei
897791b0d2 CURA-3221 Use "system" font so texts fit in rows 2017-03-07 12:53:21 +01:00