GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,798 Commits 294 Branches 267 Tags
Commit Graph

2306 Commits

Author SHA1 Message Date
Lipu Fei
616615067c Fix quality name in selected profile box 
CURA-4796
 2018-01-15 15:17:15 +01:00
Ian Paschal
dac67ef2fc
Merge pull request #3134 from Ultimaker/3.2 
Fix for CURA-4789
 2018-01-15 14:41:23 +01:00
Lipu Fei
03bd4d8d22 Fix profile menu text for custom profiles based on not supported 
CURA-4796
 2018-01-15 14:29:52 +01:00
Lipu Fei
a3c2635648 Fix profile manager to support not supported custom profiles 
CURA-4796

Profile manager should be able to show custom profiles that are based on
the not supported profile correctly.
 2018-01-15 14:29:52 +01:00
Ghostkeeper
5d947b8981
Merge branch '3.2' 2018-01-15 13:58:40 +01:00
Lipu Fei
51316e1dc1 Fix Prepare/Cancel button visibility conditions for manual slicing 
CURA-4525
 2018-01-12 11:14:01 +01:00
Jaime van Kessel
67aa21ba6c Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-12 11:04:32 +01:00
Jaime van Kessel
c2935759e8 Fixed broken printjob state in machines page 
CL-541
 2018-01-12 11:04:10 +01:00
ChrisTerBeke
36da402488 Merge branch '3.2' 2018-01-12 11:03:09 +01:00
ChrisTerBeke
225a205d97 Fixes for material duplication and editing, small refactoring - CURA-4787 2018-01-12 09:19:03 +01:00
Diego Prado Gesto
de98a62dc8 CURA-4461 Read buildplate id from the printer and set the automatic 
option
 2018-01-11 13:03:35 +01:00
ChrisTerBeke
b2d3d15011 Fix conflicts 2018-01-11 09:06:59 +01:00
Diego Prado Gesto
10320b7f2e CURA-4461 Remove debug outputs 2018-01-10 17:05:22 +01:00
Diego Prado Gesto
cea9f359cd CURA-4461 Set active buildplate in the global container stack when is 
changed in the UI.

Add a new setting for distinguish between types of build plates.
 2018-01-10 14:05:38 +01:00
Diego Prado Gesto
fd46f6968b CURA-4461 Show nozzles and buildplates separately depending on the 
hardware_type metadata in variants
 2018-01-10 11:42:43 +01:00
Lipu Fei
bd869291e0
Merge pull request #2874 from tylergibson/malyan_m200 
Adding support for Malyan M200, Monoprice Select Mini V1 & V2
 2018-01-10 08:58:22 +01:00
Lipu Fei
93599de642 Update current index in material dialog 
CURA-4774

There is a delay so we update the current index when the model gets
changed.
 2018-01-09 17:03:38 +01:00
ChrisTerBeke
3de4940d69 Simplify creating, duplicating materials in preferences, extract logic to python, code-style fixes 2018-01-09 16:19:29 +01:00
Diego Prado Gesto
2613b4d1a3 CURA-4461 Add menu item for build plates 2018-01-09 16:08:30 +01:00
ChrisTerBeke
f9286d4bd5 Fix color swatch not being updated after color selection change - CURA-4774 2018-01-09 15:50:32 +01:00
Diego Prado Gesto
becb0cf7b9 CURA-4461 Add dropdown menu in the UI for selecting the buildplate if 
the printer has different buildplates.
 2018-01-09 15:42:10 +01:00
Jack Ha
d05f4a493b CURA-4525 fix qml undefined QString 2018-01-08 14:41:39 +01:00
Jack Ha
164e5fdc8e CURA-4525 change active build plate if that build plate does not exist anymore; disable context menu items for build plates when no selection 2018-01-08 13:55:42 +01:00
Jaime van Kessel
99de75a3fd Fixed connection label state 
CL-541
 2018-01-08 13:44:20 +01:00
Jaime van Kessel
df1bf419d9 Don't show "active print" header if no printer is connected 
CL-541
 2018-01-08 11:44:30 +01:00
Jack Ha
e638c21acb CURA-4525 fix selected object will select correct build plate (not only visualization) 2018-01-08 11:30:57 +01:00
Jack Ha
733d6234e6 CURA-4525 moved experimental preferences to bottom with its own label; all settings are by default off 2018-01-08 11:13:16 +01:00
Jaime van Kessel
ed9634ebe0 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2018-01-08 10:56:12 +01:00
Tyler Gibson
203fc37c7c Merge branch 'master' into malyan_m200 
# Conflicts:
#	resources/qml/SidebarSimple.qml

Resolving with updated 2 digit truncation
 2018-01-07 22:54:56 -08:00
ChrisTerBeke
39921795ce Properly align printer not connected label from top 2018-01-05 14:46:16 +01:00
Lipu Fei
8c98ab027a Fix code style 
CURA-4758
 2018-01-05 11:55:18 +01:00
Lipu Fei
223d9b6025 Update QtQuick import versions 
CURA-4758
 2018-01-05 11:55:18 +01:00
Lipu Fei
65e8762546 Fix layer height slider update issue 
CURA-4758
 2018-01-05 11:55:17 +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 Ha
4f224a4311 CURA-4525 do not show build plate view item when disabled 2018-01-04 16:12:39 +01:00
Lipu Fei
d20895a055 Fix code style 
CURA-4758
 2018-01-04 13:51:47 +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
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
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
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
faa4af634a Show pause text even if there is nothing to pause 
CL-541
 2018-01-04 09:58:15 +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
Aleksei S
49ae078396 Adjust 3d view and add Camera View to the menu bar 
CURA-4642
 2018-01-03 16:45:26 +01:00
ChrisTerBeke
5a9e3a8efd Fix front view button rotation, cleanup view buttons onClicked 2018-01-03 16:18:31 +01:00
Lipu Fei
392be23281 Fix SettingView stakc ID binding 
CURA-4708
 2018-01-03 15:58:30 +01:00
Jack Ha
62487e8ea2 CURA-4525 cleanups and change comment and added new-lines 2018-01-03 15:41:08 +01:00