3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
28446 commits 307 branches 270 tags 779 MiB
Commit graph

12848 commits

Author SHA1 Message Date
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
maht
c29ebc8a77
Updated change log for 4.6.1 2020-04-29 10:58:11 +02:00
maukcc
617fb12ac0 HMS434 update 
Deleted pla quality profiles
 2020-04-29 09:03:56 +02:00
64bittuning
fe90632a38 Update tronxy_d01.def.json 2020-04-28 23:37:25 -04:00
64bittuning
66b05f5f50 Update tronxy_d01.def.json 
repaired old inherit
 2020-04-28 23:35:52 -04:00
64bittuning
5123623b50 Create tronxy_base_extruder_0.def.json 2020-04-28 23:21:44 -04:00
64bittuning
98f3dbb028 Tronxy Variants 
Needs to be updated with relevant settings
 2020-04-28 23:10:21 -04:00
64bittuning
19b374884c Tronxy Logo Mesh 2020-04-28 23:08:18 -04:00
64bittuning
b592c1b0aa Tronxy Quality pack 
These need to be renamed and tweaked before attempting a PR
 2020-04-28 23:07:31 -04:00
64bittuning
1eaa384676 Tronxy Definition files 
Reposting the original set of def files from #7553. More to follow.
 2020-04-28 23:06:26 -04: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
Kostas Karmas
05e92b953a Size the Welcome Wizard using the theme 
CURA-7022
 2020-04-28 17:44:35 +02:00
Kostas Karmas
1981325b05 Make "Add printers manually" button invisible when cloud printers found 
CURA-7022
 2020-04-28 16:31:01 +02:00
Jaime van Kessel
9e68bcb7a0
Merge branch 'feature_objectlist_improvements' of https://github.com/fieldOfView/Cura 2020-04-28 15:40:08 +02:00
Evg33
bee9947d84 UNI3D CR at end of files 2020-04-28 16:29:07 +03:00
Evg33
b87444f571 UNI3D setting_version 13 2020-04-28 16:26:25 +03:00
Evg33
6b51f62411 UNI3D platforms 2020-04-28 16:09:10 +03:00
Evg33
80e0078979 UNI3D settings version 13 2020-04-28 15:56:34 +03:00
Evg33
61cfcf6b08 UNI3D extruders 2020-04-28 15:43:54 +03:00
Kostas Karmas
ea404af973 Transfer cloudPrintersDetectedChanged in DiscoveredUltimakerCloudPrintersModel 
CURA-7022
 2020-04-28 14:19:28 +02:00
Evg33
c866d91e56 UNI3D meshes 2020-04-28 15:18:04 +03:00
Kostas Karmas
6583f5f5ac Reset the model when pressing the Add cloud printer button 
CURA-7022
 2020-04-28 12:08:48 +02:00
Ghostkeeper
68e8261c21
Squashed commit of the following: 
commit 96187e21580e10ba3006895c0a0613cb1fa66c4d
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Tue Apr 28 11:52:29 2020 +0200

    Update setting_version of recently merged profiles

    None of these had any settings that needed to be deleted or updated. I'm updating them so that they load properly in Cura 4.7.

    Contributes to issue CURA-7403.

commit 80bea3caa14139c189fc10c6874867d104df2fd7
Merge: 174b58374 037eb9a89
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Tue Apr 28 11:41:31 2020 +0200

    Merge branch 'master' of https://github.com/curso007/Cura into curso007-master

commit 037eb9a898
Merge: 109b5cf8e 772fd650a
Author: Cataldo URSO <curso007@users.noreply.github.com>
Date:   Fri Apr 24 19:36:01 2020 +0200

    Merge pull request #2 from Ultimaker/master

    Resync with Ultimaker

commit 109b5cf8e3
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:34:31 2020 +0200

    Spacing much consistent after editor reconfiguration.

commit cdea1a7d59
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:28:18 2020 +0200

    Spacing much consistent after editor reconfiguration.

commit bc8422d4ee
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 00:14:38 2020 +0200

    plateform image renamed.

commit e0d95c1255
Merge: a069ed5f9 b1e95d7a8
Author: Cataldo URSO <curso007@users.noreply.github.com>
Date:   Fri Apr 24 00:03:57 2020 +0200

    Merge pull request #1 from Ultimaker/master

    Resync with ultimaker

commit a069ed5f94
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Thu Apr 23 23:15:36 2020 +0200

    Reducing size of meshes and image(s)

commit 256d4a5576
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 21:03:02 2020 +0200

    Try to fix errors comming from the CI

commit ec4cbe6809
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 20:44:30 2020 +0200

    STL size reduced as much I could.

commit 8a6468943a
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 18:17:13 2020 +0200

    Adding Anycubic Predator printer

commit e4491b30bd
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Tue Apr 21 18:51:29 2020 +0200

    Adding the mesh for the FLSUN QQ-S thanks to Eddy Emck
 2020-04-28 11:55:15 +02:00
Ghostkeeper
f4f990708f
Remove old 'category' metadata 
Most of it was incorrect and very inconsistent too. These are not used by our code any more.
 2020-04-28 09:27:31 +02:00
Kostas Karmas
1d4225a44a Refine the AddCloudPrinter page to display the new cloud printers 
Added a scrollView to the page, which depends on the DiscoveredUltimakerCloudPrinters
model and displays the printer name, type, and firmware version. If the model is
empty, this page displays a busy indicator and a message instead.

In addition, whenever the "Add printer manually" or "Finish" button are pressed,
they also reset the DiscoveredUltimakerCloudPrintersModel.

CURA-7022
 2020-04-24 19:21:01 +02:00
Strahler85
a6f60df2ed
Add nozzle profiles for Ender 3 pro 
These profiles were posted as solution for #7550 by Strahler85. I'm committing this in his name.

Fixes #7550.
 2020-04-24 14:07:33 +02:00
Remco Burema
b1e95d7a80
The Pro has a smaller build-volume apparently. 2020-04-23 20:34:25 +02:00
Kostas Karmas
889ed90adb End the wizard if we have found a network printer 
CURA-7019
 2020-04-23 17:27:30 +02:00
Kostas Karmas
e7d12745e1 Fix redirecting to "cloud" page when finding a network printer 
CURA-7019
 2020-04-23 17:18:19 +02:00
Kostas Karmas
1aea28a8eb Add busyIndicator and text in AddCloudPrintersView 
CURA-7022
 2020-04-23 15:10:45 +02:00
Kostas Karmas
15e7cb44af Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-23 15:07:18 +02:00
Nino van Hooff
3ba284b36c
Merge pull request #7539 from Ultimaker/CURA-7019_Move_sign_in_screen_in_front_of_add_printer_in_first_run_wizard 
Cura 7019 move sign in screen in front of add printer in first run wizard
 2020-04-23 14:56:31 +02:00
Kostas Karmas
1602b71841 Inform the Cloud page about new cloud printers 
Properly close the welcome screen if the user has signed in and has
cloud printers linked to his/her account. If he doesn't have any, move
to the next page of the welcome wizard.

CURA-7019
 2020-04-23 09:59:32 +02:00
Strahler85
83adb98a5f
Add nozzle profiles for Ender 3 pro 
These profiles were posted as solution for #7550 by Strahler85. I'm committing this in his name.

Fixes #7550.
 2020-04-23 00:30:01 +02:00
Ghostkeeper
a0dc78cb39
Merge branch 'master' of https://github.com/dpodhola/Cura into dpodhola-master 2020-04-22 19:04:53 +02:00
Jaime van Kessel
13105cfbd7
Merge branch 'master' of github.com:Ultimaker/Cura 2020-04-22 17:20:59 +02:00
Kostas Karmas
1030945c5d Merge branch 'master' into CURA-7019_Move_sign_in_screen_in_front_of_add_printer_in_first_run_wizard 2020-04-22 16:51:40 +02:00
Kostas Karmas
1d7c327b36 Redirect to "Add cloud printer" page when button clicked 
CURA-7022
 2020-04-22 16:15:24 +02:00
Kostas Karmas
a4c5e63355 Add "Add cloud printer" button in "Add a printer" page 
CURA-7022
 2020-04-22 16:10:31 +02:00
Kostas Karmas
41c472c2ed Add "Add a Cloud printer" QML page 
CURA-7022
 2020-04-22 16:09:24 +02:00
Jaime van Kessel
967488095b
Fix weird wording. 
Whoops. It's only been there for a year...
 2020-04-22 15:43:38 +02:00
maukcc
f66cf6f4d0 HMS434 update 
material exclusion
 2020-04-22 13:46:52 +02:00
Remco Burema
d078c465ee
Reduce branches in shader. 
part of the further fallout of CURA-7147
 2020-04-22 11:51:21 +02:00
Remco Burema
7ed59503d6
Round doesn't work for OpenGL 2.1 because it was only added in glsl 130. 
So mad at myself right now >:-(
Part of the further fallout of CURA-7147
 2020-04-22 11:49:27 +02:00
Ghostkeeper
888937d03b
Use initial layer bed/print temperatures 
These are more likely what the user wants the printer to start up to.

Fixes #7505.
 2020-04-22 11:39:10 +02:00
konskarm
cf604c0f20
Merge pull request #7497 from maukcc/master 
HMS434 update
 2020-04-21 16:50:22 +02:00
maht
27f7f595f8
Updated change log 4.6 stable CURA-7380 2020-04-21 13:29:12 +02:00