3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 05:07:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17030 commits 306 branches 270 tags 779 MiB
Commit graph

17030 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lipu Fei
d20895a055 Fix code style 
CURA-4758
 2018-01-04 13:51:47 +01:00
Simon Edwards
b20e35714f Factor out the code for adding a function for run after a HTTP request 
CL-541
 2018-01-04 13:36:29 +01:00
Jaime van Kessel
8a7105dd9c Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite 2018-01-04 13:32:12 +01:00
Jaime van Kessel
acde48108d Removed control item 
CL-541
 2018-01-04 13:31:54 +01:00
Simon Edwards
695c7d8267 Rename the _live_multiparts to the even better _kept_alive_multiparts name 
CL-541
 2018-01-04 13:27:24 +01:00
Lipu Fei
84adbc5f41 Use the 5.8 versions of QtQuick modules in QMLs 
CURA-4758
 2018-01-04 13:26:14 +01:00
ChrisTerBeke
c47a0a17a5 Merge branch 'master' into feature_headless_docker 2018-01-04 13:23:50 +01:00
Lipu Fei
7b8f951682 Simplify temp_scale_factor assignment 
CURA-4672
 2018-01-04 13:02:10 +01:00
Lipu Fei
3a4445b656 Fix code style 
CURA-4672
 2018-01-04 12:56:24 +01:00
Lipu Fei
9cb7050681 Remove unused code 
CURA-4672
 2018-01-04 12:56:23 +01:00
Jaime van Kessel
fc3a47cb7b Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite 2018-01-04 12:55:08 +01:00
Jaime van Kessel
2e8ae5c590 Unsasigned jobs are now also removed from list 
CL-541
 2018-01-04 12:54:47 +01:00
ChrisTerBeke
4cec27b181 Fix QML warnings for combo boxes - CURA-4758 2018-01-04 11:53:34 +01:00
ChrisTerBeke
3f7d8997a1 Fix icon positions - CURA-4758 2018-01-04 11:33:12 +01:00
fieldOfView
503c612509 Add (non-functional) items for changed settings (user-changes) and current profile settings 2018-01-04 11:21:44 +01:00
ChrisTerBeke
af9181287a Merge branch 'master' into qtquick-controls-2.0 2018-01-04 11:17:50 +01:00
fieldOfView
3f11b8a756 Merge branch 'master' into feature_setting_visibility_profiles 2018-01-04 11:06:51 +01:00
ChrisTerBeke
4685230d8d Add missing super init call - CURA-4525 2018-01-04 10:59:44 +01:00
ChrisTerBeke
c7c989f2a0 Fix merge conflicts after multi-buildplate refactor 2018-01-04 10:52:01 +01:00
Jack Ha
d19015e85f CURA-4523 solved merge conflict 2018-01-04 10:47:24 +01:00
Simon Edwards
2588e11364 Improve and simplify how we hold on to form part objects 
CL-541
 2018-01-04 10:43:50 +01:00
ChrisTerBeke
11a4845931 Move CuraSceneController together with rest of scene related code 2018-01-04 10:41:25 +01:00
jack
915f7273d5
Merge pull request #3029 from Ultimaker/CURA-4525-multi-build-plate-merge 
CURA-4525 multi build plate (master merged 2018-1-3)
 2018-01-04 10:33:40 +01:00
Jack Ha
a5d9aac91b CURA-4525 placed view menu items in Build Plate submenu 2018-01-04 10:32:54 +01:00
Jaime van Kessel
4cb7bc03ad Sidebar tooltips are now visible again 
CL-541
 2018-01-04 10:30:03 +01:00
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
ChrisTerBeke
46827b9295 Fix tevo blackwidow json file 2018-01-04 10:14:55 +01:00
Jaime van Kessel
b6ebb804ba OutputDevice header now shows name of active printer 
CL-541
 2018-01-04 10:13:55 +01:00
Jaime van Kessel
6cf6d51fea Queued and printing amount now gets updated on state change 
CL-541
 2018-01-04 10:06:09 +01:00
Jaime van Kessel
9e055f0340 Added missing parameter 
CL-541
 2018-01-04 10:04:00 +01:00
Jaime van Kessel
faa4af634a Show pause text even if there is nothing to pause 
CL-541
 2018-01-04 09:58:15 +01:00
ChrisTerBeke
0c504560fa
Merge pull request #3057 from thetobby/master 
Adding printer definition for Anycubic i3 Mega & Tevo Black Widow
 2018-01-04 09:57:31 +01:00
Jack Ha
840eedbb3d CURA-4525 switch back to build plate 0 when deleting all objects 2018-01-04 09:35:23 +01:00
Jack Ha
8c7a0d4a8e CURA-4525 created CuraSceneController and took out logic from ObjectsModel and BuildPlateModel 2018-01-04 09:26:15 +01:00
ChrisTerBeke
4e10d6ee87
Merge pull request #3030 from TheAssassin/patch-1 
Reduce amount of movements after print for Tevo Tarantula
 2018-01-03 17:49:50 +01:00
Ghostkeeper
e18b3b3669
Remove duplicate setting 
Some merge conflict, I think.

Contributes to issue CURA-4523.
 2018-01-03 17:29:49 +01:00
Jaime van Kessel
42b50bf749 Fixed typo in function 
CL-541
 2018-01-03 17:14:52 +01:00
Lipu Fei
7c4a122767 Fix container_index for MachineSettingsAction 
CURA-4708
 2018-01-03 17:04:40 +01:00
Jaime van Kessel
801875fb30 Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite 2018-01-03 17:00:49 +01:00
Jaime van Kessel
487fca31dd Chopped up bunch of functions. 
As per review request. CL-541
 2018-01-03 16:59:05 +01:00
Aleksei S
8aa0cc981b Merge branch 'master' of github.com:Ultimaker/cura 2018-01-03 16:46:10 +01:00
Aleksei S
49ae078396 Adjust 3d view and add Camera View to the menu bar 
CURA-4642
 2018-01-03 16:45:26 +01:00
Lipu Fei
cbf6f55fd8 Fix perfered material search in auto-update 
CURA-4708
 2018-01-03 16:42:57 +01:00
ChrisTerBeke
80324900b0
Merge pull request #3068 from fieldOfView/feature_multiextruder_replacement_patterns 
Multiextruder gcode snippet replacement patterns
 2018-01-03 16:31:25 +01:00
Lipu Fei
47a12b4128 Prefer materials from the same brand in auto-update 
CURA-4708
 2018-01-03 16:29:19 +01:00
Lipu Fei
b181860f1c Fix afterOnEditingFinished() 
CURA-4708
 2018-01-03 16:29:18 +01:00
ChrisTerBeke
5a9e3a8efd Fix front view button rotation, cleanup view buttons onClicked 2018-01-03 16:18:31 +01:00
Simon Edwards
3173eb6740 Avoid mega-tons of object copying when building compressed gcode 
CL-541
 2018-01-03 16:15:12 +01:00
Lipu Fei
392be23281 Fix SettingView stakc ID binding 
CURA-4708
 2018-01-03 15:58:30 +01:00
Jack Ha
9e5f0e10b9 CURA-4525 add comment and type hint 2018-01-03 15:49:31 +01:00