3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 03:07:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34356 commits 302 branches 270 tags 779 MiB
Commit graph

15419 commits

Author SHA1 Message Date
Jaime van Kessel
6b7fb894f8 Added moveHead to usb printing 
And ensured that wizard page uses correct version again

CURA-1339
 2016-04-14 14:21:22 +02:00
Tim Kuipers
77e719619d JSON fix: indentation only (CURA-1400) 2016-04-14 14:02:26 +02:00
Tim Kuipers
cd7513971b JSON fix: support&platform extruder nr not children of extruder nr (CURA-1400) 2016-04-14 14:01:56 +02:00
Tim Kuipers
7ea02f9d98 JSON fix: Infill Overlap mm didn't default to 0 when infill was too dense (CURA-786) 2016-04-14 13:50:40 +02:00
Tim Kuipers
f426ba3168 changed infill overlap min_value to min_value_warning and made it -50% (CURA-786) 
-50% corresponds to the value where the hole in the nozzle just at the boundary of the inner wall
 2016-04-14 13:33:00 +02:00
Jaime van Kessel
9ee6323177 wizard now uses correct property 
CURA-1339
 2016-04-14 13:26:38 +02:00
Jaime van Kessel
6909ed8765 Changed setBed temp to target bed temp 
CURA-1339
 2016-04-14 13:20:55 +02:00
Tim Kuipers
401e020f9c machine extruder trains now can't be an array anymore (CURA-494) 2016-04-14 13:18:40 +02:00
fieldOfView
003f973ba4 Prevent profiles being added if there is no active machine 2016-04-14 12:29:28 +02:00
fieldOfView
2afea115da Fix width of troubleshooting guide link in Simple mode sidebar 2016-04-14 11:56:36 +02:00
fieldOfView
5c723cc9d6 Fix string comparison in fdmprinter.json 
CURA-1394
 2016-04-14 11:49:46 +02:00
Jaime van Kessel
0c09df71d9 wizard now sets Target temperature 
CURA-1339
 2016-04-14 11:09:30 +02:00
Jaime van Kessel
5f2e0ceec8 Fixes so the QML displays right temperatures again 
CURA-1339
 2016-04-14 11:02:16 +02:00
Ghostkeeper
6223c0e2e9 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-13 16:23:27 +02:00
Ghostkeeper
7435010dd4
Code style: No whitespace at end of line 
Contributes to issue CURA-494.
 2016-04-13 15:59:48 +02:00
Ghostkeeper
f222c870f1
Codestyle: No whitespace at end of line 
Contributes to issue CURA-494.
 2016-04-13 15:56:56 +02:00
Arjen Hiemstra
9b88f06970 Merge branch '2.1' 2016-04-13 13:53:51 +02:00
Tim Kuipers
592d98d4fd JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694) 2016-04-13 09:56:34 +02:00
Tim Kuipers
cc06c632a1 JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694) 2016-04-13 09:50:51 +02:00
Ghostkeeper
ea6a4d5f27
../resources/i18n/nl/fdmprinter.json.po 2016-04-12 17:39:03 +02:00
fieldOfView
db7777a6e7 Move Rotation "tooltip" out of cura.qml and make it useful for other tools as well 
Tool hint is now a child of Toolbar.qml, where it fits with the tools for which it is useful.

CURA-1014
 2016-04-12 17:09:32 +02:00
Ghostkeeper
7cc31c3d2e Update translations 
Updates the translations with the updated strings. Made by Bothof.

Contributes to issue CURA-1190.
 2016-04-12 16:34:45 +02:00
fieldOfView
6e1265a822 Add width, height in addition to minimumWidth, minumumHeight to fix retina issue on OSX 
Without these additions, windows (preferences, wizards, about) open larger than fullscreen, making some controls inaccessible

Fixes CURA-504
 2016-04-12 10:23:43 +02:00
fieldOfView
a862f29794 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-11 20:59:45 +02:00
fieldOfView
0259457d2e Prevent overly long names for printers and profiles 
Contributes to CURA-1342
 2016-04-11 20:58:53 +02:00
Tim Kuipers
a57125292d JSON fix: syntax mistake 2016-04-11 19:10:16 +02:00
Tim Kuipers
3c919e9652 Revert "JSOn/profiles: changed infill overlap to mm (CURA-786)" 
This reverts commit 24f1726585.
 2016-04-11 19:04:36 +02:00
Tim Kuipers
59f5bcb1cd feat: infill overlap in mm (besides %) (CURA-786) 2016-04-11 18:57:37 +02:00
Tim Kuipers
de64e812ff removed old duplicate profiles introduced by rename and merge (CURA-1349) 2016-04-11 18:51:06 +02:00
Tim Kuipers
a144a51da4 Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura 
This is a manual merge. I did a checkout on specific files from another branch

That branch branched from 2.1 and I cherry-picked all commits which were on master but not on 2.1 manually by reviewing each of them

This way of merging bypasses all problems we had with the standard merges from 2.1 into master

CURA-1349
 2016-04-11 18:50:41 +02:00
Simon Edwards
8fad56c1f4 Revert a number of Settings names changes after code review. 
CURA-1177
 2016-04-11 11:13:20 +02:00
Tim Kuipers
e28bed6006 JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374) 2016-04-08 16:43:18 +02:00
Jaime van Kessel
14edc8aac8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-08 15:07:46 +02:00
Jaime van Kessel
dc1630c268 Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-04-08 15:02:30 +02:00
Tim Kuipers
2ccdf674c8 JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374) 2016-04-08 14:34:36 +02:00
fieldOfView
27e3f8b33f Fix color of some texts on Linux with dark theme 
Use Label{} instead of Text{}

CURA-1143
 2016-04-07 18:57:11 +02:00
fieldOfView
9fe3eb4f01 Add width, height in addition to minimumWidth, minumumHeight to fix retina issue on OSX 
Without these additions, windows (preferences, wizards, about) open larger than fullscreen, making some controls inaccessible

Fixes CURA-504
 2016-04-07 18:06:38 +02:00
Jaime van Kessel
c176c608d7 Added extra mm to UM2+ lower right disallowed area 
CURA-1166
 2016-04-06 17:23:11 +02:00
Ghostkeeper
db173f1347 Add more speed limits 
Can't have our users breaking the laws of physics.
 2016-04-06 13:58:56 +02:00
Simon Edwards
a15d864f0f Updated the Surface Mode description 
Fixes CURA-850
 2016-04-06 13:56:23 +02:00
Simon Edwards
3fa19e576b Fixed a few minor english errors in the settings names. 2016-04-06 11:47:02 +02:00
Simon Edwards
0187224137 Settings names are now meaningful outside their place/category in the sidebar. 
Fixes CURA-1177
 2016-04-06 11:46:53 +02:00
fieldOfView
2cedfbfbb7 Change splash-screen so it does not say "developer version", pending a release "real soon now" 
CURA-1341
 2016-04-05 22:28:52 +02:00
Jaime van Kessel
6a4b83b54b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-04-05 10:28:29 +02:00
fieldOfView
b3b04ff7b0 Removed Olsson block upgrade option from UM2Extended 2016-04-05 09:59:02 +02:00
fieldOfView
78038e90b8 Removed Olsson block upgrade option from UM2Extended 2016-04-05 09:52:33 +02:00
Ghostkeeper
7a217130a7
Fix profiles and FDMprinter after merge 
Merge didn't go too well.

Contributes to issue CURA-1235.
 2016-04-05 09:49:44 +02:00
Ghostkeeper
0684cee681 Merge branch '2.1' 
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
 2016-04-04 18:49:09 +02:00
Tim Kuipers
efdd92d358 JSON: fix: hide alternate skin rotation when skin pattern is concentric (CURA-1235) 2016-04-04 14:27:19 +02:00
Jaime van Kessel
bfba095655 Updated disallowed areas for um2 & um2+ 
CURA-1166
 2016-04-04 14:13:18 +02:00