3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
11010 commits 307 branches 272 tags 787 MiB
Commit graph

11010 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreea Scorojitu
e36cefedf6
Update ChangeLog.txt 2017-10-31 10:47:57 +01:00
Aleksei S
f7ce4cc78a Merge branch 'master' of github.com:Ultimaker/cura 2017-10-31 10:27:35 +01:00
Aleksei S
e0c1afe01f Added Request package information to AboutDialog.qml 
CURA-4415
 2017-10-31 10:26:42 +01:00
alekseisasin
055b6ebaab
Merge pull request #2691 from Ultimaker/cleaner_open_project_dialog 
Cleaner open project dialog & redering on partial pixels fixes
 2017-10-31 09:58:52 +01:00
Ghostkeeper
92cf76b30b
Merge branch '3.0' 2017-10-31 09:57:42 +01:00
Andreea Scorojitu
d7b0583640 Update changelog to the current 3.0.4 version 2017-10-31 09:52:30 +01:00
Lipu Fei
67c11b8cdf
Fix code style 
CURA-4503
 2017-10-31 09:24:32 +01:00
Ruben D
93e746b1b3
Warm up to layer_0 temperatures in start g-code 
Thanks to nounours2099 for the correction.

Fixes #2631.
 2017-10-31 00:23:05 +01:00
Aleksei S
7f02ddd6e9 Simplified version for validation need to show user agreement 
CURA-4501
 2017-10-30 15:43:40 +01:00
Lipu Fei
aab601927c Show Add Machine dialog after User Agreement dialog is closed 
CURA-4501
 2017-10-30 15:43:40 +01:00
Lipu Fei
b5904cd239 Fix code style 
CURA-4501
 2017-10-30 15:43:40 +01:00
Mark
ca8127c047 Fixed code comments 
CURA-4501
 2017-10-30 15:43:39 +01:00
Mark
9aebb395ab Refactor and cleanup 
CURA-4501
 2017-10-30 15:43:39 +01:00
Mark
b45e44b388 Add useragreement screen on first run of Cura 
CURA-4501
 2017-10-30 15:43:39 +01:00
Lipu Fei
e6e61e9a3c
Merge pull request #2697 from Ultimaker/feature_add_user_agreement 
Feature add user agreement
 2017-10-30 14:50:52 +01:00
Aleksei S
22aaf64b63 Simplified version for validation need to show user agreement 
CURA-4501
 2017-10-30 14:42:46 +01:00
Lipu Fei
69cd00d1c7 Do not take into account the active materials when importing a quality profile 
CURA-4451

When importing a quality profile, it should not fail/succeed based on
which materials are activated at the moment. The imported quality
profile will be available when the user switches to a compatible
settings.
 2017-10-30 13:13:54 +01:00
Lipu Fei
0096fe0de3 Fix project loading to handle "Not Supported" quality profiles 
CURA-4451
 2017-10-30 12:54:21 +01:00
Lipu Fei
b6dd87081c Add upgrade script for 3.0 to 3.1 
CURA-4451

- Add upgrade script for 3.0. to 3.1
- Upgrade old stack files so they will use "empty_quality" as the
  "Not Supported" quality profile.
- Increase SettingVersion to 4
 2017-10-30 12:45:25 +01:00
Lipu Fei
c0f1af94ab Show Add Machine dialog after User Agreement dialog is closed 
CURA-4501
 2017-10-30 10:33:50 +01:00
Lipu Fei
85f7b1ac03 Fix code style 
CURA-4501
 2017-10-30 10:32:46 +01:00
Mark
0bdc1aad00 Fixed code comments 
CURA-4501
 2017-10-29 09:04:23 +01:00
Mark
8bfd10f9aa Refactor and cleanup 
CURA-4501
 2017-10-28 20:29:26 +02:00
Mark
910386eaf7 remove unused import 2017-10-28 15:43:26 +02:00
Mark
5db0fc7785 Add useragreement screen on first run of Cura 
CURA-4501
 2017-10-28 15:43:01 +02:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
Mark
6c04a8be5d same font for checkbox label and some layout anchors 2017-10-27 13:48:55 +02:00
Diego Prado Gesto
fb88dd6326 CURA-4492 Postponed signals are now emitted even if we need user 
interaction when changing quality profiles
 2017-10-27 13:32:51 +02:00
Aleksei S
2a4addefbf Merge branch 'master' of github.com:Ultimaker/cura 2017-10-27 11:20:53 +02:00
Aleksei S
7e6e0e2021 Remove "not supported" quality files for "Builder premium" printer 
CURA-4436
 2017-10-27 11:18:46 +02:00
Lipu Fei
fe70e19089 Reset extruder numbers whose values are no longer valid 
CURA-4176

After the user changes the number of extruders for a machine, some
extruder number settings may not have valid values any more. These
settings need to be reset.`
 2017-10-27 10:59:03 +02:00
alekseisasin
e8bd404904 Merge pull request #2584 from Builder3D/master 
Add Builder Premium
 2017-10-27 10:25:11 +02:00
Ghostkeeper
ff5b9eefea
Minor improvement to German translation of 'Check all' 
Thanks to @app-js. 'Alles auswählen' didn't fit.

Fixes #2689.
 2017-10-27 09:33:40 +02:00
Diego Prado Gesto
92ac7c5a15 Merge branch 'CURA-4451_not_support_container' 2017-10-26 16:55:17 +02:00
Diego Prado Gesto
b9c318d432 CURA-4451 Minor changes 2017-10-26 16:53:31 +02:00
Diego Prado Gesto
524ace9b04 Merge branch 'CURA-4451_not_support_container' of https://github.com/Ultimaker/Cura into CURA-4451_not_support_container 2017-10-26 15:30:07 +02:00
Diego Prado Gesto
9b066ea78b CURA-4451 Bring back again the PP 0.4 fast profile of UM2+ that was 
deleted by mistake
 2017-10-26 15:27:01 +02:00
Lipu Fei
7d46eead60 Fix broken unit tests due to evaluation context 
CURA-4498
 2017-10-26 12:49:41 +02:00
Lipu Fei
2f441ba7e1 Remove debugging log lines 
CURA-4451
 2017-10-26 11:36:59 +02:00
Lipu Fei
9488d543de Merge pull request #2677 from fieldOfView/fix_isclusterprinter 
Fix qml error when there is no connected printer
 2017-10-26 11:23:39 +02:00
Lipu Fei
701e9a91c2 Allow using longer accent for machines in job names 2017-10-26 11:13:30 +02:00
fieldOfView
fff9330949 Merge branch 'master' into fix_is_clustersize 
# Conflicts:
#	plugins/UM3NetworkPrinting/UM3InfoComponents.qml
#	resources/qml/Menus/MaterialMenu.qml
#	resources/qml/Menus/NozzleMenu.qml
 2017-10-26 11:09:13 +02:00
ChrisTerBeke
8826f86b54 Remove debug logging - CURA-4451 2017-10-26 09:58:01 +02:00
ChrisTerBeke
a5ec64bf7c Remove builder premium extruder definitions - CURA-4451 2017-10-26 09:55:01 +02:00
ChrisTerBeke
ac40de7272 Remove builder premium resources that were used for testing (separate PR to add them back) - CURA-4451 2017-10-26 09:54:06 +02:00
ChrisTerBeke
b1a4c3488f Merge branch 'master' into CURA-4451_not_support_container 2017-10-26 09:48:52 +02:00
ChrisTerBeke
fc48ba7bae Remove all not supported quality profiles - CURA-4451 2017-10-26 09:48:31 +02:00
ChrisTerBeke
0377edaa0f resolve conflicts 2017-10-26 09:26:18 +02: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
Lipu Fei
e4fec1f63d Move SaveButton downwards 
CURA-4490

Move SaveButton downwards so it doesn't overlay with the estimated print
time in some language.
 2017-10-25 16:35:38 +02:00