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

14977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Paschal
68e1b58c89
Merge pull request #3925 from Ultimaker/feature_send_material_profiles 
Send material profiles via wifi
 2018-07-02 13:54:38 +02:00
Ian Paschal
adc7fc58e9 Fixed method naming conflict 2018-07-02 13:53:35 +02:00
Diego Prado Gesto
057685e8ea Merge branch '3.4' 2018-07-02 13:14:55 +02:00
Ian Paschal
680e98fb28 Removed duplicate '.self' 2018-07-02 13:11:01 +02:00
Diego Prado Gesto
77e7a99d09 CURA-5528 Prevent crashes when there is a problem deleting some files in 
a package.
 2018-07-02 13:08:51 +02:00
Ian Paschal
b55abee783 Code style did not rename this variable 2018-07-02 13:05:22 +02:00
Ian Paschal
8f7370db6c Merge remote-tracking branch 'origin/master' into feature_send_material_profiles 2018-07-02 12:37:56 +02:00
Diego Prado Gesto
0692192d58 Merge branch '3.4' 2018-07-02 09:10:57 +02:00
Ian Paschal
b00502d10f
Merge pull request #4001 from Ultimaker/mypy_fixes 
Fix typing
 2018-06-29 15:58:28 +02:00
Diego Prado Gesto
ee2dfffb84
Merge pull request #3977 from fieldOfView/fix_preference_pages 
Fixes for preference pages
 2018-06-29 15:00:39 +02:00
Lipu Fei
dc8d9e0f96
Merge branch 'master' into mypy_fixes 2018-06-29 13:45:55 +02:00
Diego Prado Gesto
56c7c6f2b2 CURA-5518 Check whether the the findDefinitionContainers return any 
element or not.
 2018-06-29 10:41:54 +02:00
Jaime van Kessel
b4f59a7822 Removed unneeded application reference in construction of meshreaders 2018-06-29 09:25:38 +02:00
Ghostkeeper
2b83af2497
Move initialization into Uranium's run() function 
This makes it possible to start a Uranium-based application without needing to know the magic incantation of starting the application.
 2018-06-28 21:41:16 +02:00
Ghostkeeper
0cb6e506d2
Rewrite code style of _getScaleFromUnit 
It should be much more readable now.

Discovered while investigating #3847.
 2018-06-28 16:39:53 +02:00
Diego Prado Gesto
6737dfac47 Protect against crashes when the temporary file is still in use by 
another process.

Contributes to CURA-5516.
 2018-06-28 16:09:00 +02:00
Diego Prado Gesto
c25a733768 Fix weights of the UMO global quality profiles. 2018-06-28 14:45:33 +02:00
Diego Prado Gesto
eca855c8c2 Merge branch '3.4' 
Fix some conflicts. Change the weights of the global UMO profiles.
 2018-06-28 14:43:39 +02:00
Diego Prado Gesto
36c25a29a8 CURA-5508 Add protection before reading a file that may not exist. 2018-06-27 11:04:53 +02:00
Ghostkeeper
8e6b5a0d6a
Decimate UMS5 platform mesh 
This mesh has a lot of structure underneath the build plate which can't even be seen really. We can reduce the resolution of that so that it falls under the norm of 1MB per build plate mesh that we hold for all our printers.
 2018-06-26 15:56:13 +02:00
Mark
5fe812b4a4 Add downloadnumber to model and plugin view 2018-06-26 15:29:35 +02:00
fieldOfView
3546af86e8 Select the current profile when showing the profiles page 2018-06-26 12:02:41 +02:00
fieldOfView
05b3654346 Fix color of selected items in Profiles and Materials pages 2018-06-26 11:45:07 +02:00
Mark
8c3d4f1011 Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-26 11:29:46 +02:00
Mark
0f258bd680
Merge pull request #3958 from machinekoder/uni-print-3d-support 
adding the UNI-PRINT-3D config from TheCoolTool
 2018-06-26 09:29:18 +02:00
Mark
feeb00618d Merge branch 'uni-print-3d-support' of https://github.com/machinekoder/Cura 2018-06-26 09:28:05 +02:00
Alexander Rössler
88197c4978 definitions/UNI-PRINT-3D: add to Other category 2018-06-25 20:37:25 +02:00
Diego Prado Gesto
9689104a2d CURA-5496 Change the ultimaker original profiles by removing the 0.3 and 
adding the 0.6mm. layer heigh.
 2018-06-25 15:58:13 +02:00
Diego Prado Gesto
62ca661d0e CURA-5496 Remove wrong settings from the UM2 global profiles. 2018-06-25 15:27:53 +02:00
Lipu Fei
140e38ac1c Fix merge conflicts 
CURA-5496
 2018-06-25 14:26:13 +02:00
Lipu Fei
65f696a14f Simplify the case of UMO Dual 
CURA-5496
 2018-06-25 14:24:25 +02:00
Lipu Fei
8d0b364b44 UMO+ shares the same quality profiles as UMO 
CURA-5496
 2018-06-25 14:21:02 +02:00
Ghostkeeper
e8573dfe3b
Merge branch '3.4' 2018-06-25 13:44:21 +02:00
Ghostkeeper
cfa5d88faf
Merge branch '3.4' of https://github.com/Patola/Cura into Patola-3.4 2018-06-25 13:41:46 +02:00
Diego Prado Gesto
cb2097eafc CURA-5496 Use setting_version 5 in the UMO and UMODual global quality 
profiles.
 2018-06-25 11:52:48 +02:00
Diego Prado Gesto
2a75aebab9 Merge branch '3.4' 2018-06-25 11:51:48 +02:00
Diego Prado Gesto
9f1ad08bc2 CURA-5496 Add global profiles for the UMO, UMO+ and UMODual. 2018-06-25 11:35:17 +02:00
Cláudio 'Patola' Sampaio
a94256d0b1 Updated pt_BR translations for 3.4 2018-06-23 06:43:54 -03:00
Diego Prado Gesto
e087a05195 CURA-5496 Change the setting_version to the current version 5 of the global UM2+ 
profiles.
 2018-06-22 15:37:30 +02:00
Diego Prado Gesto
571e3cec7f Merge branch '3.4' 2018-06-22 15:33:04 +02:00
Diego Prado Gesto
86531a85b0 Add fixed Korean translations. 
Contributes to CURA-5484.
 2018-06-22 15:21:38 +02:00
Diego Prado Gesto
c76ffb8a72 Revert Korean translations. 
Contributes to CURA-5484.
 2018-06-22 14:38:57 +02:00
Diego Prado Gesto
1164779762 CURA-5496 Add global quality profiles to UM2+ that will act as a 
fallback instead of using the general global profiles.
 2018-06-22 14:07:46 +02:00
Diego Prado Gesto
ff06edf21d Fix and put capital letters in the axis for some languages. 
Contributes to CURA-5451.
 2018-06-21 17:20:00 +02:00
Diego Prado Gesto
2a3f18b3bb Fix X3D to X3G bad translations in some languages. 
Contributes to CURA-5451.
 2018-06-21 17:10:10 +02:00
Diego Prado Gesto
0f5707d3b3 Fix Korean translations. 
Contributes to CURA-5451.
 2018-06-21 17:02:01 +02:00
Diego Prado Gesto
2fc5c217ee Fix Turkish translations. 
Contributes to CURA-5451.
 2018-06-21 16:55:45 +02:00
Diego Prado Gesto
3830195dad Fix some issues with the character : in many languages. 
Contributes to CURA-5451.
 2018-06-21 16:42:41 +02:00
Mark
10dce33b83
Merge pull request #3934 from nean-and-i/master 
Create tevo_tornado.def.json
 2018-06-21 16:37:43 +02:00
Diego Prado Gesto
9da87206bf Fix Italian translations. 
Contributes to CURA-5451.
 2018-06-21 16:35:32 +02:00