GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-11 06:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,119 Commits 295 Branches 268 Tags
Commit Graph

17119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Paschal
46ce90c803 Fix-up Dagoma definitions 
- Removed nozzle size in magis def because it's in the extruder def on other machines
- Removed material diam from disco extruder def because its in the disco machine
- Remove material diam from neva extruder def because its in the neva machine

Contributes to CURA-5499
 2018-07-16 16:54:50 +02:00
Ian Paschal
130a61353f Merge branch 'dagoma_profiles' of https://github.com/dagoma3d/Cura into dagoma3d-dagoma_profiles 2018-07-16 16:46:37 +02:00
Diego Prado Gesto
51c499b08c When the extruder is being disabled and it is the currently selected 
one, then switch to the default extruder. Also do not allow users to
click in a disabled extruder, only if they want to enable it again.
 2018-07-16 16:26:55 +02:00
Ian Paschal
0bde1487e7 Add generic material packages to materials page 
Contributes to CURA-5510
 2018-07-16 16:13:43 +02:00
Lipu Fei
5ba3beb104
Merge pull request #4084 from Ultimaker/add_cartesio_variants 
CURA-5578 Change the Cartesio variants to use the new ones
 2018-07-16 15:55:11 +02:00
Lipu Fei
4ab3e27dff
Merge pull request #4086 from Ultimaker/fix_blank_dropdown 
Fix blank dropdown panel in the comboboxes
 2018-07-16 15:15:48 +02:00
Diego Prado Gesto
6850ad4c9d Align the dropdown panel in the combobox with the parent and get rid of 
binding loop messages.
 2018-07-16 14:54:44 +02:00
Andreea Scorojitu
1d860c51c5
Merge pull request #4085 from Ultimaker/modify_compatibility_message 
Modify the compatibility message to only use glue
 2018-07-16 14:52:31 +02:00
Diego Prado Gesto
543128e28c Modify the suggestion message when a material is not compatible with the 
buildplate to only use glue but not adhesion sheets.
 2018-07-16 13:44:24 +02:00
Jack Ha
4167f81e3b Fix printer missing from the list after connection; now always adds the field 'hidden' in the metadata, don't know why it worked before. CURA-5574 2018-07-16 13:32:35 +02:00
Diego Prado Gesto
5ef8aa09f8 Translate the old material types to the new in the Version Upgrade. 2018-07-16 13:05:32 +02:00
Diego Prado Gesto
14bb8cc180 Modify qualities and variants for the Cartesio printers. 2018-07-16 11:43:23 +02:00
Lipu Fei
e3a193d6a6 Fix invisible texts in setting dropdown menu on Linux 2018-07-16 09:59:45 +02:00
Lipu Fei
9856ccf700
Merge pull request #4073 from Ultimaker/CURA-5572_fix_gcode_reader 
CURA-5572 Update the scene when a Gcode is loaded.
 2018-07-16 08:07:02 +02:00
Lipu Fei
92da6e0ce3
Merge pull request #4072 from Ultimaker/CURA-5536_installed_check 
CURA-5536 Use an icon indicating when a package is installed
 2018-07-16 08:05:00 +02:00
Cherubim
31599485e7
Add slicer keyword 
Doesn't matter much since the keywords is really only used in software managers/browsers where we don't publish Cura, but if someone is to make a package (like people did for Arch and Debian) this should get Cura a few more hits.
 2018-07-14 17:08:12 +02:00
Cherubim
4aca455ec8
Add Dutch translation to desktop file 
Can't hurt, can it?
 2018-07-14 17:05:26 +02:00
Aleksei S
817a304ed1 After reconecting to another port update job status '_is_cancelled' to false 
CURA-5549
 2018-07-13 23:50:02 +02:00
Diego Prado Gesto
01a26b0360 CURA-5572 The scene was not updated when a Gcode was loaded. 
This fixes a bug that we introduced when fixing code style. This was a
bad translation.
 2018-07-13 16:05:13 +02:00
Diego Prado Gesto
af697c6999 CURA-5536 The api call does not return the package_count for the showcase, so we can't trust in that value. The total number of material packages by author is now calculated. 2018-07-13 15:13:38 +02:00
Diego Prado Gesto
a8727d7b39 Merge branch 'master' into CURA-5536_installed_check 2018-07-13 14:43:29 +02:00
Diego Prado Gesto
dd7168e8b8 CURA-5536 Add the installed check also to the featured items. 2018-07-13 13:41:19 +02:00
Diego Prado Gesto
62b1d361fa CURA-5536 Set different colors indicating that all the inner packages 
are installed of just some.
 2018-07-13 13:21:38 +02:00
Diego Prado Gesto
96cc1be2ff CURA-5536 Calculate the number of installed packages by author. 2018-07-13 13:20:56 +02:00
Diego Prado Gesto
1b6c172e6d CURA-5536 Add the icon indicating when a plugin is already installed. 2018-07-13 13:20:32 +02:00
alekseisasin
31891e631c
Merge pull request #4070 from Ultimaker/CURA-5384_confirm_upon_exit 
CURA-5384 confirm upon exit
 2018-07-13 11:54:14 +02:00
Aleksei S
a41f9d0c70 Set machine defintion setting machine_head_with_fans_polygon for Prusa-i3 
CURA-5569
 2018-07-13 11:53:10 +02:00
Aleksei S
db669119f2 Merge branch 'CURA-5384_confirm_upon_exit' of github.com:Ultimaker/Cura into CURA-5384_confirm_upon_exit 2018-07-13 11:48:48 +02:00
Aleksei S
62f219757d Set machine defintion setting machine_head_with_fans_polygon for Prusa-i3 
CURA-5569
 2018-07-13 11:47:42 +02:00
Lipu Fei
6d34d77b6b Reset confirm exit dialog text upon close 
CURA-5384
 2018-07-13 11:10:40 +02:00
Lipu Fei
49bd249819 Update text for USB printing exit confirmation 
CURA-5384
 2018-07-13 11:10:15 +02:00
Ghostkeeper
5e4ccf004d
Make default job name translateable 
Contributes to issue CURA-5367.
 2018-07-13 09:59:32 +02:00
Ghostkeeper
302072bd6e
Set change log URL in Cura instead of Uranium 
This is a Cura-specific URL that was in Uranium.

Contributes to issue CURA-4952.
 2018-07-13 09:46:08 +02:00
Lipu Fei
e6c6edc9eb Fix code style 
CURA-5384
 2018-07-13 09:21:35 +02:00
Lipu Fei
c0b7e40b0d Add on-exit callback management and check for active USB printing 
CURA-5384
 2018-07-13 09:16:11 +02:00
Lipu Fei
ac3d3bc5c0 Revert "Added signal to prevent window closing if USB printer is printing" 
This reverts commit 596a7b7169b9c7e41cd4751f99eea656f67ed2b7.
 2018-07-13 08:08:56 +02:00
Lipu Fei
a0c3767184
Merge pull request #4048 from Ultimaker/CURA-5408-material-profiles 
CURA-5408 weight for materials + bug fixes
 2018-07-13 07:54:58 +02:00
jack
60974fee88
Merge pull request #4067 from Ultimaker/CURA-5562_slicing_reset 
CURA-5562 Avoid resetting slice status when switching to layer view
 2018-07-12 15:25:00 +02:00
Diego Prado Gesto
ac413b00a2
Merge pull request #4068 from Ultimaker/CURA_5458_Change_naming_file_menu 
CURA-5458 Use Save and Export in the File menu
 2018-07-12 15:24:40 +02:00
Jack Ha
abbbdb17e6 Fix if you randomly click around in the materials then some spool_weights of 0 gets mixed up. The cause was that base.containerId was not updated at the same time as properties.guid. CURA-5408 2018-07-12 15:17:46 +02:00
Diego Prado Gesto
395c5d3a8b CURA-5458 Add three dots in the options that will open a new window. 
Add the Save option together with the New and Open, and then separate it
from the Export options.
 2018-07-12 15:16:01 +02:00
Mark
e53e62ccab CURA-5458 Use Save and Export 2018-07-12 14:54:10 +02:00
Jack Ha
23d4e835ed Merge branch 'master' into CURA-5408-material-profiles 2018-07-12 14:44:50 +02:00
Jack Ha
56d5fc8a62 Merge branch 'master' into CURA-5408-material-profiles 2018-07-12 14:43:33 +02:00
Diego Prado Gesto
e88362930d CURA-5562 Don't trigger the stop slicing if some nodes without build 
plate associated with it changes in the scene, such as the NozzleNode in
the SimulationView.
 2018-07-12 14:34:42 +02:00
jack
461b191648
Merge pull request #4044 from Ultimaker/remove-package-check 
CURA-5389 Check and confirmation before Remove package
 2018-07-12 14:15:13 +02:00
Jack Ha
2bd8350141 Added error checking, added typing, renamed function. CURA-5389 2018-07-12 14:06:34 +02:00
Ghostkeeper
abf1610923
Rename Custom FDM Printer to Custom FFF printer 
FFF is easier to type... But that's probably not the real reason why we need to do this.

Contributes to issue CURA-5461.
 2018-07-11 13:30:27 +02:00
Aleksei S
995a95b8ab Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-11 13:24:12 +02:00
Aleksei S
596a7b7169 Added signal to prevent window closing if USB printer is printing 
CURA-5384
 2018-07-11 13:23:30 +02:00