3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
14766 commits 306 branches 272 tags 787 MiB
Commit graph

6388 commits

Author SHA1 Message Date
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
Brecht Nuyttens
746fd3ddcb Updated definition and added qualities 
Updated the definition and added qualities for the 4 filaments.
 2018-01-17 10:54:04 +01:00
Lipu Fei
4bc488ca79 Change wording to "Aluminium" 
CURA-4461
 2018-01-17 10:50:48 +01:00
Brecht Nuyttens
93741bffb5 Merge remote-tracking branch 'refs/remotes/Ultimaker/master' 2018-01-17 10:47:45 +01:00
Jack Ha
07f0906b1c Merge branch '3.2' 2018-01-16 16:05:38 +01:00
Jack Ha
cffeff0299 CURA-4805 remove modifiable settings when loading non sliceable file (gcode) 2018-01-16 15:58:14 +01:00
Lipu Fei
b0d2ef0f72 Correct default material diameter value for single-extrusion machines 
CURA-4812
 2018-01-16 15:04:21 +01:00
Diego Prado Gesto
da4c98b204 Merge branch 'master' into feature_multiple_BP 2018-01-16 09:59:21 +01:00
Diego Prado Gesto
cd4b162b86 CURA-4461 Change sizes and theme colors for the separator 2018-01-16 09:47:33 +01:00
Ghostkeeper
0007f3dafd
Merge branch '3.2' 2018-01-16 09:28:40 +01:00
Ghostkeeper
39aec54a56
Fix reference to Tevo Black Widow model 
Also fix some whitespace mistakes according to code style. Lots of tabs in there, whitespace at the end of a line, brackets on the same line, etc.
 2018-01-16 09:28:29 +01:00
Ghostkeeper
8aa51658e2
Decimate Tevo Black Widow model 
The original file size was too big. This is much better.
 2018-01-16 09:28:29 +01:00
Diego Prado Gesto
a7beb142ff CURA-4461 Add line separator when the build plate selector is visible 2018-01-16 09:23:39 +01:00
Diego Prado Gesto
0f497545bc CURA-4461 Create properties to know when a buildplate is compatible or usable. Show colors indicating the compatibility. Also minor fixes 2018-01-15 18:00:49 +01:00
Aleksei S
9a3c9921ca Fix: remove unnecesary cura slice request 
CURA-4785
 2018-01-15 17:21:43 +01:00
Ghostkeeper
e7c5120f9c
Merge branch '3.2' 2018-01-15 16:52:28 +01:00
Ghostkeeper
064a8e6f6c
Elide labels next to checkboxes 
To the available width, if there is a width.
This won't work for right-to-left languages though...

Contributes to issue CURA-4692.
 2018-01-15 16:41:33 +01:00
Brecht Nuyttens
33ba9a274d Merge remote-tracking branch 'refs/remotes/Ultimaker/master' 2018-01-15 16:29:21 +01:00
Aleksei S
38ae75637a Revert "Fix: Cura update setting after delay" 
This reverts commit f823a98708.
 2018-01-15 16:15:36 +01:00
Aleksei S
8498946de1 Merge branch 'master' of github.com:Ultimaker/cura 2018-01-15 15:40:10 +01:00
Aleksei S
f823a98708 Fix: Cura update setting after delay 
CURA-4785
 2018-01-15 15:39:25 +01:00
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
Ghostkeeper
e6cd6c2645
Replace travel_speed with speed_travel 
That travel_speed is a very old setting name. I'm guessing that people were copy-pasting that from older versions of Cura.
 2018-01-15 13:57:38 +01:00
Ghostkeeper
b4a06217df
Replace travel_speed with speed_travel 
That travel_speed is a very old setting name. I'm guessing that people were copy-pasting that from older versions of Cura.
 2018-01-15 13:55:35 +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
Ryan Rittenhouse
0c2b0b0aa2 Added SeeMeCNC printers w/ Reprap firmware 2018-01-11 15:18:54 -05:00
fieldOfView
76fd49b185 Merge branch 'network_rewrite' into feature_preheat_extruder 2018-01-11 15:28:28 +01:00
fieldOfView
bc5b5ac283 Implement preheating hotends for USB printing 2018-01-11 15:27:38 +01:00
fieldOfView
70cd6aad53 Remove commented-out code 2018-01-11 15:17:30 +01:00
Diego Prado Gesto
10c9ea68b4 CURA-4461 Change builplate type's label 2018-01-11 13:53:09 +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
fieldOfView
d3f94a1137 Get preheat temperatures from the proper stacks 2018-01-10 22:36:52 +01:00
fieldOfView
52412cb1cd Remove commented-out code 2018-01-10 21:59:17 +01:00
fieldOfView
fb9d841c90 Add per-extruder preheat controls 
These are lifted from the bed preheat controls and are not functional at the moment
 2018-01-10 21:41:59 +01:00
fieldOfView
c4aae784ee Improve tooltip text quality 2018-01-10 20:53:58 +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
jack
4751de00ae
Merge pull request #3089 from fieldOfView/feature_support_mesh_enhancements 
Support Mesh enhancements
 2018-01-10 11:58:22 +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
Jack Ha
72c24c2b5b Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-10 11:15:23 +01:00
Jack Ha
b295d915f8 Fix line support_infill_rate / support_line_distance for support meshes without generating any support. CURA-4777 2018-01-10 11:08:32 +01:00