6996 Commits

Author SHA1 Message Date
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
Jack Ha
cd8eaf7759 minimum layer slider now works 2017-01-03 15:58:35 +01: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
fieldOfView
6479f2f938 Remove redundant "(Approx.)"
It is made redundant by the ~, and Approx. is an ugly abbreviation anyway
2017-01-03 11:11:57 +01:00
fieldOfView
a83c397d69 Show material cost in Job Specs area...
...if weight/price information is available
2017-01-03 11:05:32 +01:00
fieldOfView
27cf300ba6 Remove lingering debug statement 2017-01-03 11:05:32 +01:00
fieldOfView
ac34fe89ee Make currency preference settable 2017-01-03 11:05:32 +01:00
fieldOfView
4429825d15 Show the calculated values are an approximation 2017-01-03 11:05:31 +01:00
fieldOfView
a06f66305f Calculate spool length and cost per meter 2017-01-03 11:05:31 +01:00
fieldOfView
7516fb6056 Store cost & weight as preference values independent of material definition
Users need to be able to set these values independent of the xml definition, as it is not a material property but something that depends on the reseller etc. It must also be settable for read-only materials.
2017-01-03 11:05:31 +01:00
Ghostkeeper
693bc1de1c
Make skin pattern layer 0 inherit from skin pattern
When the user changes the skin pattern, he'd also expect the skin pattern for layer 0 to change. This commit makes the knowledge prerequisite smaller.

Contributes to pull request #1290.
2017-01-03 10:52:15 +01:00
Jack Ha
e57de296e7 Readded accidently removed stuff 2017-01-03 10:14:34 +01:00
Jack Ha
55dd08eff8 Somewhat better layout, added legend 2017-01-03 09:18:26 +01:00
14bitVoid
8ee6b89a56 Adds a setting to select skin pattern for first layer 2017-01-02 22:54:53 +01:00
Ghostkeeper
6b7bae4dff
Make prime tower flow inherit from material flow
This is a profile enhancement requested by the material team.
2017-01-02 17:05:30 +01:00
Jack Ha
f0e0d65635 Finishing up compatibility mode 2017-01-02 14:56:31 +01:00
Jack Ha
93137fcc91 Added compatibility mode - old layer view is now also available 2017-01-02 12:56:18 +01:00
Jack Ha
b79f0c6d08 Merge branch 'master' into layer_view3_cleanup 2017-01-02 09:25:19 +01:00
Jack Ha
73a8859b0e WIP second slider LayerView 2017-01-02 09:20:27 +01:00
Jack Ha
e3d77de6df Working quite well 2016-12-30 15:43:32 +01:00
Jack Ha
6271774528 Added all kinds of options to layer view 2016-12-30 15:32:06 +01:00
Jack Ha
fc4c60b0dc Added layer view options 2016-12-30 14:31:53 +01:00
Ghostkeeper
341b92860c
Also format g-code in extruder start and end g-code settings
Would be nice, eh?

Contributes to Github issue #1225.
2016-12-29 20:52:08 +01:00
Jack Ha
1217281727 Busy with layer_view options 2016-12-29 16:49:00 +01:00
Ghostkeeper
5c4526f280 Merge branch '2.4' 2016-12-29 10:53:01 +01:00
Jack Ha
0f2fb86cd9 Layer shader now uses own attribute for line dimensions instead of misusing uvs. 2016-12-28 15:20:14 +01:00
Jack Ha
8d2b3654a4 Layer thickness now as array 2016-12-28 13:15:42 +01:00
Jack Ha
9904dad07b Added line thickness to layer view 2016-12-28 11:30:59 +01:00
Ghostkeeper
42abc76cd9
Update translation templates
These are the string changes that have been introduced for version 2.4.
2016-12-28 10:54:31 +01:00