3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
25644 commits 306 branches 270 tags 786 MiB
Commit graph

11203 commits

Author SHA1 Message Date
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
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
maht
aa224dc673
Update change_log.txt 2020-04-20 15:00:32 +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
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
gandzia44
e2d85e4b0f fixed my mistake in changing definition name 2020-04-18 21:39:57 +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
gandzia44
097c6805bd changed version of variants and names of files 2020-04-18 20:50:33 +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
Jaime van Kessel
14f9228a1d
Merge branch '4.6' of github.com:Ultimaker/Cura into 4.6 2020-04-16 13:17:30 +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
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
Ghostkeeper
ec31d7a673
Merge branch '4.6' of https://github.com/kazooless/Cura into kazooless-4.6 2020-04-14 14:18:16 +02:00
maukcc
7345554778 HMS434 update 2020-04-14 12:10:48 +02:00
Evg33
d0c364983a fix startup code 2020-04-13 20:53:55 +03:00
Cláudio 'Patola' Sampaio
df82beaff1 Updated pt_BR translations for Cura 4.6. 2020-04-13 05:08:53 +02:00
fieldOfView
0ed4931056 Add additional information to tooltips in object selector 2020-04-12 15:46:13 +02:00
fieldOfView
4f0c24fecb Reorder code for readability 2020-04-12 09:24:41 +02:00