Jaime van Kessel
3039315408
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-22 17:07:06 +01:00
Jaime van Kessel
ab28cb4615
Fix import changes
...
These broke the importing & exporting of profiles
2017-02-22 17:06:28 +01:00
Jack Ha
efe587f8b7
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-22 16:31:08 +01:00
Jack Ha
b568ad701b
Fixed convex hull for triangles. CURA-3314
2017-02-22 16:30:57 +01:00
Ghostkeeper
ca553a112d
Add UM3 profiles for CPE+, PC and TPU
...
These have been optimised only to remove redundancies, i.e. settings that had the same value as in the higher-order profile.
2017-02-22 16:26:44 +01:00
Jack Ha
3ca9ae145e
Undo logging and splitting up QVector3D. CURA-3334
2017-02-22 14:35:51 +01:00
Jack Ha
0eb5e59c9f
Split CameraAnimation.setStart to debug more. CURA-3334
2017-02-22 13:23:25 +01:00
Jack Ha
e97d75b7c8
Added logging for camera animation. Help debugging CURA-3334
2017-02-22 11:33:55 +01:00
Jack Ha
c785256ac4
Possible fix for CURA-3334
2017-02-22 10:38:07 +01:00
Jaime van Kessel
e32c67ccd3
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-22 09:43:45 +01:00
Jaime van Kessel
beea9caf04
Clarified unable to print over USB message for ulti-gcode
2017-02-22 09:43:24 +01:00
fieldOfView
7a336bbe67
Change separator for extruder_opacities to |
...
Comma as a separator might cause confusion/(user-)errors with localised floating point numbers.
2017-02-21 22:37:32 +01:00
fieldOfView
aef34d4688
Fix i18n context
2017-02-21 22:28:47 +01:00
Jack Ha
bb955ca5ab
Tickle the backend if per object settings are changed. CURA-3273
2017-02-21 16:12:25 +01:00
Jack Ha
580010b673
Undo only abbreviation as job name. CURA-3226
2017-02-21 15:15:50 +01:00
Jack Ha
d0721b1feb
Solved merge conflict
2017-02-21 14:55:06 +01:00
Jack Ha
b257632b14
Better file name for saving file (project) without suggested name. CURA-3226
2017-02-21 14:53:28 +01:00
Jaime van Kessel
ee1fbefe86
Machine type is also added when adding manual printer
...
Fixes CURA-3356
2017-02-21 14:38:04 +01:00
Jaime van Kessel
4f74edd421
Project name is now correctly set upon loading project
...
CURA-3387
2017-02-21 14:27:56 +01:00
Jaime van Kessel
9ceda261b7
Setting an empty printjob name no longer causes a single prefix to be added.
...
CURA-3387
2017-02-21 14:01:30 +01:00
Jaime van Kessel
033c08d3ff
CreateJob name no longer adds the same abbreviation multiple times
...
Contributes to CURA-3387
2017-02-21 13:30:44 +01:00
Jack Ha
057dc2fd7d
Solved merge conflicts. CURA-3214
2017-02-21 11:01:20 +01:00
Jack Ha
5a76c92dda
Small improvements: rename, log message, QObject parent, return value. CURA-3214
2017-02-21 10:52:56 +01:00
Jack Ha
5869e82495
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-21 10:17:38 +01:00
Jack Ha
2f7644c34e
Travel moves are now flat planes, on top of the 'tubes'. CURA-3273
2017-02-21 10:00:29 +01:00
Jaime van Kessel
0b4a05a84c
Recommended settings now shows correct status for adhesion when None was selected
...
Fixes #1454
2017-02-20 17:32:20 +01:00
Jack Ha
ed2b0de224
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-20 15:56:47 +01:00
Jack Ha
24d04558f0
Merged LayerView show_adhesion and show_support into show_helpers. CURA-3273
2017-02-20 15:56:29 +01:00
Tim Kuipers
58e15848eb
feat: machine_nozzle_temp_enabled; refactor: let settings depend on it (rather than on gcode flavor) (CURA-3101)
2017-02-20 13:44:55 +01:00
fieldOfView
73253d3807
Fix loading opacities from preferences
2017-02-20 13:31:59 +01:00
fieldOfView
26fe46ce1f
Translate layerview mode types
2017-02-20 12:32:49 +01:00
fieldOfView
f8a3c3b0ba
Factor out repeated extruder visibility checkboxes
2017-02-20 12:27:37 +01:00
fieldOfView
61e0cd4ff5
Move legacy options to layerview options
2017-02-20 11:09:34 +01:00
Jaime van Kessel
88bbadead8
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-20 09:58:24 +01:00
Jack Ha
e82bb29e1d
Revert translation of listmodel text. CURA-3273
2017-02-20 09:57:25 +01:00
Jaime van Kessel
ff3b3f30b5
Merge branch 'master' of https://github.com/ruimartinsptl/Cura
2017-02-20 09:56:55 +01:00
Jack Ha
fd2525768d
Capitalized labels, made them translatable. CURA-3273
2017-02-20 09:55:07 +01:00
Jack Ha
cd54552498
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-20 09:45:51 +01:00
Jack Ha
b229d38a88
LayerView checkboxes are not remembered; added switching Legend on for compatibility mode. CURA-3273
2017-02-20 09:45:37 +01:00
Rui Filipe de Sousa Martins
0a5e279a9f
Printer helloBEEprusa added.
2017-02-18 16:15:56 +00:00
Jaime van Kessel
3bbbd4a692
Merge branch 'fix_window_overflow' of https://github.com/fieldOfView/Cura
2017-02-17 15:31:10 +01:00
Jaime van Kessel
905f57cd63
Merge branch 'fix_compatibility_mode_legend' of https://github.com/fieldOfView/Cura
2017-02-17 15:28:40 +01:00
Jaime van Kessel
8e05ba46a6
Merge branch 'fix_slot_property_confusion' of https://github.com/fieldOfView/Cura
2017-02-17 15:26:40 +01:00
fieldOfView
04ab33b913
Fix legend in compatibility mode
2017-02-17 14:07:19 +01:00
fieldOfView
9254ac1694
Add libSavitar credit
2017-02-17 13:44:43 +01:00
fieldOfView
11e9a4cdf4
Make About window scrollable
...
On some OSes/configurations/screens, the list of credits in the About window doesn't fit until the window is resized. Adding a scrollview helps in these cases.
2017-02-17 13:41:39 +01:00
fieldOfView
97d20b4242
Make General preference pane scrollable
...
On some OSes/configurations/screens, the options on the General pane don't fit until the window is resized. Adding a scrollview helps in these cases.
2017-02-17 13:39:46 +01:00
fieldOfView
9229027001
Refactor properties that start with 'get' to avoid confusion between slots & properties
...
Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.
2017-02-17 13:35:01 +01:00
Ghostkeeper
83b290b8d3
Use full import path for parent class
...
Something seems off with the build for some reason. I'm trying to fix it this way.
2017-02-17 12:42:11 +01:00
Ghostkeeper
cec3eebace
Replace list-to-set cast with normal set literal
...
Don't know who did this but he did wrong, yo.
2017-02-17 10:16:11 +01:00