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
14,737 Commits 289 Branches 260 Tags
Commit Graph

6389 Commits

Author SHA1 Message Date
Lipu Fei
aba3795d0b Add extruder definition for all single-extrusion machines 
CURA-5334

All changed printers:

 - 101Hero
 - 3dator
 - abax_pri3
 - abax_pri5
 - abax_titan
 - alya3dp
 - anycubic_i3_mega
 - bfb
 - bq_hephestos
 - bq_hephestos_2
 - bq_hephestos_xl
 - bq_witbox
 - bq_witbox_2
 - creality_cr10
 - creality_cr10s4
 - creality_cr10s5
 - dagoma_discoeasy200
 - dagoma_neva
 - delta_go
 - deltabot
 - deltacomb
 - easyarts_ares
 - fabtotum
 - folgertech_FT-5
 - gmax15plus
 - grr_neo
 - imade3d_jellybox
 - innovo_inventor
 - julia
 - kemiq_q2_beta
 - kemiq_q2_gama
 - kossel_mini
 - kossel_pro
 - kupido
 - makeR_pegasus
 - makeR_prusa_tairona_i3
 - maker_starter
 - makerbotreplicator
 - malyan_m180
 - malyan_m200
 - mankati_fullscale_xt_plus
 - mendel90
 - monoprice_select_mini_v1
 - monoprice_select_mini_v2
 - peopoly_moai
 - printrbot_play
 - printrbot_play_heated
 - printrbot_simple
 - printrbot_simple_extended
 - printrbot_simple_makers_kit
 - prusa_i3
 - prusa_i3_mk2
 - prusa_i3_xl
 - raise3D_N2_plus_single
 - raise3D_N2_single
 - renkforce_rf100
 - rigid3d
 - rigid3d_3rdgen
 - rigid3d_hobby
 - rigid3d_mucit
 - rigid3d_zero
 - rigid3d_zero2
 - rigidbot
 - rigidbot_big
 - robo_3d_r1
 - seemecnc_artemis
 - seemecnc_v32
 - tam
 - tevo_blackwidow
 - tevo_tarantula
 - ubuild-3d_mr_bot_280
 - ultimaker2
 - ultimaker2_extended
 - ultimaker2_extended_plus
 - ultimaker2_go
 - ultimaker2_plus
 - ultimaker_original
 - ultimaker_original_plus
 - uniqbot_one
 - vertex_delta_k8800
 - vertex_k8400
 - zone3d_printer
 - zyyx_agile
 2018-06-08 17:05:31 +02:00
Ghostkeeper
8438406d8b
Revert "CURA-5342 formulafy speed settings so when changing the main speed, the sub speeds change accordingly" 
This reverts commit 9432252de472c76ef5b7df954d4cb18aefc9fff7. It was assuming the wrong default speed_print value of 60. It's not always 60. We need to find a different solution or modify the script.

Reverts the fix for issue CURA-5342.
 2018-06-08 13:44:40 +02:00
Ghostkeeper
fd19f8791e
Merge branch '3.4' 2018-06-08 11:47:29 +02:00
Ghostkeeper
79fb1bb2bd
Correction to translation of Retraction Extra Prime Amount 
Thanks to @getget1980.

Fixes #3789.
 2018-06-08 11:47:07 +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
Ghostkeeper
af2d05ebfa
Remove superfluous 'enabled' field 2018-06-07 13:40:16 +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
Lipu Fei
bf9581e068
Merge pull request #3903 from Ultimaker/formulafy_speeds 
CURA-5342 formulafy speed settings
 2018-06-07 10:48:25 +02:00
Diego Prado Gesto
fbdf950a7b
Merge pull request #3899 from fieldOfView/fix_sidebar_monitoringprint 
Remove vestigial references to "monitoringPrint"
 2018-06-06 19:08:58 +02:00
Jack Ha
9432252de4 CURA-5342 formulafy speed settings so when changing the main speed, the sub speeds change accordingly 2018-06-06 17:07:04 +02:00
Ghostkeeper
c42b275c5d
Merge branch '3.4' 2018-06-06 16:58:01 +02:00
Ghostkeeper
a15831c486
Update translation templates per language 
These are the templates from 3.4.

Contributes to issue CURA-5451.
 2018-06-06 16:57:33 +02:00
Ghostkeeper
0faaf3cd22
Update translation templates for Cura 3.4 
These are the translations for Cura 3.4. Fixed and in-place. Can't change translated texts any more.

Contributes to issue CURA-5451.
 2018-06-06 16:57:32 +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
Ghostkeeper
da4932435c
Add fan speed to basic setting visibility 
It may not be what the users often want to change, but it is something that they may be expecting to see in the custom settings mode by default. It's something that you often think of as a typical setting but in reality you don't often want to change it. Let's get closer to what the user expects. Requested by the support team of Ultimaker.
 2018-06-06 10:56:58 +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
Jack Ha
70d78f3cab CURA-5119 move settings out of wall overlap compensation 2018-06-05 10:36:34 +02:00
Lipu Fei
4598b7a831 Merge remote-tracking branch 'origin/3.4' 2018-06-05 09:55:57 +02:00
Lipu Fei
96ddf61f81
Merge pull request #3878 from Ultimaker/feature_update_old_plugins 
Feature update old plugins
 2018-06-05 09:55:07 +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
Ian Paschal
71f41b8ada CURA-5442 Final fixes 2018-06-04 17:00:59 +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
dfd9fc2ae9 Revert "CURA-5404 Remove retraction_amount values that must be in the material" 
This reverts commit a969d3c5eab54fc904b37611029a704c24c4a120.
 2018-06-04 14:43:00 +02:00
Diego Prado Gesto
36e72ae744 Merge branch '3.4' into fix_retraction_amount 2018-06-04 14:42:39 +02:00
Lipu Fei
61a3668a4f Merge remote-tracking branch 'origin/3.4' 2018-06-01 13:51:00 +02:00
Mark
a479176c63 The prepare button slices, so it should be a slice button 2018-06-01 13:42:48 +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
Lipu Fei
7d8472e588 Merge remote-tracking branch 'origin/3.4' 2018-05-31 12:25:33 +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
Ian Paschal
d68b44791b
Merge pull request #3479 from smartavionics/mb-wall-min-flow 
Added wall_min_flow and wall_min_flow_retract settings.
 2018-05-30 13:44:21 +02:00
Ghostkeeper
86d4f0583c
Make showing of support density image dependent on support pattern 
Because that's what it's actually depending on.

Contributes to issue CURA-4513.
 2018-05-30 13:37:25 +02:00
Ghostkeeper
6ea5924c95
Remove Try Multiple Line Thicknesses setting 
This setting is now always enabled, hard-coded in the engine.
 2018-05-30 10:35:50 +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
9873d57286 CURA-5404 Change default retraction distance to 6.5mm for ultimaker3 and 
S5
 2018-05-29 14:48:34 +02:00
Diego Prado Gesto
a969d3c5ea CURA-5404 Remove retraction_amount values that must be in the material 
profile.
 2018-05-29 14:37:13 +02:00