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
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