3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 10:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
34356 commits 302 branches 270 tags 773 MiB
Commit graph

15419 commits

Author SHA1 Message Date
fieldOfView
ff25e382ee Add a notice icon 
This icon is used in lieu of the warning icon for CURA-1122
 2016-03-15 17:56:30 +01:00
Tim Kuipers
802623443a JSON: fix for inherit function of fan speed (CURA-1171) 2016-03-15 17:51:52 +01:00
Tim Kuipers
65499bd06c JSON: made parent-child relations logical (CURA-1171) 
the child should depend foremost on the parent
no parent may be used in the engine
 2016-03-15 17:48:58 +01:00
Jaime van Kessel
0bf41cf528 Changed dimensions of UM2 
CURA-1166
 2016-03-15 16:48:35 +01:00
Tim Kuipers
75b43de546 JSON: wall thickness warning values based on line_width instead of harccoded (CURA-1167) 2016-03-15 15:27:19 +01:00
Tim Kuipers
a20e98d980 JSON: minimal support width only holds for conical supprot (CURA-1164) 2016-03-15 15:16:45 +01:00
Tim Kuipers
90b0692f78 JSON: updated conical support minimal width to 5mm: more chance it will stay up straight 2016-03-15 13:01:38 +01:00
Tim Kuipers
5998371644 JSON: made support_bottom_distance disabled and default to zero when Placement=Buildplate Only (CURA-1161) 2016-03-15 12:59:03 +01:00
Tim Kuipers
34814cd657 JSON: updated conical support minimal width to 5mm: more chance it will stay up straight 2016-03-15 11:10:20 +01:00
Tim Kuipers
1608f06c6c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-03-15 10:00:50 +01:00
Tim Kuipers
69997587e9 JSON: introduced Outer Wall Inset (CURA-1098) 2016-03-15 10:00:41 +01:00
fieldOfView
4e803a0815 Fix errors starting Cura with no machine selected 
Contributes to CURA-855
 2016-03-14 17:42:29 +01:00
fieldOfView
eb8a1bea8d Add styling for disabled controls 
Contributes to CURA-573
 2016-03-14 15:58:25 +01:00
Tim Kuipers
d668438d1f JSON: merge fix: support_minimal-diameter was double.. 2016-03-14 13:57:13 +01:00
Tim Kuipers
6665811348 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-14 12:03:03 +01:00
Tim Kuipers
b96f3d7733 JSON: make top_bottom_thickness available after all (CURA-1099) 2016-03-14 12:02:54 +01:00
Jaime van Kessel
5c6200a046 Removed unneeded override from profile 
CURA-1122
 2016-03-14 12:00:45 +01:00
Jaime van Kessel
7d86fbd9cc Added warning icon 
CURA-1122
 2016-03-14 11:30:33 +01:00
Jaime van Kessel
34ed642e35 Revert "Make setting category headers bold" 
This reverts commit e56347501d.

No attached issue; Far to late in release cycle for people to circumvent the design process.
 2016-03-11 12:01:31 +01:00
Jaime van Kessel
7dea2506b6 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-11 11:55:04 +01:00
Jaime van Kessel
5fbf4f336e Removed profile settings that already were on default 2016-03-11 11:54:31 +01:00
fieldOfView
e56347501d Make setting category headers bold 
Special request from Martijn
 2016-03-10 17:13:07 +01:00
Jaime van Kessel
a3eb212d68 Platform adhesion is now handled by inherit function 
Based on suggestion by ghostkeeper CURA-1068
 2016-03-10 15:09:15 +01:00
Jaime van Kessel
9f29af82b5 Fixed issues caused by 3b6aedd585 2016-03-10 14:07:03 +01:00
fieldOfView
83e4385e7e Revert "Reimport default profiles from 15.04.04" because I did not oversee 
the implications at the time

This reverts commit ce562713c3.
 2016-03-10 13:45:00 +01:00
fieldOfView
d8b082071d Merge branch 'feature_profilesorting' 2016-03-10 13:44:38 +01:00
Tim Kuipers
3b6aedd585 JSON: disabled top_bottom_thickness, shell_thickness and remove_overlapping_wall_parts_0_enabled (CURA-1099) 2016-03-10 12:43:07 +01:00
Tim Kuipers
3a377a616b profiles: machine_nozzle_size ==> line_width (CURA-1097) 2016-03-10 12:08:06 +01:00
fieldOfView
cdc9ece474 Show separator between readonly profiles and custom profiles in profiles menu and sidebar profiles dropdown 
Contributes to CURA-855
 2016-03-10 11:57:47 +01:00
Jaime van Kessel
e8c99f6b9f Increased readability 
CURA-1087
 2016-03-09 17:12:53 +01:00
Jaime van Kessel
7be8fa1fe3 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-09 16:22:45 +01:00
Jaime van Kessel
ffbc3e8da3 Added min size to printjob name 
CURA-1107
 2016-03-09 16:09:12 +01:00
Jaime van Kessel
37418be317 Merge pull request #658 from thopiekar/2.1-i18n-de-spelling 
[2.1] i18n: de: Correcting tooltip
 2016-03-09 15:37:00 +01:00
fieldOfView
a911471206 Add weights to standard profiles for sorting 
Contributes to CURA-1059

Conflicts:
	resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
	resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
	resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
	resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
	resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
	resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
 2016-03-09 15:33:51 +01:00
Thomas-Karl Pietrowski
09612f49c8 i18n: de: Correcting tooltip 
Just found another translation error.
This commit corrects "Bereit zum Über USB drucken" into "Bereit zum Drucken über USB".
It is almost related to another set of corrections I sent before, but didn't found this one as I didn't had my printer connected.
 2016-03-09 15:30:27 +01:00
Jaime van Kessel
9731d189be UM2Go and UMO now have brim as default platform adhesion 
CURA-1068
 2016-03-09 14:53:10 +01:00
Ghostkeeper
ca1e9f6e52 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-03-09 09:38:18 +01:00
Ghostkeeper
ae0cb70d25
Tweak infill wipe distance 
This wasn't taken over correctly from Paul's spreadsheet.

Contributes to issue CURA-892.
 2016-03-09 09:38:02 +01:00
fieldOfView
48a181d0b5 Add weights to standard profiles for sorting 
Contributes to CURA-1059
 2016-03-08 17:45:00 +01:00
fieldOfView
81a015015d Add "star" icon to profile dropdown when there are customised settings 
Contributes to CURA-909
 2016-03-08 12:06:21 +01:00
fieldOfView
00afebbc0d Add translate icon 
Contributes to CURA-838
 2016-03-08 12:04:39 +01:00
fieldOfView
06445ef3bb Add link to troubleshooting guide to simple mode 
Fixes CURA-536
 2016-03-07 15:19:27 +01:00
Jaime van Kessel
2ab999851c Toolbar correctly shows location of toolpanel when not triggered through QML 
Contributes to CURA-838
 2016-03-07 14:12:44 +01:00
Ghostkeeper
a785c9a205
Fix merge conflict resolution 
A comma was missing. Also fixed the whitespace in this file, since there were a few tabs mixed in there.
 2016-03-04 11:23:35 +01:00
Jaime van Kessel
a9bd73f32a Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-03-04 10:59:40 +01:00
Tim Kuipers
24f1726585 JSOn/profiles: changed infill overlap to mm (CURA-786) 2016-03-03 17:28:45 +01:00
fieldOfView
317706bbeb Rename inventor_platform.stl to match the rest 2016-03-03 17:21:00 +01:00
fieldOfView
2c2640f38b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-03 17:18:02 +01:00
fieldOfView
2f9d505fdc Fix and move Innovo INVENTOR machine definition to machines folder 2016-03-03 17:17:36 +01:00
Tim Kuipers
b0befb6309 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-03 17:11:12 +01:00