Nino van Hooff
54d2fe95d1
Convert doxygen to rst for CuraProfileReader/Writer
2020-05-08 15:43:12 +02:00
Nino van Hooff
176919eee0
Merge branch 'master' into doxygen_to_restructuredtext_comments
...
# Conflicts:
# plugins/CuraEngineBackend/CuraEngineBackend.py
# plugins/CuraEngineBackend/StartSliceJob.py
2020-05-08 15:31:23 +02:00
Nino van Hooff
797d6ed438
Convert doxygen to rst for CuraEngineBackend
2020-05-08 15:23:51 +02:00
Nino van Hooff
8f3827d5ae
Convert doxygen to rst for 3MFReader/Writer and AMFReader
2020-05-08 15:14:39 +02:00
Nino van Hooff
2ecd30d6a9
Merge branch 'master' of https://github.com/Ultimaker/Cura
2020-05-06 15:08:09 +02:00
Remco Burema
2687578a86
Merge pull request #7624 from Ultimaker/CURA-7022_Add_cloud_printer_within_add_a_connected_printer
...
Cura 7022 add cloud printer within add a connected printer
2020-05-06 11:13:27 +02:00
konskarm
a2737ea47d
Merge pull request #7663 from Evg33/UNI_3D_codes
...
UNI 3D tuning.
2020-05-06 09:49:35 +02:00
konskarm
94e72f32c0
Merge pull request #7660 from gerardrubio/patch-1
...
Fixed bed dimensions for Geeetech A10M
2020-05-04 16:50:15 +02:00
Evg33
d28a88f90c
UNI 3D bugfix layer_0 temperatures
2020-05-04 14:42:14 +03:00
Evgeny Z
82717845bf
UNI 3D startup code
2020-05-03 22:39:28 +03:00
Evg33
ffc97c3d5b
UNI 3D Start/stop codes tuning.
2020-05-03 19:12:19 +03:00
Gerard Rubio
bba0a96576
Fixed bed dimensions
2020-05-03 11:54:45 +02:00
Ghostkeeper
51378cae56
Don't crash if the shader fails to compile
2020-05-01 17:49:29 +02:00
Jaime van Kessel
245a4435e1
Also handle sceneChanged when it's from the root
...
The rest of the code also seems to expect that
2020-05-01 14:39:23 +02:00
Jaime van Kessel
d2be622d48
Merge branch '3mf_platform_meshes' of github.com:Ultimaker/Cura
2020-04-30 14:18:28 +02:00
Kostas Karmas
80a4cfbd75
Remove duplicated line
...
This line is called both outside and inside of _setOutputDeviceMetadata(...)
CURA-7055
2020-04-30 14:03:34 +02:00
Jaime van Kessel
db7429488d
Merge branch 'del_scripts_pycache' of github.com:Ultimaker/Cura
2020-04-30 13:50:57 +02:00
Jaime van Kessel
b7081f9c68
Merge branch 'master' of github.com:Ultimaker/Cura into 3mf_platform_meshes
2020-04-30 13:47:28 +02:00
Jaime van Kessel
2147b2064c
Merge branch '4.6' of github.com:Ultimaker/Cura
2020-04-30 10:37:28 +02:00
konskarm
98eda12f60
Merge pull request #7418 from Evg33/UNI_3D_profiles
...
Adding profiles for UNI 3D Series printers
2020-04-29 17:24:24 +02:00
Evg33
436d36ae90
UNI3D: fix startup code and machine_extruder_count=2
2020-04-29 18:10:43 +03:00
Remco Burema
4b4864485c
CURA-7409 Update keep/discard dialog more.
2020-04-29 16:23:06 +02:00
Kostas Karmas
b008f1e823
Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer
2020-04-29 15:37:53 +02:00
Kostas Karmas
61e2cc1193
Fix missing type for result
2020-04-29 15:33:28 +02:00
Kostas Karmas
07fcdf905e
Add tests for the DiscoveredCloudPrintersModel
...
CURA-7022
2020-04-29 15:02:26 +02:00
Kostas Karmas
6959c9ac42
Rename _discovered_ultimaker_cloud_printers_list to _discovered_cloud_printers_list
...
CURA-7022
2020-04-29 15:01:50 +02:00
Jaime van Kessel
1775903335
Merge branch 'CURA-7404_fix_xray_green' of github.com:Ultimaker/Cura
2020-04-29 14:59:53 +02:00
Kostas Karmas
b459895589
Add comments
...
CURA-7022
2020-04-29 14:19:28 +02:00
Kostas Karmas
4a49c1cc8d
Fix bottom margin of the discoveredCloudPrintersScrollView
...
CURA-7022
2020-04-29 14:14:01 +02:00
Ghostkeeper
dfa021ab20
Fix upgrade of preference if visible settings was not modified
...
Oops. Small oversight. This could lead to the preferences file being erased completely.
Found during work on Sentry issue CURA-NH.
2020-04-29 14:10:07 +02:00
Ghostkeeper
abffb6c26c
Don't crash when reading corrupt 3MF files
...
Otherwise it would crash with a BadZipFile error. We should be robust against that. This will trigger a generic message that we couldn't read that file to the user, and put more information in the log.
Fixes Sentry issue CURA-NH.
2020-04-29 14:07:04 +02:00
Ghostkeeper
dcac9b6a87
Prevent a crash when retrying even though it completed in the meanwhile
...
Fixes Sentry issue CURA-NA.
2020-04-29 14:07:03 +02:00
Ghostkeeper
bf3d6c67d9
Check the bounding box before using it
...
Some objects don't have a bounding box if they are improperly constructed by a plug-in.
Fixes Sentry issue CURA-N3.
2020-04-29 14:07:03 +02:00
Kostas Karmas
2fb7e67043
Cleanup _update()
...
CURA-7022
2020-04-29 13:55:03 +02:00
Jaime van Kessel
481da09975
Merge branch 'master' of github.com:Ultimaker/Cura
2020-04-29 13:51:35 +02:00
Jaime van Kessel
084e80bcda
Only connect a cloud printer if it's the active one
...
By splitting up the correctly setting of metadata and actually
connecting, the distinction can be made.
CURA-7055
2020-04-29 13:48:06 +02:00
Kostas Karmas
58b61f2331
Remove unnecessary newCloudPrintersDetected variable
...
Variable newCloudPrintersDetected is no longer needed, as it is communicated through the
signal itself.
CURA-7022
2020-04-29 13:47:11 +02:00
Kostas Karmas
eda868f938
Make the discovered cloud printers model generic
...
Removed the dependency of the DiscoveredCloudPrintersModel on CloudOutputDevice,
which is Ultimaker specific. This can allow even external plugins to add to this
model in the future.
CURA-7022
2020-04-29 13:31:45 +02:00
Remco Burema
476262acc7
Merge branch 'master' of https://github.com/Ultimaker/Cura
2020-04-29 13:03:25 +02:00
Remco Burema
3604e75cce
CURA-7409 Update keep/discard dialog.
2020-04-29 13:02:48 +02:00
Kostas Karmas
fb328bd307
Display a summary of the Cloud printers added after login in WelcomeWizard
...
If the user has cloud printers linked to his/her account, then the welcome
wizard will display a summary of the cloud printers that were found in the account
and added in Cura.
CURA-7022
2020-04-29 12:11:05 +02:00
Remco Burema
4c4e611629
Fix x-ray error color.
...
X-ray errors showed as green and translucent instead of read and solid. Now fixed.
CURA-7407
2020-04-29 12:06:20 +02:00
Kostas Karmas
c7cf0fab2f
Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer
2020-04-29 12:04:04 +02:00
Kostas Karmas
64cfe423fe
Fix moving to next page when no printers in account
...
Fixed a bug where the welcome wizard was not moving to the next page
if the account had no printers connected to it.
CURA-7019
2020-04-29 11:49:45 +02:00
Kostas Karmas
411a02a827
Simplify the DiscoveredUltimakerCloudPrintersModel reference calls
...
CURA-7022
2020-04-29 11:40:47 +02:00
Kostas Karmas
d6f150a523
Rearrange the AddPrinterPagesModel and mark "Add Cloud Printer" page as final
...
In order to avoid cases where the "Machine actions" page would lead to the "add cloud printer"
page when pressing next, the AddPrinterPagesModel was rearranged and the "add cloud printer"
page was marked as final.
CURA-7022
2020-04-29 11:38:36 +02:00
Kostas Karmas
b2382593ed
Add is_final_page attribute and mark the "Add Cloud Printers" page as final
...
CURA-7022
2020-04-29 11:37:42 +02:00
maht
c29ebc8a77
Updated change log for 4.6.1
2020-04-29 10:58:11 +02:00
Ghostkeeper
8386d094d3
Improve translation of 'tree support' in German
...
As discussed in #7590 .
2020-04-29 02:08:09 +02:00
Kostas Karmas
e4a6fe954d
Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer
2020-04-28 17:45:55 +02:00
