GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-22 01:53:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,960 Commits 295 Branches 268 Tags
Commit Graph

13410 Commits

Author SHA1 Message Date
Diego Prado Gesto
36ddf2f018 Do not allow the use of "weight" for third party printers 
Otherwise external contributors can manipulate the order in which they appear in the list
 2019-05-13 13:49:00 +02:00
Diego Prado Gesto
cac4b8b7f1 Remove useless comment line 2019-05-13 13:34:13 +02:00
Diego Prado Gesto
233013c946 Cache a lot of items in the list so there are no glitches 2019-05-13 13:23:10 +02:00
maukcc
abf5719f11 HMS434 updates 
Small updates for the HMS434 machine
 2019-05-13 10:01:03 +02:00
Ghostkeeper
022c2678d0
Overwrite gantry height value instead of default_value 
Because fdmprinter now overwrites the value using a formula, the default_value properties are no longer used.
 2019-05-13 09:38:36 +02:00
Ghostkeeper
137619567a
Merge branch '4.1' 2019-05-13 09:32:58 +02:00
Ghostkeeper
e26e825d83
Overwrite gantry height value instead of default_value 
Because the default in fdmprinter has a formula in the value, the default_value properties wouldn't get used any more.
 2019-05-13 09:30:32 +02:00
Ghostkeeper
dbcea27405
Merge branch 'GunZi200-patch-1' 2019-05-10 13:14:55 +02:00
Ghostkeeper
3c94a2c3be
Merge branch 'patch-1' of https://github.com/GunZi200/Cura into GunZi200-patch-1 2019-05-10 13:13:07 +02:00
Guðni Már Gilbert
d5b6b80291
removed an extra comma 2019-05-10 10:07:53 +00:00
Ghostkeeper
36d25b2586
Merge branch 'patch-2' of https://github.com/GunZi200/Cura into GunZi200-patch-2 2019-05-10 11:58:11 +02:00
Ghostkeeper
f238e861b0
Merge branch 'patch-1' of https://github.com/GunZi200/Cura into GunZi200-patch-1 2019-05-10 11:53:43 +02:00
Ghostkeeper
350dd5db3c
Correct positioning of tooltip for g-code text area 2019-05-10 11:32:40 +02:00
Ghostkeeper
67a5490907
Show tooltip on top of control elements 2019-05-10 11:09:56 +02:00
Guðni Már Gilbert
1277220aed
Adjust retraction distance and retraction speed 2019-05-09 22:06:34 +00:00
Guðni Már Gilbert
056f36f6ac
Update creality_ender3.def.json 
I suggest a change to the value of max  Z-axis Jerk to be the same as on Marlin 1.1.9 firmware used by Ender 3. Its a small change, reducing 0,4 to 0,3. Having these settings match the firmware's configuration makes a print's estimated time more accurate.
 2019-05-09 20:40:14 +00:00
Ellecross
d5de401dfa Add the ids for the menu buttons to be used in Squish. 2019-05-09 16:38:06 +02:00
Diego Prado Gesto
f0ccb2504f
Merge pull request #5720 from Ultimaker/add_id_for_custom_profiles 
Added id to the profile page in preferences to identify custom profiles
 2019-05-09 16:27:48 +02:00
Lipu Fei
0d0825e9f3
Merge pull request #5718 from Ultimaker/corner_preference_smart 
Add option to prefer hiding seams in a smarter way
 2019-05-09 15:59:13 +02:00
Jaime van Kessel
4bc348ba49 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-09 15:11:37 +02:00
Satish
f4c00c460d Added id to the profile page in preferences to identify custom profiles 2019-05-09 14:05:04 +02:00
Lipu Fei
2054413952 Add handling for ValidatorState.Invalid 
CURA-6497

ValidatorState.Invalid is set if a string setting has allow_empty =
False and its value is empty.
 2019-05-09 12:07:16 +02:00
Diego Prado Gesto
111430c9c2 Catch scroll events and not propagate them to the main view 2019-05-09 11:37:59 +02:00
Lipu Fei
602258bb4a Fix machine name 
CURA-6510
 2019-05-09 09:45:30 +02:00
Lipu Fei
153c9a5277 Merge remote-tracking branch 'origin/4.1' 2019-05-09 09:40:41 +02:00
Ghostkeeper
97203c2dc1
Add option to prefer hiding in a smarter way 
This option prefers hiding, but if no good hiding spot is available it'll expose the seam on the sharpest outer corner.

Contributes to issue CURA-6489.
 2019-05-08 17:09:55 +02:00
Ghostkeeper
a17fc7842a
Merge branch '4.1' into CURA-6039_fix_raft_disabled_extruder 2019-05-08 15:21:44 +02:00
Ghostkeeper
28b04728f1
A grammar mistake that multiple people seem to be making 
See PR#5695.
 2019-05-08 14:21:57 +02:00
Ghostkeeper
f1bc1a6a29
Merge branch 'patch-1' of https://github.com/kant/Cura into kant-patch-1 2019-05-08 14:20:24 +02:00
Lipu Fei
ebbc950ac1
Add build volume temperature 
CURA-6156
 2019-05-08 14:07:49 +02:00
Remco Burema
db581d4825 Fix prime tower enabled with disabled extruder(s). [CURA-6039] 2019-05-08 13:48:30 +02:00
Ghostkeeper
2c676a3643
Merge branch '4.1' 2019-05-08 10:24:39 +02:00
Ghostkeeper
5b8d2243f7
Change time/material 'specification' into 'estimation' 
Because that's what it is and how you should use it.
 2019-05-08 10:24:21 +02:00
Ghostkeeper
dfeb71992a
Remove custom text property in materials brand section 
It was duplicating the sectionName property.

Contributes to issue CURA-6302.
 2019-05-07 14:27:39 +02:00
Satish
3b4e253e98 Added ids to materials for squish tests 
-Added a text property to MaterialsBrandSection
-Added ids to materials menu buttons
 2019-05-07 12:37:42 +02:00
Diego Prado Gesto
9e5e57e6c5 Merge branch 'master' into feature_model_list 2019-05-07 11:57:31 +02:00
Diego Prado Gesto
6708d9da64 Merge branch '4.1' 2019-05-07 11:49:45 +02:00
Lipu Fei
afeb9b90ec Increase width of toolbox header tab 
CURA-6503
 2019-05-06 13:42:42 +02:00
Lipu Fei
53d595f698 Use loader for machine actions in dialog 
CURA-6495
 2019-05-06 13:06:23 +02:00
Darío Hereñú
282e6975ee
Syntax issue on string 564 
* added a blank space on string 808
* syntax issue on string 1859
* syntax issue on string 2075
* syntax issue on string 3301
* Proposed translation of string 5964: "Solidworks: asistente de exportación"
* syntax issue on string 6133
* Proposed translation of string 7347: "Un relleno denso (50%) dará al modelo una resistencia por encima de la media"
 2019-05-04 23:44:02 -03:00
Mark Burton
abea176f7b Should only be visible when bridge settings are enabled. 2019-05-04 15:31:31 +01:00
Jaime van Kessel
979b29400a Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-03 14:12:07 +02:00
Jaime van Kessel
e363f1af94 Remove hardcoded references to Ultimaker machines in QML 
We shouldn't hardocode machines in QML in any case. It also created issues
for other monitor / connection flows.
 2019-05-03 14:10:21 +02:00
Jaime van Kessel
c786770a44 Remove usage of deprecated functions 2019-05-03 13:52:45 +02:00
Jaime van Kessel
c3a373e2a2 Remove usages of deprecated activeMachineName 2019-05-03 13:38:06 +02:00
Jaime van Kessel
08b79a93be Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-03 13:17:27 +02:00
Jaime van Kessel
d42f446d70 Remove usages of deprecated function 2019-05-03 13:17:10 +02:00
Ghostkeeper
4910bc006b
Move platform mesh a bit down 
This way it's outside of the build volume.

Contributes to issue CURA-6505.
 2019-05-03 10:58:48 +02:00
Ghostkeeper
9463a288d8
Merge branch 'master' of https://github.com/markbernard/Cura into markbernard-master 2019-05-03 10:53:06 +02:00
Lipu Fei
2601e485da Merge remote-tracking branch 'origin/4.1' 2019-05-03 10:47:16 +02:00