GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 10:05:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,379 Commits 295 Branches 268 Tags
Commit Graph

10111 Commits

Author SHA1 Message Date
sm3dp
c2c0f0b902 Added Lotmaxx sc60 profile 2020-05-05 16:00:42 +08:00
Gerard Rubio
bba0a96576
Fixed bed dimensions 2020-05-03 11:54:45 +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
Jaime van Kessel
1775903335
Merge branch 'CURA-7404_fix_xray_green' of github.com:Ultimaker/Cura 2020-04-29 14:59:53 +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
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
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
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
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
Evg33
c866d91e56 UNI3D meshes 2020-04-28 15:18:04 +03: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 037eb9a898e8625497a0f44e31746155c8523662
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 109b5cf8e3311283f60ffb73dc165974cf619faa
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:34:31 2020 +0200

    Spacing much consistent after editor reconfiguration.

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

    Spacing much consistent after editor reconfiguration.

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

    plateform image renamed.

commit e0d95c12558f7da8dcbc1aab966e92a1d67bdebb
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 a069ed5f946b0a9d9830d8ba39c89e7cbe1ffdb2
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Thu Apr 23 23:15:36 2020 +0200

    Reducing size of meshes and image(s)

commit 256d4a5576802ea9c116b4901a79ae17b96ade99
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 ec4cbe6809ba80f84a065a2d875f591110c751ff
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 20:44:30 2020 +0200

    STL size reduced as much I could.

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

    Adding Anycubic Predator printer

commit e4491b30bdc9e9642737d6851c8f7571be368798
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
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
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
Jaime van Kessel
967488095b
Fix weird wording. 
Whoops. It's only been there for a year...
 2020-04-22 15:43:38 +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
Ghostkeeper
085462667e
Merge branch 'CURA-7383_sdk_ver_7_2_0' 2020-04-21 12:03:28 +02:00
Ghostkeeper
e1308f0768
Merge branch '4.6' 2020-04-21 11:42:23 +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