GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 08:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,017 Commits 291 Branches 260 Tags
Commit Graph

177 Commits

Author SHA1 Message Date
Lipu Fei
02472f6ad2 WIP: Fix material name update upon machine switching 2018-02-21 12:39:04 +01:00
Lipu Fei
c65192000e WIP: Fix material name fetching in QML 2018-02-21 11:19:18 +01:00
Jack Ha
ad6548a5dc CURA-4606 factored activeMaterialName out 2018-02-21 10:35:17 +01:00
Jaime van Kessel
4a0a9f521c Bumped the required version numbers down again, as they should specifcy a min version number. 
As the summary describes; We should use *min* version numbers. If we have a higher version installed as defined, it will have the bugfixes and not the features. Increasing version nr should therefore only be done if we want new features.
 2018-02-16 11:13:40 +01:00
Mark
64ea2399a1 Add tags to urls 2018-02-14 15:15:02 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2' 
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
 2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts 
CURA-4941
 2018-02-14 09:28:47 +01:00
Mark
466926fecd Increased the version of QtQuick 2018-02-13 11:07:14 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2' 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
 2018-02-12 13:10:24 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors 
CURA-4941
 2018-02-10 12:45:36 +01:00
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Mark
8fca183a5e Fix rounding errors for garbled text 
CURA-4941
 2018-02-09 11:30:56 +01:00
Ghostkeeper
ae40071ffd
Merge branch '3.2' 2018-01-24 16:17:49 +01:00
Ghostkeeper
3f7eaaae94
Move HTML tags out of translated text 
We always want the same HTML tag around it. There's no need to allow the translator to change that.

Discovered during issue CURA-4692.
 2018-01-24 13:52:31 +01:00
Diego Prado Gesto
cd4b162b86 CURA-4461 Change sizes and theme colors for the separator 2018-01-16 09:47:33 +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
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
Diego Prado Gesto
becb0cf7b9 CURA-4461 Add dropdown menu in the UI for selecting the buildplate if 
the printer has different buildplates.
 2018-01-09 15:42:10 +01:00
Thomas Karl Pietrowski
6f8ed09d3d
SidebarHeader: Adding missing comment about "extruder row" 
Just read the code and noticed that.
 2017-12-05 00:14:19 +01:00
ChrisTerBeke
16e07fc461 Update color indicators for extruders when changing material color - CURA-4641 2017-11-29 10:47:39 +01:00
Jack Ha
602e8c0e66 Changed 'Check material compatibility' to 'Check compatibility' because it's not only materials possibly being incompatible 2017-11-21 15:12:17 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements 
Container stack improvements
 2017-11-20 17:42:26 +01:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451 
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
 2017-10-26 09:23:27 +02:00
Ghostkeeper
5a125aa514
Rename printCoreRow to variantRow 
Because on only one of our printers it's actually a print core. Internally we've always called it the variant.
 2017-10-19 13:38:08 +02:00
ChrisTerBeke
3ddb277477 Remove double sidebar header item, fixes #2605 2017-10-18 16:01:14 +02:00
Mark
eaa7b75f0e Changed parseInt to Math.floor 2017-10-11 16:47:40 +02:00
Mark
d4a8dbdee7 Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 12:48:42 +02:00
Mark
dcb630a24e Move text back to label and remove unused font 2017-10-03 14:02:07 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
Diego Prado Gesto
61e65d5cb0 Fixing code style - 
CURA-4386 CURA-4379
 2017-09-28 16:14:58 +02:00
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
Diego Prado Gesto
e3edc79a3e modified some code to fix the multiple extrusion issues - CURA-4379 2017-09-28 13:21:03 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Mark
766bc9ae97 Changed bold fonts to normal 
CURA-4148
 2017-09-12 14:37:29 +02:00
ChrisTerBeke
3a098f4b4c CURA-4319 material compatibility link style 2017-09-12 13:24:33 +02:00
Mark
3b12e39ba8 Selected state font is not bold anymore for custom and recommended 
CURA-4148
 2017-09-08 16:35:08 +02:00
Mark
db77a4690c Made the selected borders a little thicker 
CURA-4148
 2017-09-08 15:18:40 +02:00
Mark
748c72760b Typo 2017-09-08 13:53:21 +02:00
Mark
a50e228ba1 Fix onHover border for extruder buttons 
CURA-4148
 2017-09-08 11:56:37 +02:00
Lipu Fei
24e5c72e47 Update colour for light theme 
CURA-4148
 2017-09-06 16:04:31 +02:00
Lipu Fei
e18528d2ca Fix position of the material compatibility warning 
CURA-4148
 2017-09-06 15:49:54 +02:00
Mark
34f8db5450 Changed some margins to improve alignment 
CURA-4211
 2017-09-06 14:52:16 +02:00
Lipu Fei
e163cc0d84 Remove "Extruder Configuration" text 
CURA-4211
 2017-09-06 12:43:42 +02:00
Lipu Fei
fc7207e77e Remove "Sync" button 
CURA-4211
 2017-09-06 12:17:40 +02:00
Lipu Fei
e15a96263d Update extruder button styles 
CURA-4211
 2017-09-06 12:00:53 +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
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
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons 
CURA-4148

Resolve merge conflicts.
 2017-08-28 11:13:38 +02:00