Commit graph

7424 commits

Author SHA1 Message Date
Jack Ha
b2d7b82dd3 Preference Center camera set to default off. CURA-2908 2017-01-13 09:16:04 +01:00
Simon Edwards
16a748e0d6 Merge pull request #1326 from Ultimaker/big_flame_graph
Support for the Big Flame Graph profiler
2017-01-12 14:25:18 +01:00
Simon Edwards
8d146d92b3 Merge branch '2.4' 2017-01-12 13:26:25 +01:00
Simon Edwards
98bad05b7b Take materials which are sub-type into account when looking for quality profiles.
CURA-3235 Duplicate profile broken when using Ultimaker materials other than default
2017-01-12 13:25:05 +01:00
MaukCC
be26aad89b Create cartesio_0.25.inst.cfg 2017-01-12 10:52:20 +01:00
MaukCC
0b879a5e94 Create cartesio_0.8.inst.cfg 2017-01-12 10:51:52 +01:00
MaukCC
713cd5341d Create cartesio_0.6.inst.cfg 2017-01-12 10:51:31 +01:00
MaukCC
b93e7d714f Create cartesio_0.4.inst.cfg 2017-01-12 10:51:00 +01:00
MaukCC
0cd2030e2a Add cartesio_platform.stl 2017-01-12 10:50:09 +01:00
MaukCC
40bb5ba560 Create cartesio_extruder_3.def.json 2017-01-12 10:49:20 +01:00
MaukCC
c06e97c93a Create cartesio_extruder_2.def.json 2017-01-12 10:48:53 +01:00
MaukCC
b96f45aa2a Create cartesio_extruder_1.def.json 2017-01-12 10:48:27 +01:00
MaukCC
a8a6ba836d Create cartesio.def.json 2017-01-12 10:47:38 +01:00
MaukCC
4a8bcc49bc Delete cartesio 2017-01-12 10:47:10 +01:00
MaukCC
e0a6e6334d Create cartesio_extruder_0.def.json 2017-01-12 10:46:25 +01:00
MaukCC
95e507edd1 Create cartesio 2017-01-12 10:45:33 +01:00
awhiemstra
a2e00bd560 Merge pull request #1336 from fieldOfView/fix_center_zero_tower_pos
Fix prime disallowed areas when center is zero
2017-01-12 10:28:53 +01:00
awhiemstra
3e298c2d0e Merge pull request #1337 from fieldOfView/fix_hide_profile_selection
Hide profiles selection when hiding settings
2017-01-12 10:25:00 +01:00
Mark Burton
35f35b082d Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles 2017-01-12 08:59:34 +00:00
Jaime van Kessel
3b29944b0f Merge pull request #1324 from TheRikke/master
Add definition file for 101Hero
2017-01-12 09:59:03 +01:00
Thomas Karl Pietrowski
5891709800 Using UM.Platform and correcting something minor
Since we already have UM.Platform, I think it is worth to get constancy into our code and use UM.Platform for our detection.
Additionally, I corrected the head of the file, because I think I shall mention Cura and not Uranium. I guess the plugin was moved to Cura, so this was missed.
2017-01-11 19:08:46 +01:00
fieldOfView
3e369c2494 Hide profiles selection (variant/material/quality) when hiding settings 2017-01-11 18:31:33 +01:00
fieldOfView
1226b2e78e Fix the min/max values for prime(tower) positions when center_is_zero 2017-01-11 18:05:27 +01:00
fieldOfView
1d308f2042 Fix the disallowed area for the prime tower and prime are when center_is_zero 2017-01-11 18:04:25 +01:00
awhiemstra
47be957f38 Merge pull request #1267 from alephobjects/GCODEReader_upstream
Add a Gcode reader plugin
2017-01-11 17:15:52 +01:00
Tim Kuipers
16d8bdf628 JSON fix: prime tower thickness defaulted to zero, rather than defaulting to full prime tower (CURA-3175) 2017-01-11 16:58:22 +01:00
Simon Edwards
a5181f157e Applied the profiler's pyqtSlot decorator to all of the code. 2017-01-10 13:35:39 +01:00
Enrico
671ec73131 Add definition file for 101Hero 2017-01-09 22:15:42 +01:00
fieldOfView
6f06e9b320 Update material costs in slice info area when changing material settings
(without reslicing)
2017-01-09 15:24:20 +01:00
fieldOfView
c48f02a7eb Fix horizontal scrolling/flicking of materialview
(probably windows-only)
2017-01-09 14:19:22 +01:00
fieldOfView
4ba8b4e7c8 Update spool length and cost per meter when editing values in materials dialog 2017-01-09 14:08:50 +01:00
Jaime van Kessel
cc90fb431c Merge pull request #1317 from TheRikke/master
Fix connections to devices not based on arduino
2017-01-09 09:46:12 +01:00
Thomas Karl Pietrowski
2f9057dc77 Merge pull request #1319 from halfakop/2.4
Correction of Russian translation.
2017-01-08 11:51:01 +01:00
Ruslan Popov
8578312344 Correction of Russian translation. 2017-01-08 04:45:31 +03:00
TheRikke
5ed32230f7 Fix connections to devices not based on arduino
stk500v2 failed to release the serial port on timeout.
2017-01-07 22:22:47 +01:00
Ghostkeeper
6f7de84af0
Merge branch '2.4' 2017-01-07 19:20:22 +01:00
Ghostkeeper
0b6ffb77eb
Merge branch 'halfakop-2.4' into 2.4 2017-01-07 19:19:09 +01:00
Ruslan Popov
0c4b2c404b Add Russian language into select control on General Page. 2017-01-06 23:51:28 +03:00
Ruslan Popov
007494de08 Added Russian translation. 2017-01-06 23:51:28 +03:00
Ghostkeeper
8b21efb18b
Correct description of Support Z Distance setting
It's rounded up, not down.

Contributes to issue CURA-2364.
2017-01-06 15:37:21 +01:00
Jaime van Kessel
4d0a0e5ad1 Added support mesh and anti overhang mesh to exclude list in settingview
CURA-3177
2017-01-06 13:21:47 +01:00
Youness Alaoui
f095e9050f T466: Hide the search icon from printer setup
When in custom mode in the printer setup pane and a gcode file gets loaded
the search icon needs to disappear as well.
Reported by @GhostKeeper, and fix provided by @victor9999
2017-01-05 13:14:33 -05:00
Youness Alaoui
ad95f94d40 Remove redundant check 2017-01-05 13:04:56 -05:00
Victor Larchenko
33cd386556 D6: Fixed layers and line widths 2017-01-05 13:04:32 -05:00
Ghostkeeper
0b364558a0
Merge branch 'Zazcallabah-master' 2017-01-04 13:30:11 +01:00
Peter Hamberg
02f47361f1 Correct y axis print head size for printrbot simple
Print head size settings for printrbot simple had y min and y max mixed up,
making "print one at a time" always print in the wrong order.
2017-01-04 07:35:41 +01:00
Mark Burton
3e1668499f Merge branch 'master' into mb-infill-line-angles 2017-01-03 16:20:03 +00:00
Jack Ha
cd8eaf7759 minimum layer slider now works 2017-01-03 15:58:35 +01:00
Mark Burton
7ee4484c76 Merge branch 'master' into mb-infill-line-angles 2017-01-03 10:43:57 +00:00
fieldOfView
ebbe37a6cd Remove "Edit" button from materials page
The "Edit" button is an unnecessary barrier. Read-only materials are still uneditable.
2017-01-03 11:23:31 +01:00