GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 18:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,106 Commits 295 Branches 267 Tags
Commit Graph

16106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
4111318c7a Remove duplicate shortcut in French, so the CI won't fail on it. 2018-09-20 08:56:01 +02:00
Ghostkeeper
f99c48575e
Merge branch '3.5' 2018-09-19 17:31:52 +02:00
Ghostkeeper
ea4015c2cf
Fix missing report links 
My IDE crashed while doing a replace all. I see that it missed a few.

Contributes to issue CURA-5741.
 2018-09-19 17:31:39 +02:00
Ghostkeeper
95c9f9a2d5
Merge branch '3.5' 2018-09-19 17:27:00 +02:00
Ghostkeeper
ec42a96179
Update version number and fix reporting link 
I don't know, did we always have it refer to Uranium's issues page?

Contributes to issue CURA-5741.
 2018-09-19 17:25:57 +02:00
Ghostkeeper
f6b56a6506
Merge branch '3.5' 2018-09-19 17:16:14 +02:00
Ghostkeeper
91ed1171c2
Update translation sources for Cura 3.5 
This is updated from the new cura.pot template.

Contributes to issue CURA-5741.
 2018-09-19 17:15:09 +02:00
Ghostkeeper
f9923e5fe7
Remove duplicate messages 
These were duplicate because CMake of this plug-in put a copy of the JSON file in the build directory.

Contributes to issue CURA-5741.
 2018-09-19 17:13:53 +02:00
Ghostkeeper
10e0175947
Update translation templates for Cura 3.5 
These are the new strings for Cura 3.5.

Contributes to issue CURA-5741.
 2018-09-19 17:10:58 +02:00
Simon Edwards
9d85f3ece6 Use the same string as the web front-end 
CL-897
 2018-09-19 17:02:46 +02:00
Simon Edwards
b7673a7438 Show Cura Connect alerts in the monitor tab 
CL-897
 2018-09-19 16:53:18 +02:00
Ghostkeeper
04b74d2285
Fix typo in Extra Infill Wall Count description 
Some very observant user found this small typo. Thanks.
 2018-09-19 13:58:09 +02:00
Ian Paschal
7ad6fc4cad
Merge pull request #4385 from Ultimaker/monitor_confirmation_dialogues 
Add confirmation dialogues before making destructive changes in UM3/S5 monitor
 2018-09-19 13:14:39 +02:00
Aleksei S
cb49ffa2d2 Updated the script according to the requested changes 
CURA-5734
 2018-09-18 17:42:01 +02:00
Ghostkeeper
28f743c9f4
Merge branch '3.5' 2018-09-18 17:30:08 +02:00
Ghostkeeper
44d828d137
Merge branch 'CURA-5725_simulation_stop_key_press' into 3.5 2018-09-18 17:29:35 +02:00
Diego Prado Gesto
ed9b0dd41b Add a missing bracket back. 
Contributes to CURA-5725.
 2018-09-18 17:25:35 +02:00
Ghostkeeper
e5154e90a7
Merge branch '3.5' 2018-09-18 17:19:03 +02:00
Ghostkeeper
e41361a053
Fan speed override is about supported areas, not bridged areas 
This is a correction suggested by Smartavionics (the author of that setting) on the Ultimaker forum thread about the 3.5 beta.
 2018-09-18 17:18:37 +02:00
Diego Prado Gesto
13cab3653e Remove unworking code that I forgot to remove after explaining a 
possible solution to myself.

Contributes to CURA-5725
 2018-09-18 17:09:57 +02:00
Diego Prado Gesto
c31f584e5b Fix my own mistake. The keys act throught the labels and the function in 
the labels is called setValue that then points to the setValueManually.

Contributes to CURA-5725.
 2018-09-18 17:04:24 +02:00
Diego Prado Gesto
0ef46feeae Fix code style. 
Contributes to CURA-5725.
 2018-09-18 16:53:25 +02:00
Diego Prado Gesto
f965b66c87 Stop the simulation also when the range slider is used. Reuse some code. 
Contributes to CURA-5725.
 2018-09-18 16:30:15 +02:00
Lipu Fei
3b62284276 Merge remote-tracking branch 'origin/3.5' 2018-09-18 16:15:55 +02:00
Lipu Fei
eafd856a14 Merge branch '3.5' of github.com:Ultimaker/Cura into 3.5 2018-09-18 16:11:46 +02:00
Diego Prado Gesto
e28b662649 Clean up the code a bit and update comments. 
Contributes to CURA-5736.
 2018-09-18 16:04:31 +02:00
Lipu Fei
a33ce8178a Support mulitple bundled_packages JSON files 
CURA-5718
 2018-09-18 15:53:56 +02:00
Lipu Fei
9924e3e26c Remove duplicated code 
CURA-5735
 2018-09-18 15:08:55 +02:00
Aleksei S
1b1ca8a53b Fix, simulation did not play after second layer 
CURA-5725
 2018-09-18 14:39:43 +02:00
Aleksei S
f33576cc81 Stop simulation after pressing Up or Down in simulation layer textfield 
CURA-5725
 2018-09-18 13:56:20 +02:00
Lipu Fei
ddc5d983a1 Fix single extrusion machines without an ExtruderStack 
CURA-5736
 2018-09-18 13:35:25 +02:00
Ghostkeeper
e5778be887
Corrections to change log 
One was missing. One was confusing. One was incomplete.

Contributes to issue CURA-5710.
 2018-09-18 12:41:44 +02:00
Ghostkeeper
3a096cdb23
Add confirmation dialogue for deleting jobs 
Re-using MessageDialog again.

Contributes to issues CL-1053 and CURA-5729.
 2018-09-18 11:42:34 +02:00
Ghostkeeper
83528ffb48
Add confirmation dialogue for sending prints to top of queue 
Very simple. Just re-use the MessageDialog component.

Contributes to issues CL-1053 and CURA-5729.
 2018-09-18 11:41:51 +02:00
Ghostkeeper
ac4ee8c428
Fix context of pause, resume and abort labels 
More in line with what we have in the rest of our code base.

Discovered during work on CL-1053 and CURA-5729.
 2018-09-18 11:25:35 +02:00
Ghostkeeper
a7a022eca0
Add confirmation dialogue before aborting a print 
It's a destructive operation so we should ask first.

Contributes to issue CL-1053 and CURA-5729.
 2018-09-18 11:24:30 +02:00
Aleksei S
c764b31e06 Update unit test for 'visibilit_settings' and removed unused settings from expert.cfv 
CURA-5734
 2018-09-18 11:10:24 +02:00
Lipu Fei
725ea847a7 Add material_diameter into fdmprinter 
When saving a material to a file, it will save all the settings in that
container, which needs to create SettingInstances for all the cached
ones, and for those instances, their definitions will be retrieved from
the machine definition.

material_diameter is one of the settings, but it only exists in the
extruder definitions, so when it tries to save a material profile, a lot
of warnings/errors will occur due to the missing "material_diameter" in
fdmprinter. Adding it back fixes this problem.
 2018-09-18 10:35:44 +02:00
Ghostkeeper
51d342678e
Merge branch '3.5' of ssh://github.com/Ultimaker/Cura into 3.5 2018-09-18 09:38:55 +02:00
Lipu Fei
b723621fda
Merge pull request #4370 from fieldOfView/fix_usb_printing_port_access 
[3.5][regression]Fix opening port after baudrate detection
 2018-09-17 17:38:12 +02:00
Lipu Fei
4777c3f41d Merge remote-tracking branch 'origin/CURA-5718_fix_upgrade_for_bundled_plugins' 2018-09-17 17:27:32 +02:00
Lipu Fei
da047ea674 isInstalled() should check old plugins as a fallback 2018-09-17 17:26:38 +02:00
Lipu Fei
15657f4cfc Remove unneeded code 2018-09-17 17:26:19 +02:00
Lipu Fei
4db213c55a Fix missing import 2018-09-17 16:24:10 +02:00
Lipu Fei
a4b20e046d Merge remote-tracking branch 'origin/3.5' into CURA-5718_fix_upgrade_for_bundled_plugins 2018-09-17 16:22:22 +02:00
Lipu Fei
6929d96119 Merge remote-tracking branch 'origin/3.5' 2018-09-17 16:14:49 +02:00
Lipu Fei
6d1db55072 Fix SDK version comparison 2018-09-17 16:14:28 +02:00
Lipu Fei
51742b2a68
Merge pull request #4378 from Ultimaker/stop_simulation_when_changing_layers_or_paths 
Stop simulation when dragging handles
 2018-09-17 15:38:59 +02:00
Aleksei S
261600121a Created Cura setting visibility test 2018-09-17 15:29:02 +02:00
Ghostkeeper
816c3cbd11
Fix forgotten separation between header and body 
I copied these over from a piece where they had a different layout.

Contributes to issue CURA-5710.
 2018-09-17 14:43:17 +02:00