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

6656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Ha
06a42d98ee Fix PrintInformation if somehow no active material container is found 2017-01-25 16:06:13 +01:00
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
fieldOfView
f0333e2184 Fix typo 2017-01-24 23:18:46 +01:00
Ghostkeeper
a8efde9450 Merge pull request #1243 from fieldOfView/feature_material_cost 
Implement material cost
 2017-01-24 15:54:57 +01:00
Jaime van Kessel
b284e8508a Added extra checks to prevent unneeded signal emits 2017-01-24 13:29:33 +01:00
Jaime van Kessel
699f7a143d Merge branch 'master' of github.com:Ultimaker/Cura 2017-01-24 13:28:42 +01:00
Jaime van Kessel
4e8fb254f6 Only emit signal when the active extruder actually changes 2017-01-24 13:14:10 +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
fieldOfView
b0ea72834f Remove unused import 
Remnant from another, less tidy, approach
 2017-01-24 11:47:02 +01: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
5e121e4039 Use themeable colors for layerdata 2017-01-23 22:11:38 +01:00
fieldOfView
45c8083423 Use themeable colors in Solid, Xray & Layer view 2017-01-23 22:08:27 +01:00
fieldOfView
32823a0183 Add viewport colors to cura theme 2017-01-23 20:06:06 +01:00
Arjen Hiemstra
e9db6498ba Correctly write matrices and the cura version metadata tag 
Fixes an issue with invalid 3MF files
 2017-01-23 17:38:15 +01:00
Ghostkeeper
ac94413e52
Merge branch '2.4' 2017-01-23 17:19:47 +01:00
Ghostkeeper
1727b6dbe1
Add entry that we switched Linux to AppImage format 
It was deemed worthy to mention.

Contributes to issue CURA-3048.
 2017-01-23 17:18:46 +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
awhiemstra
fd3a620945 Merge pull request #1355 from ex-nerd/patch-1 
Fix typos in kossel_pro gcode variable usage
 2017-01-18 12:26:29 +01: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
5766e2728f Some extra tips for users of the profiler. 2017-01-17 08:49:17 +01:00
Simon Edwards
32fd02bd57 Added documentation describing how to use the profiler. 2017-01-16 14:07:10 +01:00
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
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
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