GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 15:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,656 Commits 290 Branches 260 Tags
Commit Graph

2710 Commits

Author SHA1 Message Date
Jack Ha
7281b46118 Merge branch '2.4' 2017-01-25 15:28:56 +01:00
jack
26ad2c8f6e Merge pull request #1378 from fieldOfView/feature_layerview_legend 
Layerview Legend
 2017-01-25 11:53:41 +01:00
fieldOfView
878ccc679c Add a legend to Layer View 2017-01-24 23:24:52 +01:00
Ghostkeeper
a8efde9450 Merge pull request #1243 from fieldOfView/feature_material_cost 
Implement material cost
 2017-01-24 15:54:57 +01:00
Ghostkeeper
3a64f0791a Merge branch 'mb-min-infill-area' of https://github.com/smartavionics/Cura into smartavionics-mb-min-infill-area 2017-01-24 12:55:01 +01:00
Mark Burton
7020e01843 Don't minimise minimum! 2017-01-24 10:50:28 +00:00
Ghostkeeper
46d9d15d02 Merge branch 'mb-min-infill-area' of https://github.com/smartavionics/Cura into smartavionics-mb-min-infill-area 2017-01-24 11:42:22 +01:00
Tim Kuipers
6e66a71ed9 fix: let initial layer bed temp depend on bed temp (CURA-3307) 2017-01-24 10:24:15 +01:00
fieldOfView
32823a0183 Add viewport colors to cura theme 2017-01-23 20:06:06 +01:00
Jaime van Kessel
858886d6b7 Merge branch '2.4' of github.com:Ultimaker/Cura 2017-01-23 15:09:48 +01:00
Jaime van Kessel
3d58bd4d49 Workspace & load image dialog can now be resized 
CURA-3247
 2017-01-23 15:08:37 +01:00
Mark Burton
c017013aae Added min_infill_area setting. 
This allows the user to specify in mm^2 the minimum area of infill regions.
Areas smaller than this will be merged into the surrounding skin rather
than being filled with infill.
 2017-01-19 11:48:17 +00:00
Chris Petersen
f6110623ce Fix typos in kossel_pro gcode variable usage 
Replace double-braces with single-braces so that `material_bed_temperature` and `material_print_temperature` are interpolated properly.
 2017-01-18 01:15:59 -08:00
Simon Edwards
8d146d92b3 Merge branch '2.4' 2017-01-12 13:26:25 +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
Jaime van Kessel
3b29944b0f Merge pull request #1324 from TheRikke/master 
Add definition file for 101Hero
 2017-01-12 09:59:03 +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
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
Enrico
671ec73131 Add definition file for 101Hero 2017-01-09 22:15:42 +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
Ruslan Popov
8578312344 Correction of Russian translation. 2017-01-08 04:45:31 +03:00
Ghostkeeper
6f7de84af0
Merge branch '2.4' 2017-01-07 19:20:22 +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
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
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
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
Ghostkeeper
5c4526f280 Merge branch '2.4' 2016-12-29 10:53:01 +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
Ghostkeeper
ae170830fb
Make minimum fan speeds scale with parent fan speed setting 
Otherwise you get cryptic error messages about settings that may be hidden having invalid values, since minimum fan speed may not be higher than maximum fan speed. The value of the setting with the default settings should be the same.

Contributes to Github issue #1268.
 2016-12-28 10:22:35 +01:00
Victor Larchenko
90f7cebbbb D6: Fixed gcode loading to scene while undo/redo 2016-12-23 15:53:17 -05:00
Victor Larchenko
3605403314 D6: Moved file loading code 2016-12-23 15:53:16 -05:00
Victor Larchenko
26fe0ddbb5 D6: Refactoring 2016-12-23 15:53:16 -05:00
Victor Larchenko
c18b3149da D5: Moved loading files code 2016-12-23 15:53:16 -05:00