GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 09:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,373 Commits 292 Branches 265 Tags
Commit Graph

16373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
2c7e7a4ad7 Merge branch '3.6' into rename_ToolBox_to_Marketplace 2018-10-31 09:47:33 +01:00
Diego Prado Gesto
33da50df26 Rename other entries of the Toolbox to Marketplace. 
Add a line in the Changelog indicating that the Toolbox was renamed.

Contributes to CURA-5874.
 2018-10-31 09:45:29 +01:00
Remco Burema
e887c260ab Add contributors to printer-defs section in the 3.6-changelog. 
part of [CURA-5871] Release notes Cura 3.6 Beta
 2018-10-31 09:30:41 +01:00
Diego Prado Gesto
e2254fe039 Merge branch '3.6' into rename_ToolBox_to_Marketplace 2018-10-31 09:20:38 +01:00
Remco Burema
bae491ae7d Merge branch 'CURA-5839_cc06' into 3.6 2018-10-30 16:08:50 +01:00
Lipu Fei
0068dc81b1 Update bundled material packages due to CC 0.6 
CURA-5839

 - Update bundled material package versions which has material profiles
   updated due to CC 0.6
 - Fix sdk_versions by changing them to 5
 - Add bundled material packages for new materials for CC 0.6
 2018-10-30 15:15:07 +01:00
Simon Edwards
03dd26e6e2
Merge pull request #4692 from Ultimaker/monitor_tab_spacing_improvements 
Monitor tab spacing improvements
 2018-10-30 14:57:18 +01:00
Simon Edwards
839f1f2adc
Merge pull request #4691 from Ultimaker/CL-1118_no_context_menu_on_finished_jobs 
CL-1118 Don't show the context menu for printed jobs
 2018-10-30 14:37:16 +01:00
Ian Paschal
30c7a2cbe5 Monitor tab spacing improvements 
Fixing CL-1063 (adding camera button at all times) introduced a few small spacing issues. This PR fixes them.
 2018-10-30 13:58:42 +01:00
Ian Paschal
0273cd2a0e Don't show the context menu for printed jobs (only active ones and queued ones) 
Contributes to CL-1118
 2018-10-30 13:44:24 +01:00
Ian Paschal
1680548a39 Remove extra empty line 2018-10-30 13:36:52 +01:00
Lipu Fei
09e7603dd6 Update nozzle_id to CC Red 0.6 
CURA-5839
 2018-10-30 12:28:58 +01:00
Simon Edwards
d64465ca48
Merge pull request #4689 from Ultimaker/CL-1063_always_show_camera_monitor 
CL-1063 Always show camera icon in monitor tab
 2018-10-30 11:49:58 +01:00
Ghostkeeper
ab7f69bc1b
Add change log for Cura 3.6 
Implements CURA-5871.
 2018-10-30 11:10:45 +01:00
Lipu Fei
f0fa03c3ce Add CC 0.6 for UM S5 
CURA-5839
 2018-10-30 10:58:40 +01:00
Ian Paschal
adac66b3f7 Always show camera icon in monitor tab 
Contributes to CL-1063
 2018-10-30 10:53:43 +01:00
Ghostkeeper
e2b6a3f411
Add white background to thumbnails 
Regardless of the theme, the thumbnail should always have a white background so that the author can base their colours on that. Also this properly renders transparent images with a white background so that the Ultimaker robot is visible again in the dark theme.
 2018-10-30 10:39:29 +01:00
Mark
fda0f59c70 Rename user visible entries of ToolBox to Marketplace 
CURA-5874
 2018-10-30 10:27:22 +01:00
Lipu Fei
b07af898eb
Merge pull request #4662 from Ultimaker/CURA-5767_disable_per_meshgroup_settings_for_one_at_a_time 
[3.6] [CURA-5767] Disable per-meshgroup settings in the per-mesh settings when in one-at-a-time mode.
 2018-10-30 07:41:25 +01:00
Lipu Fei
39158a643c Revert "Ignore per-meshgroup settings in per object stack" 
CURA-5767

This reverts commit 54afa799c54bf3727481241e5e5f45dffb7e3442.
 2018-10-30 07:33:55 +01:00
Ghostkeeper
f0d7c6fb52
Update version number to 3.6 
And fill in the report-msgid-bugs-to field where it was missing. There always seems to be something wrong with that metadata.

Contributes to issue CURA-5870.
 2018-10-29 15:13:25 +01:00
Ghostkeeper
9c65cc49e4
Update translation templates for all languages for 3.6 
This adds the new translations to 3.6 to the pre-filled translations from previous translation passes.

Contributes to issue CURA-5870.
 2018-10-29 15:08:03 +01:00
Lipu Fei
54afa799c5 Ignore per-meshgroup settings in per object stack 
CURA-5767
 2018-10-29 15:05:49 +01:00
Ghostkeeper
cc8f7f1e0a
Update translation templates for Cura 3.6 
These are the new and changed strings for version 3.6.

Contributes to issue CURA-5870.
 2018-10-29 15:05:08 +01:00
Lipu Fei
248bf0f61e Merge remote-tracking branch 'origin/3.6' into CURA-5767_disable_per_meshgroup_settings_for_one_at_a_time 2018-10-29 14:32:44 +01:00
Lipu Fei
1623f66c93
Merge pull request #4656 from fieldOfView/fix_network_camera_memory_leak 
[3.6] Fix memory leak in print monitor
 2018-10-29 14:12:31 +01:00
Aldo Hoeben
699fc6d482
Merge pull request #3 from LipuFei/fix_url_pyqt 
Change camera URL to non-optional QUrl
 2018-10-29 13:42:14 +01:00
Lipu Fei
02681a5700 Change camera URL to non-optional QUrl 
Otherwise pyqt property will complain when it tries to convert a None to
a QUrl.
 2018-10-29 13:25:23 +01:00
Ghostkeeper
718df14d07
Merge branch 'add_bundled_materials' into 3.6 2018-10-29 13:18:19 +01:00
fieldOfView
0c1b3931db Revert "WIP: Add custom CameraView for UM camera feed" 
This reverts commit b00ea4719a268ec4b000375343bbc4082783b435.
 2018-10-29 11:18:55 +01:00
fieldOfView
e0d6bac37d Fix remaining references to NetworkCamera and OutputDevice.activeCamera 2018-10-29 11:18:54 +01:00
fieldOfView
736bf040a8 Fix typing and typos 2018-10-29 11:18:54 +01:00
fieldOfView
484b1e5ec6 Remove CameraImageProvider and NetworkCamera 2018-10-29 11:18:53 +01:00
fieldOfView
c187b6a25c Replace NetworkCamera with NetworkMJPGImage 2018-10-29 11:18:39 +01:00
fieldOfView
890ddc015e Add Cura.NetworkMJPGImage widget 2018-10-29 11:17:41 +01:00
Lipu Fei
2223ff14f7 Fix extruder index for material diameter box in MachineSettings dialog 
CURA-5857
 2018-10-29 10:40:25 +01:00
Remco Burema
5133b6300a
Merge pull request #4650 from Ultimaker/CURA-5857_fix_machine_settings_set_diameter 
[3.6] [CURA-5857] Fix setting extruder material diameter in Machine Settings dialog
 2018-10-26 17:35:50 +02:00
Remco Burema
de680f4aac
Merge pull request #4669 from Ultimaker/CURA-5821_fix_camera_memory_leak 
Cura 5821 fix camera memory leak
 2018-10-26 15:00:03 +02:00
Diego Prado Gesto
87086907da Add some Ultimaker materials to the list of bundled materials, so they 
will show as installed in the Toolbox.
 2018-10-26 12:14:27 +02:00
Remco Burema
24f9804f03 Disable per-meshgroup settings in the per-mesh settings when in one-at-a-time mode. 
[CURA-5767]

The backend can't handle per mesh-group settings (as opposed to per mesh settings)
when sequence was in one-at-a-time mode. The problem is that the extruder train is
in between the per-meshgroup-settings (child-of) and per-mesh-settings (parent-of).
For any per-mesh-group settings, the possibility exists that they'll be overridden
by settings we always set (and that need to be set) per extruder. Changing this
would require the engine-architecture to change, and _all_ settings would need to
be thouroughly retested. As this was a too extensive change, it was decied just to
disable the per-meshgroup settings when printing one-at-a-time (too).

The issue was originally reported as:
'"Printing Temperature Initial layer" setting per mode does not work'
 2018-10-26 11:01:46 +02:00
Ian Paschal
75e351304c
Merge pull request #4652 from Ultimaker/CL-1119_monitor_tab_printer_names_clipped_too_short 
CL-1119 Use shorter machine name for skeleton and longer for text (Fix for 3.6)
 2018-10-25 16:52:50 +02:00
Ian Paschal
94d48101d9 Use different lengths for loading skeleton and printer name 
Contributes to CL-1119
 2018-10-25 16:45:49 +02:00
Diego Prado Gesto
f1d94d921c The MachineManager doesn't have the extruder stacks but the active 
machine does, so use it when setting the compatible material diameter to
the current extruder.

Contributes to CURA-5857.
 2018-10-25 16:27:16 +02:00
Diego Prado Gesto
197bf057cc Merge branch '3.6' into CURA-5857_fix_machine_settings_set_diameter 2018-10-25 15:57:26 +02:00
Jason Scurtu
2227c1debf recheck 2018-10-25 15:52:48 +02:00
Jason Scurtu
2c43294472 use "material_print_temperature" in material profile 2018-10-25 15:52:39 +02:00
Jason Scurtu
2b70613345 fix and improve 4max profile 2018-10-25 15:52:25 +02:00
Jason Scurtu
9532cc70b8 Disable has_machine_quality for now.. 
Needs more adjustment
 2018-10-25 15:52:12 +02:00
Jason Scurtu
73c6bdf028 Add Anycubic 4Max profile 2018-10-25 15:51:59 +02:00
Ghostkeeper
af325238f2
Merge branch 'addVariants' of https://github.com/ValentinPitre/Cura into ValentinPitre-addVariants 2018-10-25 15:48:07 +02:00