Commit graph

3116 commits

Author SHA1 Message Date
austin-makeit
6ed00900fe Update and rename makeit_pro_m to makeit_pro_m.def.json 2017-03-20 10:43:10 -07:00
austin-makeit
f5c9620d3b Update and rename makeit_pro_l to makeit_pro_l.def.json 2017-03-20 10:42:37 -07:00
austin-makeit
8cd5c8bb69 Update makeit_pro_m 2017-03-16 15:50:54 -07:00
austin-makeit
918c5e1254 Update makeit_pro_l 2017-03-16 15:49:35 -07:00
austin-makeit
2a0137156b Merge pull request #2 from austin-makeit/patch-1
Patch 1
2017-03-16 15:45:34 -07:00
austin-makeit
8418c6b39b Create makeit_l_dual_2nd 2017-03-16 15:43:02 -07:00
austin-makeit
2523630455 Create makeit_l_dual_1st 2017-03-16 15:42:48 -07:00
austin-makeit
499f1998ca Create makeit_dual_2nd 2017-03-16 15:42:35 -07:00
austin-makeit
b5cc2b7059 Create makeit_dual_1st 2017-03-16 15:42:18 -07:00
austin-makeit
e4d32db873 Merge pull request #1 from austin-makeit/patch-2
Create MAKEiT definitions and extruders
2017-03-16 15:41:01 -07:00
austin-makeit
179919d14c Create makeit_pro_m 2017-03-16 15:33:13 -07:00
austin-makeit
d0ce717add Create makeit_pro_l 2017-03-16 15:30:42 -07:00
Jack Ha
ff77571300 Merge branch '2.5' 2017-03-16 16:01:33 +01:00
Jack Ha
aa691033e0 Added Not Supported profiles for incompatible materials. CURA-3510 2017-03-16 16:01:18 +01:00
Jaime van Kessel
a7b5879263 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-16 13:18:41 +01:00
Jaime van Kessel
efce0696bd Recently activated material can no longer be removed
CURA-3147
2017-03-16 13:11:51 +01:00
Jaime van Kessel
134425db90 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-16 11:27:54 +01:00
Jaime van Kessel
1f734d5245 Disabled the start_layers_at_same_position setting 2017-03-16 11:21:08 +01:00
Jaime van Kessel
6da6ae1b9e start_x and start_y are now settable per extruder 2017-03-16 11:19:44 +01:00
Jaime van Kessel
5bcfba0f17 Revert "removal: remove start_layers_at_same_position; it is now mandatory to start each layer near the given position (CURA-3339)"
This reverts commit 1482c27b21.
2017-03-16 11:16:55 +01:00
Jaime van Kessel
ad7752bb16 Revert "Updated version of superdraft and verydraft. CURA-3479"
This reverts commit 62de4f9ec6.
2017-03-16 11:16:02 +01:00
Jaime van Kessel
0c1829af1e Revert "Upgrade built-in instance containers"
This reverts commit b162be4df8.
2017-03-16 11:15:20 +01:00
Jack Ha
f918a978b2 Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390 2017-03-15 14:29:59 +01:00
Jaime van Kessel
6cc0bd893f Save as now defaults to 3mf
CURA-3496
2017-03-15 09:57:50 +01:00
Jaime van Kessel
48cba91b16 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-15 09:27:08 +01:00
Jaime van Kessel
138c3db26f Preferred mimetype is now used when saving to local or removable drive
CURA-3496
2017-03-15 09:23:47 +01:00
Ghostkeeper
c52649a91f
Merge branch 'patch-3' of https://github.com/probonopd/Cura into probonopd-patch-3 2017-03-15 09:13:33 +01:00
Jack Ha
132b6aa9d7 Merge branch '2.5' 2017-03-15 09:10:49 +01:00
probonopd
9dbb7fcc15 Update as per discussion in https://github.com/Ultimaker/Cura/pull/1350 2017-03-14 18:31:58 +01:00
jack
284e620da2 Merge pull request #1531 from Ultimaker/feature_version_upgrade_2.5
Version Upgrade 2.4 to 2.5
2017-03-14 16:05:43 +01:00
jack
056c9dd362 Merge pull request #1532 from Ultimaker/feature_version_upgrade_2.5_tests
Version Upgrade 2.4 to 2.5 tests
2017-03-14 16:05:36 +01:00
Jack Ha
62de4f9ec6 Updated version of superdraft and verydraft. CURA-3479 2017-03-14 13:09:07 +01:00
Lipu Fei
97b943736b Use translation for text in keep/discard profile dialog 2017-03-14 11:59:51 +01:00
Jack Ha
0a398738b7 Merge branch '2.5' into feature_version_upgrade_2.5 2017-03-14 11:18:14 +01:00
Ghostkeeper
9b7f054d32
Merge branch '2.5' 2017-03-13 17:23:59 +01:00
Jack Ha
d7e35fa480 Added global qualities for Superdraft and Verydraft. CURA-3510 2017-03-13 14:32:45 +01:00
Ghostkeeper
cbfbc70fa3
Upgrade built-in instance containers
These are now upgraded to version 3, meaning that they will have to increase their version numbers and remove any start_layers_at_same_position settings they define. None of these profiles define any start_layers_at_same_position so it's just the version number then.

Contributes to issue CURA-3479.
2017-03-13 12:42:25 +01:00
Ghostkeeper
8becc9b119
Merge branch '2.5' 2017-03-13 09:34:47 +01:00
Ghostkeeper
41e3336ea9
Merge branch 'feature_omp_writeGcode' into 2.5 2017-03-13 09:34:37 +01:00
Ghostkeeper
5d0f7f9042 Merge branch '2.5' 2017-03-10 18:20:58 +01:00
Ghostkeeper
137de23221
Always prefer 0.4mm nozzles at initial loading
Otherwise we might end up with 0.8mm AA cores, and those don't have a normal quality profile so that gives all sorts of trouble.
2017-03-10 18:20:42 +01:00
Ghostkeeper
b162be4df8
Upgrade built-in instance containers
These are now upgraded to version 3, meaning that they will have to increase their version numbers and remove any start_layers_at_same_position settings they define. None of these profiles define any start_layers_at_same_position so it's just the version number then.

Contributes to issue CURA-3479.
2017-03-10 16:49:57 +01:00
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
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
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