3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 13:47:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 18
18723 commits 306 branches 270 tags 779 MiB
Commit graph

18723 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Jaime van Kessel
b4b7e1fc21 Codestyle & typing 2019-01-04 11:50:02 +01:00
Jaime van Kessel
b363be4afb Fix typing 2019-01-04 11:48:06 +01:00
Jaime van Kessel
bca070d567 Fixed typing 
CURA-6005
 2019-01-04 11:41:21 +01:00
Jaime van Kessel
3df9b369f7 Removed the divider as a seperate component 
Since it's only used in one place, there is no real point in making it a seperate file

CURA-6005
 2019-01-04 11:40:09 +01:00
Jaime van Kessel
c10b8b5c3f Fix crash when attempting to restore backup 
CURA-6005
 2019-01-04 11:37:52 +01:00
Jaime van Kessel
b4911478e3 Made the plugin depend more on the theme 
CURA-6005
 2019-01-04 11:35:34 +01:00
Jaime van Kessel
98153769ff Use wide_margin instead of multiplying default margin 
CURA-6005
 2019-01-04 11:23:34 +01:00
Jaime van Kessel
add5f17ae7 And removed even more unneeded / duplicate / orphaned images 
CURA-6005
 2019-01-04 11:06:43 +01:00
Jaime van Kessel
74087ade05 Remove a number of orphaned files 
CURA-6005
 2019-01-04 10:58:51 +01:00
Jaime van Kessel
0ec0b68360 Remove unneeded component 
CURA-6005
 2019-01-04 10:54:23 +01:00
Jaime van Kessel
3b498d3a34 Change name of the signals so they are consistent with rest of the code 
CURA-6005
 2019-01-04 10:51:07 +01:00
Jaime van Kessel
23315260ae Fix some of the documentation 
CURA-6005
 2019-01-04 10:49:41 +01:00
Jaime van Kessel
63c2a901bb Prevent double emits / recalculations when not needed 
CURA-6005
 2019-01-04 10:45:24 +01:00
Jaime van Kessel
87eb863451 Remove the final traces of the translation indirection 
CURA-6005
 2019-01-04 10:43:40 +01:00
Jaime van Kessel
8ebd4282fd Make the backupList use a scrollview instead of manually re-doing it 
CURA-6005
 2019-01-04 10:39:39 +01:00
Jaime van Kessel
31156d6230 Add missing signalemitter decorater 
CURA-6005
 2019-01-04 10:28:54 +01:00