3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24910 commits 302 branches 270 tags 770 MiB
Commit graph

24910 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
4b62291043 Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-22 16:32:52 +02:00
Nino van Hooff
ec334e0891
Merge pull request #6778 from novamxd/master 
ChangeAtZ 5.2.0
 2020-04-22 16:18:27 +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
Nino van Hooff
6bbfd14d00
Merge pull request #7443 from Ultimaker/CURA-7055_auto_add_cloud_printers 
CURA-7055_auto_add_cloud_printers
 2020-04-22 16:05:40 +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
Jelle Spijker
5ae4ce3b9b
Revised text from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage with the revised text:
"Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise"
 2020-04-22 15:20:39 +02:00
Jelle Spijker
2f632def86
Removed logobot image from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage to no longer show the logobot and removed the logobot.svg
from the resources since it is no longer used.
 2020-04-22 15:18:48 +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
Jaime van Kessel
de7e3f824d
Move the getCfgVersion to base version upgrade 
They can still be overridden, but in the current situation they were
all the same...
 2020-04-22 11:30:35 +02:00
Jelle Spijker
6aedab78dc
Converted comments in dir Cura/cura to rst style 
Converted doxygen style comments to reStructuredText style in the files found in Cura/cura directory using the script dox_2_rst.py (provided in the Uranium repo). Comments were manually checked and changed if needed.
 2020-04-21 16:58:45 +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
maht
27f7f595f8
Updated change log 4.6 stable CURA-7380 2020-04-21 13:29:12 +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
Kostas Karmas
1b1c006998 Skip the Cloud page if the user is logged in 
If the user goes through the welcome wizard, arrives at the login page,
logs in and then closes Cura, he/she will be logged in the next time.
In this case, he/she will go through the welcome page again but will
not see the sign in page at all.

CURA-7019
 2020-04-21 11:23:42 +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
Kostas Karmas
b4909e88ef Rename "Next" button to "Skip" 
CURA-7019
 2020-04-21 10:34:54 +02:00
Ghostkeeper
e30509df53
Fix link with Deltacomb mesh file 
I don't know why this one didn't change along. Thanks to the automated tests to catch that for me.
 2020-04-21 09:54:10 +02:00
Kostas Karmas
ca2962aa12 Revert text to the correct one 
CURA-7019
 2020-04-21 09:46:22 +02:00
Ghostkeeper
b03b41ac59
Optimise deflate compression with ECT 
This would be completely lossless, except that I also told ECT that it can do away with the metadata of the zip archive such as timestamps. But they aren't being used by Cura anyway.
 2020-04-21 08:57:28 +02:00
Ghostkeeper
10b04e5803
Merge branch 'master' into 3mf_platform_meshes 
Conflicts:
	resources/definitions/skriware_2.def.json -> File was rewritten while I modified the platform mesh. All indentation was changed to tabs which caused a merge conflict.
 2020-04-21 08:46:43 +02:00
maukcc
59f105c1b9 HMS434 update 
wipe codes changed
 2020-04-20 15:50:11 +02:00
Kostas Karmas
cac834b101 Refactor "Ultimaker Cloud" page in welcome wizard 
The following changes have been done:
  - Text content changed
  - "Sign in" and "Create an account" buttons moved in the middle,
	under the main text
  - "Sign in" button changed to PrimaryButton format
  - "Finish" button changed to "Skip"
  - "Skip" button format changed

CURA-7019
 2020-04-20 15:12:40 +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
Kostas Karmas
7b464e5550 Close welcome wizard when user has cloud printers 
If the user signs in during the welcome process, if he/she has cloud
printers connected to his/her account, then the welcome wizard will
close so that the user will not be asked to add local printers.

CURA-7019
 2020-04-20 15:06:31 +02:00
Kostas Karmas
7377dd551c Rearrange welcome pages in first run wizard 
Sign in to Ultimaker Cloud page will now appear before the add printer
page.

CURA-7019
 2020-04-20 15:04:53 +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
novamxd
096198ec9a Revamped ChangeAtZ 
Removed some derpug code
 2020-04-19 04:47:54 -05:00
Ghostkeeper
ac23c9df22
Replace STL meshes with 3MF files 
These are much smaller than their STL counterparts. This saves on download and installation time. Maybe also on loading time.
 2020-04-18 22:40:43 +02:00
Dan Podhola
0bf6b457dd Changed M420 to G29 to stop the machine from auto-homing and inadvertantly drawing a triangle 2020-04-18 13:20:07 -07:00
gandzia44
7d7edf1994 fixed variants definitions 2020-04-18 21:53:59 +02:00