3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 06:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
23249 commits 313 branches 275 tags 719 MiB
Commit graph

23249 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Kostas Karmas
ad6f837f44 Force reloading the VariantNode if it exists 
When the MachineNode is updated through _loadAll, it was not updating
its VariantNodes when they already existed. This caused an issue to
UM2+Olsson block printers, where changing the G-Code flavor to Marlin
was not updating the VariantNodes to search for materials (since the
variants already existed).

This commit fixes that by forcing an update to the existing Variant
nodes.

CURA-7354
 2020-04-21 14:41:17 +02:00
Ghostkeeper
29b0bd1b23
Merge branch '4.6' 2020-04-21 12:04:01 +02:00
Ghostkeeper
c73082616c
Merge branch 'CURA-7383_sdk_ver_7_2_0' into 4.6 2020-04-21 12:03:47 +02:00
Ghostkeeper
085462667e
Merge branch 'CURA-7383_sdk_ver_7_2_0' 2020-04-21 12:03:28 +02:00
Nino van Hooff
7302e8ba7f Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6 
CURA-7383
 2020-04-21 11:46:12 +02:00
Ghostkeeper
e1308f0768
Merge branch '4.6' 2020-04-21 11:42:23 +02:00
Ghostkeeper
f38ae5bb96
Fix i18n catalog for per-object settings panel 
Turns out that all of these had not been working properly for a while.

Contributes to issue CURA-7344.
 2020-04-21 11:39:49 +02:00
Nino van Hooff
8e5d331e6b
Merge pull request #7536 from Ultimaker/mahtDFR-patch-1 
Updated change log CURA-7380
 2020-04-21 11:05:59 +02:00
Nino van Hooff
e3bc304d5d Update sdk version to 7.2.0 
CURA-7383
 2020-04-21 11:00:06 +02:00
maukcc
59f105c1b9 HMS434 update 
wipe codes changed
 2020-04-20 15:50:11 +02:00
Jaime van Kessel
020f66b245
Add option to overhang shader to make rendering model errors optional 
CURA-7147
 2020-04-20 15:11:28 +02:00
maht
aa224dc673
Update change_log.txt 2020-04-20 15:00:32 +02:00
Jaime van Kessel
9a2d2d32bf
Remove code that prevents Cura from starting on MAC 
The renderer isn't active when the view is activated. As such,
no opengl context *ever* exists. In some cases this might cause it to get
stuck in an indefinate loop.

The comments around it are explaining a situation that can't occur. The activateView
event of SolidView isn't triggered when switching to another view...
 2020-04-20 13:52:40 +02:00
maht
b190870897
Updated change log CURA-7380 2020-04-20 12:50:00 +02:00
Nino van Hooff
40bc3e247f Merge remote-tracking branch 'origin/4.6' into 4.6 2020-04-20 11:58:12 +02:00
Nino van Hooff
e9cff28c5a Add Taiwanese translations for 4.6 
CURA-7344
 2020-04-20 11:27:12 +02:00
Jaime van Kessel
3af44cb634
Ensure consistant spacing 2020-04-20 11:05:33 +02:00
Jaime van Kessel
ecdaecf1db
Merge branch 'patch-1' of https://github.com/skriDude/Cura 2020-04-20 11:03:08 +02:00
Jaime van Kessel
94f8b7dcd7
Merge branch 'optimise_obj_meshes' of github.com:Ultimaker/Cura 2020-04-20 10:46:36 +02:00
Ghostkeeper
fb4aec96a8
Decimate mesh models that were oversized 
We have a guideline for 1MB. I thought we had a unit test for that that makes the tests fail if the models were oversized. But apparently not.
 2020-04-18 21:23:13 +02:00
skriDude
933c44374d
Removed unnecessary parameters. 2020-04-17 17:17:39 +02:00
maukcc
f3093d6bc8 HMS434 update 
roofing layers disabled
 2020-04-17 12:08:21 +02:00
Kostas Karmas
e49d5f9156 Fix trailing slash in wanhao printers 
CURA-7358
 2020-04-16 18:00:57 +02:00
Nino van Hooff
0dda9df420
Merge pull request #7519 from Ultimaker/CURA-7329_Decrease_error_calculation_per_object_stack 
Only check changed settings (and whatever it affects) for errors in POS
 2020-04-16 17:01:50 +02:00
Jaime van Kessel
2da965e46e
Merge branch 'CURA-7147_preview_img_for_cloud' of github.com:Ultimaker/Cura into 4.6 2020-04-16 15:11:20 +02:00
Nino van Hooff
073a7fdce6 Revert "Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects"" 
This reverts commit 4f55c8d8. Since there was a merge conflict, this commit will be left empty.
 2020-04-16 14:49:33 +02:00
Jaime van Kessel
9ec606af5c
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-04-16 13:25:04 +02:00
Jaime van Kessel
ab62ac6e01
Merge branch 'CURA-7364_cloud_sync_message_duplicated' of github.com:Ultimaker/Cura into 4.6 2020-04-16 13:17:40 +02:00
Jaime van Kessel
14f9228a1d
Merge branch '4.6' of github.com:Ultimaker/Cura into 4.6 2020-04-16 13:17:30 +02:00
Remco Burema
ac5213d232
Fix typing. 
part of CURA-7147
 2020-04-16 12:59:36 +02:00
Remco Burema
006822334c
Fetch preview image from cloud for monitor page. 
part of CURA-7147
 2020-04-16 12:18:49 +02:00
Ghostkeeper
33a20fb10b
Merge branch '4.6' 2020-04-15 18:37:24 +02:00
Ghostkeeper
9f38374960
Also track Z coordinates and retract extra for the distance travelled then 
Otherwise if a retracted move had a different Z coordinate, this would not be put in the final print. It's pretty simple to extend it this way.

Fixes #7458.
 2020-04-15 18:37:13 +02:00
Ghostkeeper
76d401df9b
Merge branch '4.6' 2020-04-15 18:28:29 +02:00
Ghostkeeper
0ec020c963
Update Czech translations for Cura 4.6 
These have been mailed to me by DenyCZ.

Contributes to issue CURA-7344.
 2020-04-15 18:26:58 +02:00
Ghostkeeper
4876339d12
Remove extraneous space 
This throws the translation checks off. Fixed it for next time.

Contributes to issue CURA-7344.
 2020-04-15 18:16:44 +02:00
Ghostkeeper
8d51a80a9d
Merge branch '4.6' 2020-04-15 18:15:06 +02:00
Ghostkeeper
972b2e852f
Merge branch '4.6' of https://github.com/Patola/Cura into Patola-4.6 2020-04-15 18:12:49 +02:00
Ghostkeeper
0f6c53c2cb
Merge branch '4.6' 2020-04-15 18:08:08 +02:00
Ghostkeeper
a314c4943b
Fix import script if Uranium is not on your PYTHONPATH 
It was doing an os.path.exists on the relative path which has no context of where we're looking from. So make it absolute first and then check for the existence of the file. Also take the correct parent folder then and improve debug output.
 2020-04-15 18:08:04 +02:00
Ghostkeeper
47073268f9
Corrections to translations 
These were some things that were found by automatic checks in PoEdit.

Contributes to issue CURA-7344.
 2020-04-15 18:06:30 +02:00
Ghostkeeper
1cef21919e
Fix missing plural forms 
The import script doesn't parse these correctly yet. Keep finding them now.
Some of the plural forms were incorrect. They were like that last time as well. Lionbridge isn't translating them correctly, but it's the fault of a very annoying interface in Smartling. I was able to fix all of them decently except Russian, so Russian will have to make do with just plural everywhere.

Contributes to issue CURA-7344.
 2020-04-15 18:06:10 +02:00
Ghostkeeper
7b3482fcd8
Update translations from Lionbridge for Cura 4.6 
These are the new translations we got. I didn't make any corrections yet, but I did already see some mistakes in the Chinese ones.

Contributes to issue CURA-7344.
 2020-04-15 18:06:07 +02:00