Diego Prado Gesto
729d37cabb
Merge branch 'master' into ui_rework_4_0
2018-11-27 11:12:48 +01:00
Lipu Fei
a99c1f4f73
Merge pull request #4885 from Ultimaker/CURA-5961-NaN_infill_before_adding_printer
...
Ensure that no weird data is set in the printSetupSelector on first start
2018-11-27 10:23:58 +01:00
Diego Prado Gesto
f91dbd356d
Merge branch 'master' of github.com:Ultimaker/Cura
2018-11-27 09:51:00 +01:00
Diego Prado Gesto
48853d0d06
Merge branch 'pinchies-add-a-u20'
2018-11-27 09:50:43 +01:00
Diego Prado Gesto
39e1cfd6bc
Fix indentation.
...
Contributes to CURA-5902.
2018-11-27 09:50:01 +01:00
Lipu Fei
bd42136712
Fix GcodeStartEndFormatter to use fallback values
...
CURA-5901
Use values from the global stack (if exist) as fallback values.
2018-11-27 09:49:38 +01:00
Diego Prado Gesto
493b37b0fe
Merge branch 'add-a-u20' of git://github.com/pinchies/Cura into pinchies-add-a-u20
2018-11-27 09:44:11 +01:00
Jaime van Kessel
8e7e8354e7
Set colors to the correct ones
2018-11-27 09:41:45 +01:00
Lipu Fei
2e81b97623
Use global_stack.extruders to find extruders
...
CURA-5978
2018-11-27 08:45:45 +01:00
pinchies
47ed9e3f5d
deleting the old wrong file....
2018-11-27 15:09:36 +11:00
pinchies
519e2a3399
uploaded wrong file... oops
2018-11-27 15:06:54 +11:00
Diego Prado Gesto
fcc6af68af
Don't show the current checked version of the firmware if the version number we gather is ZERO. That means that there was a problem getting the right value.
...
Contributes to CURA-5980.
2018-11-26 17:55:25 +01:00
Jaime van Kessel
5ddb3ff909
Factor out superfluous use of small_tool_button style
...
The style was overly complicated for what it should do
2018-11-26 17:40:34 +01:00
Jaime van Kessel
a3b45ff203
Simplify the viewOrientation controls
2018-11-26 17:35:23 +01:00
Jaime van Kessel
a825daea95
Cleanup the Theme.json
...
There were a lot of sizes that weren't used
2018-11-26 17:10:48 +01:00
Jaime van Kessel
d85aee1c53
Ensure that no weird data is set in the printSetupSelector on first start
...
CURA-5961
2018-11-26 16:40:29 +01:00
Mark
7019afe21f
Merge pull request #4717 from forkineye/fix-wanhao_profiles
...
Fix Wanhao profiles to use speed_travel macro
2018-11-26 16:03:25 +01:00
Mark
39f123f8e0
Merge pull request #4670 from pinchies/add-cc-mm-2
...
Add Cocoon Create ModelMaker
2018-11-26 15:49:21 +01:00
Mark
88cedd25cf
Merge pull request #4664 from pinchies/master
...
Add JGAurora Z-603S
2018-11-26 15:47:28 +01:00
Mark
037bf8863e
Merge pull request #4666 from pinchies/add-jg-a5
...
Add JGAurora A5
2018-11-26 15:43:41 +01:00
Mark
734a8882b1
Merge pull request #4667 from pinchies/add-jg-a1
...
Add JGAurora A1
2018-11-26 15:41:30 +01:00
Diego Prado Gesto
d1a5d548a9
Merge pull request #4884 from Ultimaker/add_border_to_rounded_rectangle
...
Add border to rounded rectangle.
2018-11-26 15:40:02 +01:00
Mark
30c585f298
Merge pull request #4834 from mcmidget/master
...
Add BIBO2 printer (dual and single extruder settings)
2018-11-26 15:39:39 +01:00
Diego Prado Gesto
9afc5748a8
Add copyright header.
2018-11-26 15:39:34 +01:00
Jaime van Kessel
9732099250
Add border to rounded rectangle.
...
It's designed so that it works in exactly the same way as rectangle.
2018-11-26 15:14:32 +01:00
Diego Prado Gesto
9c240bdfe3
Merge pull request #4882 from Ultimaker/CURA-5959-action-panel-ui-fixes
...
Cura-5959 action panel ui fixes
2018-11-26 14:31:01 +01:00
Diego Prado Gesto
12f78fa21a
Remove border of the popup selector for the output devices.
...
Contributes to CURA-5959.
2018-11-26 14:29:42 +01:00
Diego Prado Gesto
b63c4f7a74
Add header in new files. Remove unused imports.
...
Contributes to CURA-5959.
2018-11-26 14:06:34 +01:00
Jaime van Kessel
a654499752
Re-enable hover for marketplace button
...
CURA-5959
2018-11-26 13:47:22 +01:00
Mark
8bae9fa667
Merge branch 'master' into ui_rework_4_0
2018-11-26 13:41:25 +01:00
Jaime van Kessel
3c86c0ae6c
Fix spacing
...
CURA-5959
2018-11-26 13:36:45 +01:00
Jaime van Kessel
1fe6501358
Removed unused entries from theme
2018-11-26 13:35:41 +01:00
Jaime van Kessel
098714254d
Remove unused code
...
CURA-5959
2018-11-26 13:35:02 +01:00
Jaime van Kessel
eea6490e75
Hover of output device now spans the popup
...
CURA-5959
2018-11-26 13:27:26 +01:00
Diego Prado Gesto
5397cda2b4
Add a label to the action panel when auto slice is ON, indicating that the process runs automatically.
...
Contributes to CURA-5942.
2018-11-26 12:00:06 +01:00
Ghostkeeper
5469613c17
Don't fail the samefile check if second file didn't exist
...
If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.
2018-11-26 09:40:14 +01:00
Jaime van Kessel
09af7a9435
Slice button will now be disabled on error
...
CURA-5959
2018-11-26 09:34:27 +01:00
Ghostkeeper
c9eb57cead
Don't copy preference file to the same location
...
This crashes Cura on start-up for some people.
2018-11-26 09:32:59 +01:00
Ghostkeeper
8f9d6bee62
Document dependency on fdm_materials
...
Without it, Cura simply won't start if you had a printer loaded with material profiles.
Fixes #4460 .
2018-11-26 08:30:24 +01:00
Jaime van Kessel
b82ea58bc8
Changed all the action buttons to either use primary or secondary button
...
CURA-5959
2018-11-23 18:07:50 +01:00
Jaime van Kessel
af1ee53578
Fix the hover effect of action button
...
CURA-5959
2018-11-23 17:41:58 +01:00
Jaime van Kessel
e1f3e07f04
Changed Marketplace button to no longer use the action button
...
The actionButton is weirdly named and overly used. That being said, the marketplace button is unique, so
there is little sense in re-using it
2018-11-23 17:11:20 +01:00
Jaime van Kessel
1a8df9e10e
Removed blue border if slicing is not possible
...
CURA-5959
2018-11-23 11:46:38 +01:00
Jaime van Kessel
3ba4b9fd81
Add shadows to various used actionbuttons
...
CURA-5959
2018-11-23 11:20:53 +01:00
Jaime van Kessel
a71e75508c
Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5959-action-panel-ui-fixes
2018-11-23 11:00:11 +01:00
Ghostkeeper
48c24b1034
Remove log entry for bonjour services added
...
For most networks that would not be a problematic log entry. But for our own debugging on Ultimaker's network this is a very spammy log entry and doesn't add much value anyway.
2018-11-23 10:50:16 +01:00
alekseisasin
45076d9ca6
Merge pull request #4859 from Ultimaker/CURA-5878_gcode_file_association
...
CURA-5878 Update desktop and mimeinfo to add gcode mime type
2018-11-23 10:37:10 +01:00
Jaime van Kessel
7ecad41625
Merge pull request #4843 from Ultimaker/fix-oauth2-client
...
Switch Ultimaker Account OAuth2 client
2018-11-22 16:38:10 +01:00
Diego Prado Gesto
81c776213a
Merge branch 'master' into ui_rework_4_0
2018-11-22 16:11:06 +01:00
Lipu Fei
06cb628699
Update desktop and mimeinfo to add gcode mime type
...
CURA-5878
2018-11-22 15:47:12 +01:00
