Commit graph

12694 commits

Author SHA1 Message Date
Ian Paschal
628314af9e Basic style ready for PR
- Temporarily removed remove/disable button as it's non-functional for now
2018-01-22 13:00:22 +01:00
Jack Ha
4c474c9619 Merge branch '3.2' 2018-01-22 12:58:16 +01:00
Jack Ha
1a8735ad33 Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-22 12:58:01 +01:00
Jack Ha
8d8fa0269a CURA-4821 loading gcode will now delete all existing models from all build plates and delete existing layer data to be processed 2018-01-22 12:57:50 +01:00
Ghostkeeper
23bfa798b1
Merge branch '3.2' 2018-01-22 12:51:39 +01:00
Ghostkeeper
3f81347ef8
Add warning that tree support increases slicing time
It's much slower than the normal support generation.
2018-01-22 12:51:26 +01:00
Ghostkeeper
ec0fca30a4
Merge branch '3.2' 2018-01-22 12:48:54 +01:00
Ghostkeeper
71cea55bda
Move untested settings to experimental category
These settings are just some of the settings that were not tested by our materials and processing team.
2018-01-22 12:48:29 +01:00
Lipu Fei
ed939d31fa Add hardware_type = nozzle for nozzle variants
CURA-4461
2018-01-22 12:20:10 +01:00
ChrisTerBeke
f589ce9570 Copy first extruder values when they are available when upgrading - CURA-4835 2018-01-22 11:25:23 +01:00
Jack Ha
93dbf93ee0 Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-22 11:07:50 +01:00
Jack Ha
ba29d64592 CURA-4821 Fix one at a time slicing for builtiplexer 2018-01-22 11:07:38 +01:00
Diego Prado Gesto
fe6019988c CURA-4839 Create variable before asignment 2018-01-22 10:53:52 +01:00
ChrisTerBeke
48c369f3e3
Merge pull request #3156 from gordo3di/gmax-configurations-cura-3.1
gMax 1.5+ Configurations
2018-01-22 09:05:16 +01:00
Diego Prado Gesto
a1aebf809f Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-21 17:16:40 +01:00
Diego Prado Gesto
0328050548 Change layer thickness colormap to parula-like (https://es.mathworks.com/help/matlab/ref/parula.html) 2018-01-21 17:16:18 +01:00
ChrisTerBeke
9397d9d4e0
Move translation guide to Wiki
More consistency with other detailed documentation, keep README file clean.
2018-01-21 16:04:52 +01:00
gordo3di
3f4e381620 Removed desktop.ini file
Removed desktop.ini file
2018-01-19 11:13:11 -05:00
gordo3di
d10ea0a564 Removed desktop.ini files
Removed desktop.ini files
2018-01-19 11:09:35 -05:00
gordo3di
b48edbab8e gMax 1.5+ Configurations
gMax 1.5+ Single and Dual extruder configurations
2018-01-19 10:52:52 -05:00
Lipu Fei
b92ebadfd0 Fix quality_changes for single-extrusion machines
CURA-4839

- Add newly created quality_changes container to ContainerRegistry
- If an extruder is created by CuraContainerRegistry, in project
  loading, do not try to override extruder's quality changes.
2018-01-19 15:05:05 +01:00
Lipu Fei
e7a19bcce5 Fix has_machine_quality value parsing
CURA-4837
2018-01-19 14:34:25 +01:00
Lipu Fei
79e79dd84c Only import profiles that match with the active machine
CURA-4837
2018-01-19 14:08:52 +01:00
Diego Prado Gesto
0fbcd2d2ec Merge branch '3.2' 2018-01-19 13:50:30 +01:00
ChrisTerBeke
d035ace40d Add method to set active extruder count to machine manager so other plugins can use it, add empty definitions container template 2018-01-19 13:32:25 +01:00
Lipu Fei
e0c69eb675 Pressing enter on project overview will load the project file
CURA-4735
2018-01-19 12:51:09 +01:00
ChrisTerBeke
98f738e3d9
Merge pull request #3149 from thetobby/master
Small tweaks on printer profile for two printers
2018-01-19 12:50:15 +01:00
Lipu Fei
7c85db4a18 Fix material_diameter copy over for Extruders
CURA-4835
2018-01-19 12:30:56 +01:00
ChrisTerBeke
c7071c18dd Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-19 11:33:01 +01:00
ChrisTerBeke
99c40d09e9 Hitting enter on project loading dialog now loads the project instead of just closing the dialog - CURA-4735 2018-01-19 11:32:55 +01:00
Diego Prado Gesto
f25aad8091 CURA-4821 Remove debug output 2018-01-19 11:18:46 +01:00
Diego Prado Gesto
1f4e7421c1 Revert "CURA-4821 Remove debug info"
This reverts commit d03ecf3cba.
2018-01-19 11:17:42 +01:00
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