3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
17030 commits 307 branches 270 tags 779 MiB
Commit graph

7343 commits

Author SHA1 Message Date
Diego Prado Gesto
f1379135e0 CURA-5510 Add the Generic materials to the list of the bundled packages 
so that they show up as installed.

Show the installed icon on those packages as well.
 2018-07-17 13:49:17 +02:00
Ian Paschal
f1efaa78b7 General version to v4, fixed bed temp 
Contributes to CURA-5499
 2018-07-17 13:22:15 +02:00
Ian Paschal
139ac5c546 Quality profile fixes 
Contributes to CURA-5499
 2018-07-17 13:18:22 +02:00
Ian Paschal
ed1e47dcc9 Moved material diameters to extruders defs 
Contributes to CURA-5499
 2018-07-17 10:56:33 +02:00
Lipu Fei
636d145d08
Merge pull request #4089 from Ultimaker/disable_extruder_swith_to_default 
Switch to default extruder if disable the active one
 2018-07-17 10:28:16 +02:00
Lipu Fei
28eaf50bac Fix exit application 
Typo...
 2018-07-17 10:26:14 +02:00
Diego Prado Gesto
c17c440248
Merge pull request #4057 from fieldOfView/fix_jobname_ignored 
Fix setting jobname before saving
 2018-07-17 08:38:14 +02:00
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
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
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
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
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
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
Ghostkeeper
5e4ccf004d
Make default job name translateable 
Contributes to issue CURA-5367.
 2018-07-13 09:59:32 +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 596a7b7169.
 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 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
56d5fc8a62 Merge branch 'master' into CURA-5408-material-profiles 2018-07-12 14:43:33 +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
fieldOfView
aa259cfb06 Enforce focus on save button to ensure edits to jobname happen before saving 
Fixes #4007
 2018-07-11 09:28:40 +02:00
Andreea Scorojitu
07195cc95c
Merge pull request #3976 from MarmaladeForMeat/master 
Update Chinese translation
 2018-07-10 16:54:49 +02:00
Lipu Fei
7658ad34e2
Revert "Move "Exclude Materials" metadata to materials" 2018-07-10 16:27:07 +02:00
Jack Ha
e739a74900 Merge branch 'master' into CURA-5408-material-profiles 2018-07-10 15:48:10 +02:00
Jack Ha
5eb2230d82 Fix default value for getMaterialPreferenceValue other than spool_weight, added cleanup code for saving default values. CURA-5408 2018-07-10 15:40:13 +02:00
Ghostkeeper
a18f77abdd
Move exclude_materials into material profiles 
They are there not 'hardware compatible' any more.

Contributes to issue CURA-5460.
 2018-07-10 15:26:23 +02:00
Ghostkeeper
f712fc0f36
No longer add incompatible materials to materials menus 
This removes the need for the 'compatible' role but I'll keep it in for now in case we want to change the design of this later.

Contributes to issue CURA-5460.
 2018-07-10 15:26:23 +02:00
Ghostkeeper
c0fc0a7eba
Disable material if not compatible 
Similar to how it's displayed in the printer.

Contributes to issue CURA-5460.
 2018-07-10 15:26:23 +02:00
Ghostkeeper
16226bdd48
Move exclude_materials into the material profiles 
An accompanying commit should be done in the fdm_materials repository.

Contributes to issue CURA-5460.
 2018-07-10 15:26:23 +02:00
Ghostkeeper
f0ef236df0
Change tab to spaces 2018-07-10 13:33:30 +02:00
Jack Ha
e7c1d31bee Fixed change material diameter, changed signature of getContainerMetaDataEntry. CURA-5408 2018-07-10 13:14:11 +02:00
Lipu Fei
e5a11c1f7b Fix getContainerMetaDataEntry() 
CURA-5408
 2018-07-09 15:12:53 +02:00
Ian Paschal
a596c5a034 Code-style fixes 
Contributes to CURA-5408
 2018-07-09 14:39:13 +02:00
Aleksei S
52f6037576 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-09 14:21:17 +02:00
Aleksei S
77bd6cf749 Read material weight from container 
CURA-5408
 2018-07-09 14:20:51 +02:00
Ian Paschal
9bf4541e06
Merge pull request #3697 from smartavionics/mb-supported-skin-fan 
Added support_fan_enable and support_supported_skin_fan_speed settings.
 2018-07-06 23:17:42 +02:00
alekseisasin
a499a6bb66
Merge pull request #4027 from Ultimaker/feature_prime_tower_shells 
Prime Tower Shells
 2018-07-06 14:39:29 +02:00
Ghostkeeper
ec00e5b721
Remove references to deleted settings 
Also convert the values for prime_tower_min_volume to make it behave similar to what the minimum volume used to be. This feature fixed a bug with the computation from volume to thickness. Now it's correct but we have to correct the old values to be still the same (approximately) as what used to be the end result.

Contributes to issue CURA-5457.
 2018-07-05 13:22:17 +02:00
Ghostkeeper
807e8410c0
Give warning when sum of volumes exceeds volume of prime tower 
It could happen that the desired volume is not entirely reached in the inner shells because of rounding the volume up to the nearest perimeter on the outer shells.

Contributes to issue CURA-5457.
 2018-07-05 10:31:23 +02:00