Commit graph

7343 commits

Author SHA1 Message Date
Ghostkeeper
4725b1b074
Rename 'Other Wall' to 'Inner Wall'
This is both more correct and more consistent with the descriptions.

Contributes to issue CURA-1212.
2016-03-22 18:00:46 +01:00
fieldOfView
c37c63fa89 Add tooltip to "customised values" indicator
CURA-909
2016-03-22 17:24:35 +01:00
Ghostkeeper
94b8ff7492
Add period at the end
The English translation had properly a period at the end of this sentence. German must too, for consistency.

Contributes to issue CURA-1190.
2016-03-22 15:06:13 +01:00
Ghostkeeper
6525e4637e Fix some of the translations
In particular, I removed some fuzziness and uncommented some outcommented translations.

Contributes to issue CURA-1190.
2016-03-22 13:04:17 +01:00
fieldOfView
6b2b948623 Prevent qml errors when adding/deleting profiles
CURA-855
2016-03-21 16:28:58 +01:00
Tim Kuipers
ec06226907 quickfix for fan full at height 2016-03-21 14:16:37 +01:00
fieldOfView
2e5868cb82 Removed separators from profilesmodel
Profile menu now inserts separators in QML
CURA-855
2016-03-21 13:47:14 +01:00
Jaime van Kessel
235f324d56 Added missing enabled parameters 2016-03-21 11:12:00 +01:00
Ghostkeeper
e5a5cffe7d
Remove unnecessary parameter to JS toString
This parameter has no effect.

Contributes to issue CURA-1110.
2016-03-18 15:59:05 +01:00
Jaime van Kessel
bb220ed952 Removing min warning from support_tower_diameter
The min warning caused an infinite recursion when support was
enabled / disabled

CURA-1156
2016-03-18 15:52:56 +01:00
Jaime van Kessel
43d13096a1 Added decodeURIComponent to mesh names
Fixes CURA-1110
2016-03-18 14:56:35 +01:00
Jaime van Kessel
834e2148d2 Major cleanup for profiles
This removes a bunch of settings that override default values from machine defaults (or inheritance)
2016-03-18 14:18:19 +01:00
fieldOfView
1583018e75 Clean up theme: tweak colors, remove unused styles
Contributes to CURA-1143
2016-03-17 21:09:18 +01:00
fieldOfView
476ab9226d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-17 16:29:37 +01:00
fieldOfView
745bc8051a Fix generic material profiles
Makes sure that the generic PLA material profile has all the same settings as the ABS and CPE settings, so a printer that uses the non-printer-specific material profiles can switch back to the proper settings for PLA when they are merged into the current settings.

CURA-1188
2016-03-17 16:29:19 +01:00
Ghostkeeper
de9a66e1f4 Merge branch '2.1'
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
2016-03-17 15:24:00 +01:00
Jaime van Kessel
479c6c3319 Added extra relative move to prevent nozzle scraping
CURA-1102
2016-03-17 14:57:44 +01:00
Jaime van Kessel
89256b5423 Added explicit home bed before rest of bed leveling
CURA-1102
2016-03-17 14:44:09 +01:00
Jaime van Kessel
aafb981245 Setting empty jobname is now possible again
I hope this fixes CURA-707, but it can only be tested through means of a build.
2016-03-17 10:18:46 +01:00
Jaime van Kessel
90293a4a5c Removed stray broken code
CURA-1102
2016-03-16 16:33:36 +01:00
Jaime van Kessel
9a6615213c Bed should no longer be damaged when leveling
CURA-1102
2016-03-16 15:18:11 +01:00
Tim Kuipers
762f964221 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-16 09:55:28 +01:00
Tim Kuipers
b7065628a3 JSON: temporarily made temp graph and cooldown speed modifier disabled (CURA-1157) 2016-03-16 09:55:19 +01:00
fieldOfView
f904d3aa74 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-15 18:05:57 +01:00
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