GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-20 01:59:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,690 Commits 295 Branches 268 Tags
Commit Graph

13690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
02291bb6a3 better name: "Compatible material diameter" in Machine Settings 
CURA-4832
 2018-01-19 11:15:55 +01:00
ChrisTerBeke
ce709bf24a Remove debug print - CURA-4829 2018-01-19 10:48:45 +01:00
ChrisTerBeke
a76c84ca30 Finally remove annoying firmware check log line for non-UM3 printers 2018-01-19 10:42:04 +01:00
ChrisTerBeke
8412e8535a Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-19 10:37:00 +01:00
ChrisTerBeke
e4a111dd2e Delay adding global stack when creating new machine until after extruder stacks are created - CURA-4828 2018-01-19 10:36:25 +01:00
Diego Prado Gesto
a6acf4a4af CURA-4829 Do not save the quality changes profile in the GCode if the 
containers are empty.
Change the message when trying to import a GCode as a profile, but not profile was stored.
 2018-01-19 10:34:04 +01:00
ChrisTerBeke
fb8aa08c6a
Merge pull request #3031 from Ultimaker/feature_headless_docker 
Feature headless
 2018-01-19 10:31:20 +01:00
Ian Paschal
81b2f0f7cd Added drop-down buttons 2018-01-19 09:56:19 +01:00
Diego Prado Gesto
d03ecf3cba CURA-4821 Remove debug info 2018-01-19 09:16:22 +01:00
Torbjørn
8b00bafb8b . 2018-01-19 06:57:39 +01:00
Mark
00cf47a941 Merge branch '3.2' 2018-01-18 16:29:44 +01:00
Mark
74e9bf051c Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-18 16:28:51 +01:00
Mark
a774012bd2 Default objectlist to collapsed CURA-4525 2018-01-18 16:28:46 +01:00
Diego Prado Gesto
2e4b4036e7 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-18 15:50:06 +01:00
Diego Prado Gesto
ece63bfea8 CURA-4821 The previous cached layer data is removed when a GCode is loaded. Temporary solution for one buildplate. 2018-01-18 15:47:01 +01:00
Jack Ha
68347afc48 CURA-4033 fix init order of print information 2018-01-18 14:40:15 +01:00
Lipu Fei
322420092d Fix extruder handling in project loading 
CURA-4824

When a machine is getting overriden, it should not try to create the
ExtruderStack for the single-extrusion machine loaded from the project
file, otherwise that ExtruderStack will become an extra one.
 2018-01-18 13:49:41 +01:00
Ghostkeeper
d1d566bfc0
Merge branch '3.2' 2018-01-18 13:29:36 +01:00
Ghostkeeper
afcf35cb0e
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-18 13:25:16 +01:00
Ghostkeeper
dc08e7f043
Merge branch 'mb-move-wall-order-opt-setting' of https://github.com/smartavionics/Cura into smartavionics-mb-move-wall-order-opt-setting 2018-01-18 13:23:16 +01:00
fieldOfView
fb2a5ea28a Refactor USBPrinterOutputController to reusable cura.PrinterOutput.GenericOutputController 2018-01-18 11:55:30 +01:00
Jack Ha
1796a182fa CURA-4525 fix crashing cura due to empty build plate 2018-01-18 11:54:30 +01:00
fieldOfView
fccdf16e72 Merge branch 'master' into feature_preheat_extruder 2018-01-18 10:21:32 +01:00
fieldOfView
f135b1675c Fix disabling preheat button when printer is not idle 2018-01-18 10:20:37 +01:00
fieldOfView
13206e1fdc Stop preheating when a print is started or the temperature is set to 0 on the printer 2018-01-18 10:16:25 +01:00
Torbjørn
53cc4efb23 last minute tweaks 
Decreased jerk and acceleration
 2018-01-18 09:42:36 +01:00
ChrisTerBeke
5e99fd6c1e Fixes for print information when running in headless mode 2018-01-18 09:05:40 +01:00
Torbjørn
66805f83fd Small tweaks for default quality 
To better match printers after some testing
 2018-01-18 08:46:27 +01:00
Lipu Fei
dd8d21fd34
Merge pull request #3147 from fieldOfView/fix_menu_errors 
Fix QML errors building the material and nozzle menus
 2018-01-18 08:41:42 +01:00
Torbjørn
9530d5a3d3 Merge branch 'master' of https://github.com/thetobby/Cura 2018-01-18 08:41:34 +01:00
Brecht Nuyttens
64a7d1bbda Removed ID + minor change 2018-01-18 08:34:10 +01:00
fieldOfView
3fed44bb5e Fix typo in class name 2018-01-18 00:42:41 +01:00
fieldOfView
0f0b1c6795 Fix getting ability to preheat from extruder 2018-01-18 00:05:16 +01:00
fieldOfView
b68a30662a Add stubs to PrinterOutputController 2018-01-17 21:21:13 +01:00
fieldOfView
259b1091f6 Fix QML errors building the material and nozzle menus 
Since the network rewrite, outputdevices no longer have hotends and materials. This functionality may return, but until that time this does a better job at checking if the properties exist, preventing QML errors.
 2018-01-17 19:36:20 +01:00
fieldOfView
7994c95bbe Add unit to preheat temperature boxes 2018-01-17 18:03:01 +01:00
fieldOfView
6e0717a967 Merge branch 'master' into feature_preheat_extruder 2018-01-17 17:36:40 +01:00
ChrisTerBeke
422d047317 Merge branch 'master' into feature_headless_docker 2018-01-17 17:02:04 +01:00
Ian Paschal
013f020a4a Initial styling changes 
- Dual-button layout
- Blue buttons in line with Cura styles
- Contact info
 2018-01-17 17:02:02 +01:00
ChrisTerBeke
4d0eaf6093 Merge branch 'feature_headless_docker' of https://github.com/Ultimaker/Cura into feature_headless_docker 2018-01-17 17:01:58 +01:00
Jack Ha
8a53549bce CURA-4033 split update bounds for a single node in buildvolume and also call it from readMeshFinished 2018-01-17 17:01:03 +01:00
Diego Prado Gesto
4ee36404cc Merge branch '3.2' 2018-01-17 14:35:07 +01:00
Diego Prado Gesto
5c0e2d39a3 Avoid zero thickness to be shown in layer view. 2018-01-17 11:54:22 +01:00
Diego Prado Gesto
e6169a7c61 Fix some typos 2018-01-17 11:53:31 +01:00
ChrisTerBeke
c1308de753 Merge branch '3.2' 2018-01-17 11:40:06 +01:00
Diego Prado Gesto
cc89ddf5f7 Revert "Avoid zero thickness to be shown in layer view." 
I saw that with these changes, Cura crashes when loading a GCode.
This reverts commit 8dd21892d33277bec88895393f992b612b7af526.
 2018-01-17 11:39:38 +01:00
Diego Prado Gesto
8dd21892d3 Avoid zero thickness to be shown in layer view. 
Also fix some typos.
 2018-01-17 11:34:25 +01:00
Jaime van Kessel
4680996a49 Print window no longer gets an ever increasing list of print targets 
CL-720
 2018-01-17 11:32:43 +01:00
Diego Prado Gesto
26371c9c3a CURA-4815 When creating the unique name for a machine, don't look at the 
definition instance container for the id, just look at the container
stack ids.
 2018-01-17 10:57:11 +01:00
Lipu Fei
cb0ac9b0c8
Merge pull request #3137 from Ultimaker/feature_multiple_BP 
Feature: Printers with different build plates
 2018-01-17 10:55:46 +01:00