Jack Ha
b0d0b75662
Merge branch '3.2'
2018-01-23 14:25:11 +01:00
Lipu Fei
3ec4cc6a0b
Revert "Rename Enable Travel Optimization to Infill Travel Optimization"
...
This reverts commit a31d65786b
2018-01-23 12:38:51 +01:00
Ghostkeeper
f5e40c2281
Merge branch '3.2'
...
Contributes to issue CURA-4797.
2018-01-23 11:27:17 +01:00
Ghostkeeper
a31d65786b
Rename Enable Travel Optimization to Infill Travel Optimization
...
Because it's now no longer in the Infill category this is unclear.
2018-01-23 11:24:43 +01:00
Aleksei S
54dc63a596
Add missing changes
...
CURA-3710
2018-01-23 11:24:27 +01:00
Aleksei S
8fe6e82459
Added Setting visibility preset
...
CURA-3710
2018-01-23 11:14:57 +01:00
Diego Prado Gesto
5c8a47275e
CURA-4845 Revert changes when accessing the quality changes at the time
...
of creating the global ProfileTab in the preferences.
2018-01-22 13:08:30 +01:00
Ghostkeeper
23bfa798b1
Merge branch '3.2'
2018-01-22 12:51:39 +01:00
Ghostkeeper
3f81347ef8
Add warning that tree support increases slicing time
...
It's much slower than the normal support generation.
2018-01-22 12:51:26 +01:00
Ghostkeeper
ec0fca30a4
Merge branch '3.2'
2018-01-22 12:48:54 +01:00
Ghostkeeper
71cea55bda
Move untested settings to experimental category
...
These settings are just some of the settings that were not tested by our materials and processing team.
2018-01-22 12:48:29 +01:00
Lipu Fei
ed939d31fa
Add hardware_type = nozzle for nozzle variants
...
CURA-4461
2018-01-22 12:20:10 +01:00
gordo3di
3f4e381620
Removed desktop.ini file
...
Removed desktop.ini file
2018-01-19 11:13:11 -05:00
gordo3di
d10ea0a564
Removed desktop.ini files
...
Removed desktop.ini files
2018-01-19 11:09:35 -05:00
gordo3di
b48edbab8e
gMax 1.5+ Configurations
...
gMax 1.5+ Single and Dual extruder configurations
2018-01-19 10:52:52 -05:00
Diego Prado Gesto
0fbcd2d2ec
Merge branch '3.2'
2018-01-19 13:50:30 +01:00
ChrisTerBeke
98f738e3d9
Merge pull request #3149 from thetobby/master
...
Small tweaks on printer profile for two printers
2018-01-19 12:50:15 +01:00
ChrisTerBeke
99c40d09e9
Hitting enter on project loading dialog now loads the project instead of just closing the dialog - CURA-4735
2018-01-19 11:32:55 +01:00
Torbjørn
8b00bafb8b
.
2018-01-19 06:57:39 +01:00
Mark
00cf47a941
Merge branch '3.2'
2018-01-18 16:29:44 +01:00
Mark
74e9bf051c
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2
2018-01-18 16:28:51 +01:00
Mark
a774012bd2
Default objectlist to collapsed CURA-4525
2018-01-18 16:28:46 +01:00
Ghostkeeper
d1d566bfc0
Merge branch '3.2'
2018-01-18 13:29:36 +01:00
Ghostkeeper
dc08e7f043
Merge branch 'mb-move-wall-order-opt-setting' of https://github.com/smartavionics/Cura into smartavionics-mb-move-wall-order-opt-setting
2018-01-18 13:23:16 +01:00
fieldOfView
fccdf16e72
Merge branch 'master' into feature_preheat_extruder
2018-01-18 10:21:32 +01:00
fieldOfView
f135b1675c
Fix disabling preheat button when printer is not idle
2018-01-18 10:20:37 +01:00
Torbjørn
53cc4efb23
last minute tweaks
...
Decreased jerk and acceleration
2018-01-18 09:42:36 +01:00
Torbjørn
66805f83fd
Small tweaks for default quality
...
To better match printers after some testing
2018-01-18 08:46:27 +01:00
Brecht Nuyttens
64a7d1bbda
Removed ID + minor change
2018-01-18 08:34:10 +01:00
fieldOfView
259b1091f6
Fix QML errors building the material and nozzle menus
...
Since the network rewrite, outputdevices no longer have hotends and materials. This functionality may return, but until that time this does a better job at checking if the properties exist, preventing QML errors.
2018-01-17 19:36:20 +01:00
fieldOfView
7994c95bbe
Add unit to preheat temperature boxes
2018-01-17 18:03:01 +01:00
fieldOfView
6e0717a967
Merge branch 'master' into feature_preheat_extruder
2018-01-17 17:36:40 +01:00
Lipu Fei
cb0ac9b0c8
Merge pull request #3137 from Ultimaker/feature_multiple_BP
...
Feature: Printers with different build plates
2018-01-17 10:55:46 +01:00
Brecht Nuyttens
746fd3ddcb
Updated definition and added qualities
...
Updated the definition and added qualities for the 4 filaments.
2018-01-17 10:54:04 +01:00
Lipu Fei
4bc488ca79
Change wording to "Aluminium"
...
CURA-4461
2018-01-17 10:50:48 +01:00
Brecht Nuyttens
93741bffb5
Merge remote-tracking branch 'refs/remotes/Ultimaker/master'
2018-01-17 10:47:45 +01:00
Jack Ha
07f0906b1c
Merge branch '3.2'
2018-01-16 16:05:38 +01:00
Jack Ha
cffeff0299
CURA-4805 remove modifiable settings when loading non sliceable file (gcode)
2018-01-16 15:58:14 +01:00
Lipu Fei
b0d2ef0f72
Correct default material diameter value for single-extrusion machines
...
CURA-4812
2018-01-16 15:04:21 +01:00
Diego Prado Gesto
da4c98b204
Merge branch 'master' into feature_multiple_BP
2018-01-16 09:59:21 +01:00
Diego Prado Gesto
cd4b162b86
CURA-4461 Change sizes and theme colors for the separator
2018-01-16 09:47:33 +01:00
Ghostkeeper
0007f3dafd
Merge branch '3.2'
2018-01-16 09:28:40 +01:00
Ghostkeeper
39aec54a56
Fix reference to Tevo Black Widow model
...
Also fix some whitespace mistakes according to code style. Lots of tabs in there, whitespace at the end of a line, brackets on the same line, etc.
2018-01-16 09:28:29 +01:00
Ghostkeeper
8aa51658e2
Decimate Tevo Black Widow model
...
The original file size was too big. This is much better.
2018-01-16 09:28:29 +01:00
Diego Prado Gesto
a7beb142ff
CURA-4461 Add line separator when the build plate selector is visible
2018-01-16 09:23:39 +01:00
Diego Prado Gesto
0f497545bc
CURA-4461 Create properties to know when a buildplate is compatible or usable. Show colors indicating the compatibility. Also minor fixes
2018-01-15 18:00:49 +01:00
Aleksei S
9a3c9921ca
Fix: remove unnecesary cura slice request
...
CURA-4785
2018-01-15 17:21:43 +01:00
Ghostkeeper
e7c5120f9c
Merge branch '3.2'
2018-01-15 16:52:28 +01:00
Ghostkeeper
064a8e6f6c
Elide labels next to checkboxes
...
To the available width, if there is a width.
This won't work for right-to-left languages though...
Contributes to issue CURA-4692.
2018-01-15 16:41:33 +01:00
Brecht Nuyttens
33ba9a274d
Merge remote-tracking branch 'refs/remotes/Ultimaker/master'
2018-01-15 16:29:21 +01:00
