Commit graph

5203 commits

Author SHA1 Message Date
fieldOfView
7d37cbd5d2 Merge branch 'master' into feature_machinesettings 2016-08-15 16:07:53 +02:00
fieldOfView
9e7e469df8 Move plugin files into main repo location 2016-08-15 16:06:34 +02:00
fieldOfView
f2a44bec8d Add missing material_bed_temp_prepend 2016-08-15 15:55:45 +02:00
fieldOfView
f5d6c6024e Update buildvolume when extruder prime location is changed
CURA-1944
2016-08-15 15:48:25 +02:00
fieldOfView
48cfea01d0 Set sensible defaults for which "Dual Extrusion" settings are visible
CURA-916
2016-08-15 15:34:54 +02:00
fieldOfView
b7b0faf44a Fix sorting of settings on Profile manager page
CURA-2123
2016-08-15 15:17:59 +02:00
fieldOfView
dbaa6190be Add firmware upload for umo_dual
CURA-1774
2016-08-15 13:43:16 +02:00
fieldOfView
f0622cdda6 Add start & end gcode to UM2 depending on gcode flavor
CURA-580
2016-08-15 13:42:06 +02:00
Aldo Hoeben
db4a198a1c Merge pull request #922 from thopiekar/master-CURA-2079
CURA-2079: Finish firmware upload process on errors
2016-08-15 12:22:00 +02:00
Aldo Hoeben
f2d35cd57d Merge pull request #918 from Ultimaker/feature_terminology
Update UI texts to be compliant to Ultimaker dictionary
2016-08-15 11:35:19 +02:00
fieldOfView
633e37713c Update Printer manager details pane after removing a printer
CURA-2085
2016-08-15 11:32:09 +02:00
Jack Ha
5a92269a08 Testing. CURA-2007 2016-08-15 09:32:51 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00
Thomas Karl Pietrowski
6d18540fa7 CURA-1696: Using Uranium's translation tools 2016-08-14 19:30:31 +02:00
Thomas Karl Pietrowski
8179fabf1d Merge remote-tracking branch 'upstream/master' into master-CURA-2079 2016-08-14 17:43:26 +02:00
Thomas Karl Pietrowski
f915092f83 CURA-2079: Finish firmware upload process on errors
Looking at the old code shows that the download process was never
completely finished. The according function was only return'ed, but no
signal was emitted to the window to give the user the possibility to
close it again.

Optionally, it would be useful here to pass messages to the window
dialog to inform the user about problems.

However, this code is untested because:
1. I don't know where put my printers *.hex-file, when coding here with
my editor,
2. Have no idea how to reproduce the IO errors reported at JIRA, so
fingers crossed here.

Contributes to CURA-2079
2016-08-14 17:37:36 +02:00
Seva Alekseyev
e7cfd24e9a Holeless Disk2D fix 2016-08-12 16:11:57 -04:00
Seva Alekseyev
e4bac94189 Merging all shapes into a single mesh during X3D loading 2016-08-12 15:15:56 -04:00
Ghostkeeper
4472e0206e
Fix calls to max function
I think this was my mistake.
2016-08-12 16:56:07 +02:00
Tim Kuipers
85d97453f1
JSON feat: brim only on outer boundary polys (CURA-1413) 2016-08-12 11:18:37 +02:00
Aldo Hoeben
eee6828dac Merge pull request #920 from Ultimaker/thopiekar-adding-approximately-equal-to-jobspecs
Adding "approximately equal" to the amount of material needed
2016-08-11 21:25:36 +02:00
Thomas Karl Pietrowski
bfe97a1eca Using ~ only for the amount of material in grams 2016-08-11 21:10:16 +02:00
Thomas Karl Pietrowski
1ab0637d11 Adding "approximately equal" to the amount of material needed
I think it makes sense to add this character here, because the amount needed is only a approximated value, and without the end-user might expect a more accurate value.
2016-08-11 20:34:01 +02:00
Arjen Hiemstra
2969aafb6d Update profile page with the renamed functions
Contributes to CURA-2006
2016-08-11 17:51:16 +02:00
Arjen Hiemstra
a14a80be56 Document and simplify the quality/quality changes code in ContainerManager
Contributes to CURA-2006
2016-08-11 17:50:54 +02:00
Arjen Hiemstra
9f33fef4ec Use the new generator to simplify some extruder related code in MachineManager
Contributes to CURA-2006
2016-08-11 17:50:08 +02:00
Arjen Hiemstra
6049d6f3a5 Introduce a getActiveGlobalAndExtruderStacks method to ExtruderManager
It can be used to iterate over the active global and extruder stacks

Contributes to CURA-2006
2016-08-11 17:49:02 +02:00
Arjen Hiemstra
c557cd1a7a Move comment
Contributes to CURA-2006
2016-08-11 17:48:22 +02:00
Arjen Hiemstra
6778020d56 Remove duplicated code
Contributes to CURA-2006
2016-08-11 17:47:30 +02:00
Arjen Hiemstra
e1ddb878ad Fix copyright header
Contributes to CURA-2006
2016-08-11 17:47:15 +02:00
fieldOfView
5c63e5e13f Fix a typo in a comment
CURA-2113
2016-08-11 17:18:43 +02:00
Seva Alekseyev
4bad60f944 Slicing logic now index-aware, correctly processes scenes with vertex reuse 2016-08-11 11:17:48 -04:00
fieldOfView
2a55bba840 Code-style fixes
CURA-2079
2016-08-11 16:58:02 +02:00
fieldOfView
b619b68675 Remove repeated header between versions in changelog
CURA-2056
2016-08-11 16:51:48 +02:00
fieldOfView
c95cc7a21b Fix error in SolidView when there is a model but no printer 2016-08-11 16:44:19 +02:00
fieldOfView
1848bb5cc4 Fix typo in Changes on the Printer dialog 2016-08-11 16:36:24 +02:00
Seva Alekseyev
0279916ae4 In X3D import, setSelectable(true) for the whole scene 2016-08-11 10:08:25 -04:00
fieldOfView
db028b7e5f Update "Select Settings dialog" when the user removes a setting
CURA-2102
2016-08-11 15:10:30 +02:00
Jaime van Kessel
91dfd971ca PerObject settings don't automatically get a user changed state
CURA-2113
2016-08-11 14:57:21 +02:00
fieldOfView
6075536497 Fix settingtextfield validator in PerObjectSettings
CURA-2115
2016-08-11 14:37:58 +02:00
fieldOfView
71a9f2dd7a Clean up conversion to string
CURA-2071
2016-08-11 11:53:55 +02:00
Ghostkeeper
8c231e2942
Allow higher speeds for diagonal wireframe moves
Since these moves are slightly diagonal in all directions, a higher speed can be achieved. Exactly how high depends on both angles, but for simplification this limit is a bit too broad, allowing speeds that the printer can't handle. The firmware should catch that case if it happens.

Contributes to issue CURA-1049.
2016-08-11 10:54:00 +02:00
Ghostkeeper
4e13c262cf
Re-add max warning value for speed_slowdown_layers
It warns if the slowdown layers span more than 1mm.

Contributes to issue CURA-1049.
2016-08-11 10:53:59 +02:00
fieldOfView
957f60eb11 Add first draft of an UMO with Dual Extrusion Kit definition
CURA-1774
2016-08-10 18:04:30 +02:00
fieldOfView
6d64d11c2e Change Simple Mode adhesion/support label to "Helper Parts"
UXD-76
2016-08-10 17:57:06 +02:00
fieldOfView
85a58a22cb Change "Bed"/"Platform" to "Build Plate"
UXD-76
2016-08-10 17:57:05 +02:00
fieldOfView
505da1a9a7 Change "Hotend temperature" to the name of the extruder
UXD-79
2016-08-10 17:55:52 +02:00
fieldOfView
2963a64fc2 Change "Bed Temperature" to "Build Plate Temperature"
UXD-80
2016-08-10 17:55:52 +02:00
fieldOfView
885acb49dc Change "Cooling Fans" to "Print Cooling"
UXD-81
2016-08-10 17:55:51 +02:00
fieldOfView
7aab8ad397 Change "object" to "model"
UXD-83
2016-08-10 17:55:51 +02:00