GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 06:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,749 Commits 290 Branches 260 Tags
Commit Graph

10749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
90240af80f Correct stdout and stderr redirect location on Mac 2017-09-05 07:54:20 +02:00
Jaime van Kessel
bed74dab37 Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-04 17:37:06 +02:00
Jaime van Kessel
08766ee66f Fix wrong indentation for camera view 2017-09-04 17:36:44 +02:00
Lipu Fei
4249274af0 Move license window size to light theme 
CURA-4279

The light theme is now the default and it's a base theme, so the window
size needs to be there.
 2017-09-04 17:25:58 +02:00
Lipu Fei
f803e72c18 Use Screen.devicePixelRatio for plugin browser 
CURA-4279
 2017-09-04 17:25:30 +02:00
fieldOfView
308e1793bc Fix simple mode adhesion checkbox 2017-09-04 16:56:35 +02:00
Jaime van Kessel
7d12ebe860 Merge pull request #2368 from smartavionics/mb-fix-layer-start-min-values 
Now layer start X/Y can be < 0 when machine centre is zero.
 2017-09-04 16:52:49 +02:00
fieldOfView
46b333bfc9 Merge branch 'master' into fix_simple_mode_disabled_features 
# Conflicts:
#	resources/qml/SidebarSimple.qml
 2017-09-04 16:44:59 +02:00
fieldOfView
adc1630a20 Merge branch 'master' into fix_simple_mode_disabled_features 
# Conflicts:
#	resources/qml/SidebarSimple.qml
 2017-09-04 16:38:32 +02:00
Mark
e3f319a644 less margin when support extruder pops up 
CURA-4148
 2017-09-04 16:23:19 +02:00
Lipu Fei
51547bf37a Update setting_version to 3 for XMLMaterial 
CURA-4270

Technically, this is not right. This is just to postpone a time bomb...
The XML material profile needs a setting number instead of getting it
derived from the schema version.
 2017-09-04 15:51:31 +02:00
fieldOfView
7e60d459b4 Prevent a possible memory leak while showing a stuck camera stream 2017-09-04 15:47:44 +02:00
Lipu Fei
fdf5dc049e Update all containers to setting_version 3 
CURA-4270
 2017-09-04 15:47:04 +02:00
Lipu Fei
e9551d2173 Add upgrade script for 2.7 to 3.0 
CURA-4270

Changes for the Skin Pre-shrink settings requires upgrade.
 2017-09-04 15:39:10 +02:00
Jaime van Kessel
dd7ea80b68 Also added canPreheatBed option 2017-09-04 15:33:04 +02:00
Jaime van Kessel
182c2f9fb6 Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-04 15:17:27 +02:00
Jaime van Kessel
8683275d4f Added canAbort & canPause feature to PrinterOutputDevice 2017-09-04 15:16:55 +02:00
Lipu Fei
a67a0f161b Merge branch 'master' into skin_preshrink_to_close 2017-09-04 14:37:16 +02:00
Lipu Fei
b70a89d0e1 Fix stdout and stderr redirecting file location 2017-09-04 14:08:03 +02:00
Lipu Fei
1b66eaea22 Move extruder button sizes to cura-light theme 
CURA-4211
 2017-09-04 12:14:18 +02:00
Jaime van Kessel
88c74b30c2 Added missing QML properties 2017-09-04 11:48:54 +02:00
Jaime van Kessel
20ffb0cd6d Merge pull request #2369 from vivekanand1101/patch-1 
CuraApplication: Minor pep8 fix
 2017-09-04 09:53:16 +02:00
Lipu Fei
0358b1fcae Fix User-Agent header in PluginBrowser 2017-09-04 09:23:46 +02:00
Lipu Fei
8e774dede4 Change extruder combobox style for simple mode 
CURA-4211
 2017-09-04 08:42:55 +02:00
Lipu Fei
0025369762 Remove old extruder material icons 
CURA-4211
 2017-09-04 08:30:59 +02:00
Lipu Fei
d0740158b1 Merge branch 'master' into feature_extruder_buttons 
CURA-4211

Resolve merge conflicts.
 2017-09-04 08:29:26 +02:00
Ruben D
3af37d5dbc
Fix token replacement in extruder start and end g-codes 
Don't perform the replacement in the global stack for these settings, but in the extruder stacks.

Fixes #2331.
 2017-09-03 16:41:02 +02:00
Mark
d18d9223a5 refix the alignmet of the support and adhesion chackboxes 
CURA-4148
 2017-09-03 08:18:12 +02:00
Vivek Anand
ee1ba30d0e CuraApplication: Minor pep8 fix 2017-09-02 12:01:38 +00:00
Mark Burton
ab4da4ab36 Now layer start X/Y can be < 0 when machine centre is zero. 2017-09-02 08:40:01 +01:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons' 
CURA-4148
 2017-09-01 19:25:29 +02:00
alekseisasin
a288668bae Adjusted color for the extruder counter number in left toolbox and added 
extra margin-right in sidebar_category
CURA-4148
 2017-09-01 17:45:50 +02:00
Tim Kuipers
837a0b190b feat: split skin_expand_distance into children and collapse expand_skins checkboxes (CURA-4270) 2017-09-01 16:00:19 +02:00
Tim Kuipers
93c56a9d47 rewording of skin preshrink (CURA-4270) 
now it is worded as being the close operation which includes the skin expansion in the opposite direction
 2017-09-01 15:58:26 +02:00
Jaime van Kessel
a652ddbdd8 Reset lastResponseTime when trying to connect 
CURA-3869
 2017-09-01 14:54:57 +02:00
Jaime van Kessel
be1b5cd83a Cura no longer crashes when writing to full SD drive. 
It instead tells warns the user and logs the event. CURA-3909
 2017-09-01 14:43:12 +02:00
Jaime van Kessel
98795d8953 Added missing not supported profiles for PP 
CURA-3977
 2017-09-01 14:36:19 +02:00
Jaime van Kessel
2b54d75453 Merge branch 'mb-more-z-seam-options' of https://github.com/smartavionics/Cura 2017-09-01 13:22:13 +02:00
Jaime van Kessel
6b693c80b5 Merge pull request #2343 from Ultimaker/thopiekar-patch-1-1 
Install cura icon on Linux
 2017-09-01 13:17:12 +02:00
Jaime van Kessel
ce52ae81ef Merge pull request #2354 from fieldOfView/fix_machine_settings_headpolygon 
Fix setting machine head polygon in Machine Settings
 2017-09-01 13:14:54 +02:00
Jaime van Kessel
9ec7ef8dba Made print spec invisible when monitoring print 2017-09-01 13:07:00 +02:00
Jaime van Kessel
a6e90270cf Updated margins so low resolution screens can actually have some settings visible 2017-09-01 12:05:20 +02:00
Lipu Fei
ceccca8244 Reduce the width of the license window 
CURA-4222
 2017-09-01 10:18:27 +02:00
Mark Burton
125dc75a0f Now blurb for relative_extrusion says absolute extrusion mode will be set before any gcode script is output. 2017-09-01 07:54:56 +01:00
fieldOfView
3c64175948 Fix setting machine head polygon in Machine Settings 
This typo was spotted by @McAJBen. Fixes #2347
 2017-08-31 22:57:50 +02:00
Lipu Fei
aad628a46f Change to new design for extruder number settings 
CURA-4211
 2017-08-31 17:49:24 +02:00
Lipu Fei
c2645d0022 Change extruder tabs to buttons 
CURA-4211

Change extruder tabs to buttons according to the new design.
 2017-08-31 17:49:23 +02:00
Lipu Fei
b75140973e Change extruder tab to use new button style 
CURA-4211

- Use new button style ("Extruder" text with an extruder icon) for
  extruder tabs
- The "Extruder" text will disapear if the width is not enough
 2017-08-31 17:49:23 +02:00
Lipu Fei
7de9ccefaa Change extruder button on the toolbar side 
CURA-4211

Change the extruder button on the toolbar side according to the new
design.
 2017-08-31 17:49:23 +02:00
Lipu Fei
b174d04a9b Add SVG image for extruder button 
CURA-4211
 2017-08-31 17:49:22 +02:00