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

18800 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ian Paschal
e7b60a5290 Create GenericPopUp.qml 
Contributes to CL-1165
 2019-01-09 16:29:57 +01:00
ChrisTerBeke
8813f10331 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-09 13:34:11 +01:00
Jaime van Kessel
366d2c8114 Prevent crash for firmware updater if the activePrinter is not set 2019-01-09 12:56:49 +01:00
Jaime van Kessel
d928e0979d Handle attempting to remove a favorite material that was already removed 2019-01-09 12:54:33 +01:00
Jaime van Kessel
e718bed151 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-09 12:51:53 +01:00
Jaime van Kessel
862c76a2ea Check if the optimised layer data is stored before attempting to delete it 2019-01-09 12:51:20 +01:00
ChrisTerBeke
edf64bef85 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-09 10:45:49 +01:00
Lipu Fei
580a69f11e Add CuraCloudAccountAPIRoot to CuraVersion.py.in 
CURA-6005
 2019-01-09 09:27:34 +01:00
Lipu Fei
520b34ab89 Use getPluginPath() 
CURA-6005
 2019-01-09 08:41:15 +01:00
Simon Edwards
0de84dad13
Merge pull request #5138 from Ultimaker/CL-1157_skeleton_loading_monitor_tab 
CL-1157 Add skeleton loading to the monitor tab
 2019-01-08 16:23:16 +01:00
Lipu Fei
aee4034e3e No caching preferences 
CURA-6005
 2019-01-08 15:49:36 +01:00
Ian Paschal
97e17d9fb8 Remove debug behavior 
Contributes to CL-1157
 2019-01-08 15:17:42 +01:00
Ian Paschal
8f37b65ffe Add skeleton loading to print job queue 
Contributes to CL-1157
 2019-01-08 15:15:21 +01:00
Ian Paschal
e81742d296 Add skeleton loading to printer cards 
Contributes to CL-1157
 2019-01-08 14:27:54 +01:00
Lipu Fei
a8fe5ced89 Remove unused import 
CURA-6005
 2019-01-08 13:33:49 +01:00
Lipu Fei
53cb2ce189 Add comments for http status >=300 check 
CURA-6005
 2019-01-08 13:29:48 +01:00
ChrisTerBeke
32415f4d8e Merge branch '4.0' into STAR-322_cloud-connection 2019-01-08 13:19:36 +01:00
ChrisTerBeke
b8da720c1d Move translations in-line 2019-01-08 13:10:42 +01:00
ChrisTerBeke
485b471522 Fix some review comments 2019-01-08 12:19:00 +01:00
ChrisTerBeke
7c7bca31c7 Fix renamed property connectionType 2019-01-08 11:52:27 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Jaime van Kessel
a25ae4ee07 Merge branch 'CURA-6085_fix_font_sizes' of github.com:Ultimaker/Cura into 4.0 2019-01-08 11:44:49 +01:00
Lipu Fei
4cb853cdb0 Fix (bigger) fonts for Chinese and Japanese 
CURA-6085
 2019-01-08 10:51:30 +01:00
Jaime van Kessel
578027182e Prevent setting items from overlapping with column headers 2019-01-08 10:49:55 +01:00
Lipu Fei
2124de3d4d Revert "Chnage default font sizes and unify font weights" 
This reverts commit af634b82b2.

CURA-6085
 2019-01-08 10:45:52 +01:00
Lipu Fei
8e898148f6 Make checkboxes and texts more aligned 
CURA-6085
 2019-01-08 09:42:52 +01:00
Lipu Fei
af634b82b2 Chnage default font sizes and unify font weights 
CURA-6085
 2019-01-08 09:39:50 +01:00
Ian Paschal
4dbab88792 Add dummy printer for loading 2019-01-07 13:56:04 +01:00
Ian Paschal
18545e18ce Merge remote-tracking branch 'origin/4.0' into CL-1157_skeleton_loading_monitor_tab 2019-01-07 13:38:23 +01:00
Lipu Fei
ee34cd522d
Merge pull request #5017 from Ultimaker/add_comment_prime_tower 
Add time prime tower into Cura.proto
 2019-01-07 13:30:32 +01:00
Lipu Fei
d4b0c157aa Fix layers.shader to check feature prime_tower 
CURA-5932
 2019-01-07 13:20:46 +01:00
Lipu Fei
a43900b0ad Fix version upgrade for XMLMaterialProfile 
CURA-5995
 2019-01-07 11:17:12 +01:00
Lipu Fei
059fede06e Mkae default custom settings panel height smaller 
CURA-6054
 2019-01-07 10:53:21 +01:00
Jaime van Kessel
2dbdf27c78
Merge pull request #5119 from salvadornico/master 
Fixed typo in ChangeAtZ.py
 2019-01-07 10:43:30 +01:00
Lipu Fei
a8128919af Make resize bar slim 
CURA-6054
 2019-01-07 10:41:07 +01:00
Jaime van Kessel
d21bf53230 Add version upgrade for 4.0 
Contributes to CURA-6011 and CURA-5995
 2019-01-07 10:34:22 +01:00
BluefireXD
1d2e34ca35
Added Anycubic Chiron normal quality cfg 2019-01-07 02:55:42 +01:00
BluefireXD
6895a7c0f5
Wrong place 2019-01-07 02:55:13 +01:00
BluefireXD
efc3e7e8a1
Added Anycubic Chiron normal quality cfg 2019-01-07 02:53:58 +01:00
BluefireXD
98e1f66a1e
Added Anycubic Chiron high quality cfg 2019-01-07 02:53:41 +01:00
BluefireXD
2fd2e01d82
Added Anycubic Chiron draft quality cfg 2019-01-07 02:53:15 +01:00
BluefireXD
2687836beb
Added Anycubic Chiron platform obj file 2019-01-07 02:51:06 +01:00
BluefireXD
b6b6382199
Added Anycubic Chiron platform picture 2019-01-07 02:50:16 +01:00
BluefireXD
75460728e2
Added Anycubic Chiron extruder definition file 2019-01-07 02:48:22 +01:00
BluefireXD
1b7e55ddcb
Added Anycubic Chiron definition file 2019-01-07 02:47:39 +01:00
Nico Salvador
39cdb3ed0a
Fixed typo in ChangeAtZ.py 2019-01-06 10:19:21 +08:00
fieldOfView
f631332dc2 Fix z-fighting on bottom layer of x-ray view 2019-01-05 00:03:48 +01:00
griehsler
9bc63fb1f9 Merge remote-tracking branch 'upstream/master' 2019-01-04 23:57:58 +01:00
Jaime van Kessel
4c1f68a447 Ensure that the connectiontype of a connected printer is set correctly 
CURA-6011
 2019-01-04 15:24:01 +01:00
Jaime van Kessel
ffce9bd172 Ensure that the primetower gets drawn in the right color again 
CURA-5932
 2019-01-04 14:59:26 +01:00