3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 23:17:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
18800 commits 302 branches 270 tags 769 MiB
Commit graph

5880 commits

Author SHA1 Message Date
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
Lipu Fei
8e898148f6 Make checkboxes and texts more aligned 
CURA-6085
 2019-01-08 09:42:52 +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
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
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
Jaime van Kessel
551f075527 Removed unneeded destinction between get/put/delete URL 
They are all the same, so no real need to keep this seperate.

CURA-6005
 2019-01-04 10:27:41 +01:00
Jaime van Kessel
6492b51d7c Remove duplicated icons 
CURA-6005
 2019-01-04 10:25:22 +01:00
Jaime van Kessel
0edc3f2680 Make some minor improvements to the qml 
This implements some of the best practices that weren't used yet for the QML

CURA-6005
 2019-01-04 10:17:06 +01:00
Jaime van Kessel
49076a7103 Remove the unneeded BackupListModel 
CURA-6005
 2019-01-03 17:42:58 +01:00
Jaime van Kessel
1578aaa301 Minor code cleanup 
CURA-6005
 2019-01-03 17:17:40 +01:00
Jaime van Kessel
83fbb78c9e Backup uploading now shows a intermediate progress bar and hides when done 
CURA-6005
 2019-01-03 17:15:32 +01:00
Jaime van Kessel
e36b3e37d1 Remove indirection in the translation 
CURA-6005
 2019-01-03 17:13:47 +01:00
Jaime van Kessel
ed9a51791b Handle bunch of review comments 
CURA-6005
 2019-01-03 17:05:58 +01:00
Jaime van Kessel
4d1e9d24f9 Cleanup documentation 
Either fix the style to doxygen or remove it if it just repeated the functionnname.

CURA-6005
 2019-01-03 16:58:51 +01:00
Jaime van Kessel
785f2a8a8b Merge branch 'CURA-6005_cura_drive_plugin' of github.com:Ultimaker/Cura into CURA-6005_cura_drive_plugin 2019-01-03 16:52:02 +01:00
Jaime van Kessel
ea1712df0f Codestyle fixes & simplifications 
CURA-6005
 2019-01-03 16:51:28 +01:00
Jaime van Kessel
65183ade0a No longer chache singleton objects 
CURA-6005
 2019-01-03 16:44:08 +01:00
Ghostkeeper
e15e06f29f
Make Z relative 
This way if we ever want to change the parent's Z for some other ordering requirements, the children will stay in order.
 2019-01-03 16:04:28 +01:00
Ghostkeeper
798c1f198c
Hide action panel when displaying a stage with a background 
This is not the worst hack ever, but it's quite a hack.

Contributes to issue CURA-6054.
 2019-01-03 16:04:27 +01:00
Jaime van Kessel
1973397b92 Remove confusing printer preference text 
CURA-6003
 2019-01-03 15:34:41 +01:00
Lipu Fei
f7fb04d4ae Fix merge conflicts with 4.0 2019-01-03 15:25:40 +01:00
Lipu Fei
a14c846e29 Rename CheckBox.qml to CheckBoxWithTooltip.qml 
CURA-6005
 2019-01-03 11:53:19 +01:00
Jaime van Kessel
e769b324e1 Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0 2019-01-03 11:41:05 +01:00
Ghostkeeper
78ee666919
Merge branch '4.0' 2019-01-03 11:09:28 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00