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

2681 Commits

Author SHA1 Message Date
Aleksei S
596a7b7169 Added signal to prevent window closing if USB printer is printing 
CURA-5384
 2018-07-11 13:23:30 +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
77bd6cf749 Read material weight from container 
CURA-5408
 2018-07-09 14:20:51 +02:00
Mark
1f51d83fa7
Merge pull request #3982 from fieldOfView/fix_dark_theme_artefact 
Fix a bright line/gap between the viewport and sidebar due to rounding
 2018-07-02 16:50:56 +02:00
Mark
f3d92ecdbf
Merge pull request #3986 from fieldOfView/fix_always_ask 
Clarify Profile Override preference options
 2018-07-02 16:43:20 +02:00
Diego Prado Gesto
ee2dfffb84
Merge pull request #3977 from fieldOfView/fix_preference_pages 
Fixes for preference pages
 2018-06-29 15:00:39 +02:00
fieldOfView
1f7ef027ec Clarify Profile Override preference options 2018-06-27 10:16:39 +02:00
fieldOfView
756288bbb4 Fix a bright line/gap between the viewport and sidebar due to rounding 2018-06-26 22:34:06 +02:00
fieldOfView
3546af86e8 Select the current profile when showing the profiles page 2018-06-26 12:02:41 +02:00
fieldOfView
05b3654346 Fix color of selected items in Profiles and Materials pages 2018-06-26 11:45:07 +02:00
Ghostkeeper
b33bbde2bb
Also open data folder when opening Resources folder 
So now it opens two folders. It could be slightly more annoying to some but usually it's much more useful.

Fixes #1490.
 2018-06-20 09:03:18 +02:00
Lipu Fei
cf0efea4c3 Fix reset to formula button and use new icon 
CURA-5407
 2018-06-13 12:26:26 +02:00
Diego Prado Gesto
c31d329657 Remove preference 'arrange models on load' since it was experimental and 
now the arranger makes the job.
 2018-06-12 13:20:20 +02:00
Lipu Fei
a04bf7d814 Merge remote-tracking branch 'origin/3.4' 2018-06-11 11:32:51 +02:00
Ghostkeeper
b55d2eda4f
Remove Polish translation option 
The translator said he won't be maintaining this language any more. Someone else can pick it up now if he wants to, but we'll disable the language until it is complete again.

Contributes to issue CURA-5451.
 2018-06-11 09:14:48 +02:00
Lipu Fei
12a406529e Fix inconsistent curaproject mimetype definition 
CURA-5334

 - In project file writer, it says the mime type is "application/x-curaproject+xml",
   and we decided to use this as THE mime type.
 - Pass preferred_mimetype to save project file dialog so it
   automatically adds the file extension upon open.
 2018-06-07 14:42:36 +02:00
Lipu Fei
3a7a1dbc6d Fix inconsistent curaproject mimetype definition 
CURA-5334

 - In project file writer, it says the mime type is "application/x-curaproject+xml",
   and we decided to use this as THE mime type.
 - Pass preferred_mimetype to save project file dialog so it
   automatically adds the file extension upon open.
 2018-06-07 12:51:54 +02:00
Ghostkeeper
8202b62343
Merge branch '3.4' 2018-06-07 11:38:13 +02:00
Jack Ha
f828c135f8 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-07 11:35:09 +02:00
Lipu Fei
04ecc55e3c
Merge pull request #3850 from Ultimaker/uranium_package_manager 
Move package manager to Uranium
 2018-06-07 11:03:45 +02:00
Diego Prado Gesto
97a1aa1a2b Fix a crash in MaterialManager when the brand of the material is None. 
Fix other possible cases when the type or the color are also None.
 2018-06-07 10:54:23 +02:00
Jack Ha
96f2e6e1ed CURA-5402 hopefully solved merge conflicts 2018-06-06 14:39:53 +02:00
fieldOfView
19b8ca7c70 Remove vestigial references to "monitoringPrint" 2018-06-06 11:22:35 +02:00
Jack Ha
87293e089d Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-06 11:02:10 +02:00
Jack Ha
17b127e8c1 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-06 11:00:09 +02:00
Ghostkeeper
4b581d09e7
Merge branch '3.4' 2018-06-06 10:59:14 +02:00
Aleksei S
dbd286e1cc Save as project the extruder counter starts from 1 2018-06-06 10:47:12 +02:00
Mark
c5929ce26c Revert "The prepare button slices, so it should be a slice button" 
This reverts commit a0263676e1305c2cc4b778ed5cfb7215e938705a.
 2018-06-05 12:00:21 +02:00
Mark
59602d8013 Revert "The prepare button slices, so it should be a slice button" 
This reverts commit a479176c63fe3c53a380b47d0d1abe3b2c80c4a0.
 2018-06-05 11:56:41 +02:00
Lipu Fei
7f7a195627 Fix merge conflicts from 3.4 2018-06-05 09:02:52 +02:00
Lipu Fei
bbd019f9e5 Fix job name UI binding 
CURA-5367

UI should always refer to PrintInformation for the job name.
 2018-06-05 08:58:09 +02:00
Ghostkeeper
02a3067a0c
Reset infill line distance when changing density via recommended mode 
Otherwise the change has no effect.

Contributes to issue CURA-5324.
 2018-06-04 16:58:13 +02:00
Ghostkeeper
bd145c451b
Brackets on new line 
As far as I've seen them when I scrolled through this.

Contributes to issue CURA-5324.
 2018-06-04 16:49:49 +02:00
Diego Prado Gesto
36e72ae744 Merge branch '3.4' into fix_retraction_amount 2018-06-04 14:42:39 +02:00
Mark
a0263676e1 The prepare button slices, so it should be a slice button 2018-06-01 13:36:50 +02:00
Diego Prado Gesto
a4b46be2c5 CURA-5427 Force the material models to update when the machine changes and so 
when the extruder stack changes.
- What happen was that when the extruder model needed to update, the
material model was not updated correctly and so when changing a material, the
node was incorrect.
 2018-06-01 12:58:08 +02:00
Lipu Fei
bb313c45a9 Set job name to "unnamed" if user types in nothing 
CURA-5367
 2018-05-31 16:25:58 +02:00
Diego Prado Gesto
931d4716e1 CURA-5404 Retrieve the material settings' values from the variant before 
retrieving it from the definition if there are not defined in the material.
 2018-05-30 16:58:11 +02:00
Jack Ha
3395610b67 CURA-5357 fix boo boo, rename variable 2018-05-30 09:44:59 +02:00
Ian Paschal
13b3e4afa5 CURA-5357 Drag & dribble multiple packages like a plugable trickle, yo 
Also improved interfacing with `CuraVersion.py`
 2018-05-30 09:11:49 +02:00
Diego Prado Gesto
cc42d993d3
Merge pull request #3854 from fieldOfView/fix_configurationmenu_text 
Fix configurationmenu text
 2018-05-29 13:50:03 +02:00
Lipu Fei
3b0b6d300b Only set user-specified job name when the editting is finished 
CURA-5280
 2018-05-28 17:35:22 +02:00
Lipu Fei
689b88a024 Do not change prefix for user-specified job names 
CURA-5280
 2018-05-28 09:53:49 +02:00
fieldOfView
94813d9e0d Fix untranslatable text 2018-05-25 21:40:57 +02:00
fieldOfView
87555a38c4 Fix text rendering in the ConfigurationMenu 2018-05-25 21:40:30 +02:00
Ghostkeeper
945429195e
Move getCuraPackageManager to Uranium and initialize package manager there 2018-05-24 20:47:09 +02:00
ChrisTerBeke
25d9b875ea
Merge pull request #3593 from fieldOfView/feature_separate_stage_qml 
Separate qml files for Prepare and Monitor stages
 2018-05-24 10:37:02 +02:00
fieldOfView
fb8f735566 Make selecting objects on load optional and opt-in 2018-05-23 10:05:08 +02:00
Aleksei S
403129e2d6 Merge branch 'master' of github.com:Ultimaker/cura 2018-05-22 17:33:41 +02:00