3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-02-09 01:30:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11315 commits 357 branches 330 tags 722 MiB
Commit graph

2506 commits

Author SHA1 Message Date
Ruben D
ffef26097d
Merge branch '3.1' 2017-11-26 18:48:42 +01:00
Aleksei S
bb2be70dac Finds candidate quality profile for fdmextruder 
CURA-4620
 2017-11-25 02:25:36 +01:00
Ghostkeeper
4a8dacbe06
Make crash handler easier to translate 
All that formatting doesn't need to be translated along. It's only confusing, especially because of those variable names. They always need to be in that position anyway.

Contributes to issue CURA-4601.
 2017-11-24 13:16:14 +01:00
Aleksei S
6cea9c59e8 Prevent crash handler exception 2017-11-24 11:59:09 +01:00
Lipu Fei
c7667b56e2 Multiple fixes for stacks 
CURA-4617
 2017-11-24 09:45:59 +01:00
Lipu Fei
2397b68cd7 Optimize MaterialsModel update 
CURA-4546
 2017-11-23 14:07:40 +01:00
Lipu Fei
17f09ec21e Fix variant/material/quality handling in stacks 
CURA-4613
 2017-11-23 12:46:33 +01:00
Lipu Fei
18c7a5acf3 Pass optional file_name for deserialization 
CURA-4613

Some upgrades depend on the file_name, so the file_name is needed in
this case.
 2017-11-23 11:28:16 +01:00
Ghostkeeper
105d7a5615
Return newly added single extruder 
The workspace reader needs to use it to get the correct material.

Contributes to issue CURA-4604.
 2017-11-22 17:12:53 +01:00
ChrisTerBeke
6c3eaca0fd fix loading user changes container for single extruder machine 2017-11-22 16:22:23 +01:00
Jack Ha
3b5ed70113 CURA-4602 Fixed active custom profile selected check 2017-11-22 16:15:06 +01:00
Lipu Fei
a7a3ba9500 Always update the job name when a project file is loaded 
CURA-4553
 2017-11-22 13:10:09 +01:00
ChrisTerBeke
532cfd8404 Fix showing correct quality changes in dropdown list after upgrading - CURA-4482 2017-11-22 10:48:21 +01:00
Lipu Fei
f8fe6cd455 Treat project files the same way as model files for job name 
CURA-4553
 2017-11-22 10:17:53 +01:00
Lipu Fei
aeb478bb4b Should only show Keep/Discard dialog when it's needed 
CURA-4599
 2017-11-22 09:32:17 +01:00
Lipu Fei
31c859b3d7 Show Keep/Discard dialog after the containers have been changed 
CURA-4599

Or the default values will reflect those before the switch.
 2017-11-22 09:18:20 +01:00
ChrisTerBeke
0625d22e04 Fix update script for single extrusion quality changes - CURA-4482 2017-11-21 16:43:05 +01:00
ChrisTerBeke
7c28f6f149 Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-11-21 15:32:08 +01:00
ChrisTerBeke
62d70b46d6 Fix filtering custom profiles per extruder - CURA-4482 2017-11-21 15:31:59 +01:00
Lipu Fei
8782e2e529 Rename parameters 
CURA-4581
 2017-11-21 15:12:56 +01:00
Lipu Fei
f18cb951fc Use workspaceLoaded signal instead of projectFileLoaded 
CURA-4581
 2017-11-21 13:49:25 +01:00
Diego Prado Gesto
b6e997c88d CURA-4526 Delete LayerView plugin because it will be replaced with the 
SimulationView.
This commit also adapts the code in order to accept the messages coming
from the engine, with information about feedrates and line thicknesses.
Add also some changes in the GCodeReader that reads feedrates and
line thickness from the gcode file.
 2017-11-21 10:47:29 +01:00
jack
f197508694 Merge pull request #2814 from Ultimaker/feature_maximum_resolution 
Maximum mesh resolution
 2017-11-20 18:09:11 +01:00
Aleksei S
10b5a19043 Fix merge conflict 2017-11-20 17:56:54 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements 
Container stack improvements
 2017-11-20 17:42:26 +01:00
Aleksei S
f484467f86 Clean project name in PrintInformation after removing the last model 
CURA-4581
 2017-11-17 18:11:22 +01:00
Thomas Karl Pietrowski
b2da4894b1
CuraApplication: Rename file --> file_name 
'file' is a built-in function!
 2017-11-15 01:21:08 +01:00
Jaime van Kessel
f2e7fef747 Update PreviewPass so that only slicable objects are rendered 2017-11-09 13:51:47 +01:00
Jaime van Kessel
06045f036e Added previewPass 2017-11-08 16:37:24 +01:00
Lipu Fei
d65ae62876
Merge pull request #2743 from Ultimaker/headless_cura 
Headless cura
 2017-11-07 11:07:43 +01:00
Diego Prado Gesto
a623c2ae75 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-02 09:53:36 +01:00
Diego Prado Gesto
d503283089 CURA-4509 Minor fix that avoids crashes when there is no specified 
material (such as in UM2)
 2017-11-02 09:51:57 +01:00
ChrisTerBeke
142ff4e9dc
Merge pull request #2669 from fieldOfView/feature_jogging 
Jogging
 2017-11-01 16:15:40 +01:00
alekseisasin
db51054984
Merge pull request #2700 from fieldOfView/feature_cleanup_save_monitor_area 
Cleanup save/monitor button area
 2017-11-01 15:53:20 +01:00
Mark
3ba7db1420 Merge branch 'master' into headless_cura 2017-11-01 13:25:09 +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
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
fieldOfView
2d109090bc Show material name instead of extruder number 2017-10-30 12:40:41 +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
Mark
5db0fc7785 Add useragreement screen on first run of Cura 
CURA-4501
 2017-10-28 15:43:01 +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
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
Lipu Fei
2f441ba7e1 Remove debugging log lines 
CURA-4451
 2017-10-26 11:36:59 +02:00
Lipu Fei
701e9a91c2 Allow using longer accent for machines in job names 2017-10-26 11:13:30 +02:00
ChrisTerBeke
8826f86b54 Remove debug logging - CURA-4451 2017-10-26 09:58:01 +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