GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 13:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,205 Commits 291 Branches 265 Tags
Commit Graph

12205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
47ba8b098c Apply to layers shadow shader the same changes than in the default layer 
shader, so that the shadow layers are correctly shown in simulation view
 2018-01-05 11:51:12 +01:00
Ghostkeeper
502332ee3e
Revert "Account for getConvexHullTransformedVertices returning None" 
This reverts commit 564a97d5a80545f5eebdc63de7c48a1a435ad2ea.
 2018-01-05 09:17:02 +01:00
Ghostkeeper
63f7902fca
Revert "Simplify code flow a bit" 
This reverts commit 2c45efb70de003b431707aadfc2a3cb37e4dc39c.
 2018-01-05 09:16:03 +01:00
Ghostkeeper
2c45efb70d
Simplify code flow a bit 
Use if branches for the unhappy flow, so that it's clear that this behaves as an early-out. This also prevents the need for declaring variables out of scope, which is not an issue with Python anyway.
 2018-01-04 17:23:43 +01:00
Ghostkeeper
564a97d5a8
Account for getConvexHullTransformedVertices returning None 
It returns None if there are no vertices.
 2018-01-04 17:20:57 +01:00
ChrisTerBeke
9784faf181
Merge pull request #3017 from fieldOfView/feature_textfield_select 
Select text when gaining focus
 2018-01-04 17:01:46 +01:00
jack
5273fcf238
Merge pull request #2790 from Ultimaker/feature_tree_support 
Tree support
 2018-01-04 16:57:52 +01:00
Jack Ha
2dad18a9ba CURA-4761 allow for space for scrollbar in per object settings 2018-01-04 16:26:39 +01:00
Jack Ha
5611a6b6eb Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-04 16:12:46 +01:00
Jack Ha
4f224a4311 CURA-4525 do not show build plate view item when disabled 2018-01-04 16:12:39 +01:00
Jaime van Kessel
d0ec7d10ce Printer discovery shows if a cluster is actually set up as a host 
CL-541
 2018-01-04 15:35:30 +01:00
Lipu Fei
d778856025
Merge pull request #3009 from smartavionics/mb-add-infill_enable_travel_optimization 
Added infill_enable_travel_optimization setting.
 2018-01-04 15:09:58 +01:00
Jack Ha
5e26ecb458 CURA-4672 now unbreak arrange for large objects as well :-) 2018-01-04 14:59:40 +01:00
Jaime van Kessel
f44c169b3e Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite 2018-01-04 14:57:11 +01:00
Jaime van Kessel
c9b8b0333c Sending prints to a specific printer in the cluster is now possible again 
CL-541
 2018-01-04 14:56:42 +01:00
Jack Ha
0d7f139cd5 Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-04 14:23:31 +01:00
Jack Ha
abdc33a0b9 CURA-4672 fix auto arrange for small models, they are now rounded up to 1 pixel rasterized 2018-01-04 14:23:22 +01:00
Lipu Fei
4b883f72d1
Merge pull request #3082 from Ultimaker/qtquick-controls-2.0 
QtQuick controls 2.0 for settings sidebar
 2018-01-04 14:07:31 +01:00
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
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
ChrisTerBeke
af9181287a Merge branch 'master' into qtquick-controls-2.0 2018-01-04 11:17:50 +01:00
ChrisTerBeke
4685230d8d Add missing super init call - CURA-4525 2018-01-04 10:59:44 +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