GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,163 Commits 293 Branches 266 Tags
Commit Graph

11163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
f0dca021d8 Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-11-23 15:42:02 +01:00
Diego Prado Gesto
2c6b2b869e CURA-4605 Fix render issues when there are empty layers. 
Fix layer gap when raft is enabled.
 2017-11-23 15:39:22 +01:00
Lipu Fei
ef37f0d8c7 Fix project loading to reset quality if it doesn't exist 
CURA-4617
 2017-11-23 15:35:33 +01:00
Ghostkeeper
e3cdcc04fd
Document IRC channels 2017-11-23 14:57:46 +01:00
Lipu Fei
033cc4fbc7 Fix quality update in project loading 
CURA-4613
 2017-11-23 14:12:41 +01:00
Lipu Fei
dad2dfda89 No need to set currentItem after a material is imported 
CURA-4546
 2017-11-23 14:08:10 +01:00
Lipu Fei
2397b68cd7 Optimize MaterialsModel update 
CURA-4546
 2017-11-23 14:07:40 +01:00
Lipu Fei
1db448d7d8 Use the correct quality container for global stacks loaded from project files 
CURA-4613
 2017-11-23 13:04:06 +01:00
Aleksei Sasin
859dae8873 Merge branch '3.1' of https://github.com/Ultimaker/cura into 3.1 2017-11-23 12:58:09 +01:00
Aleksei Sasin
1141368682 Hide icons if monitor view is selected CURA-4527 2017-11-23 12:54:53 +01:00
Lipu Fei
17f09ec21e Fix variant/material/quality handling in stacks 
CURA-4613
 2017-11-23 12:46:33 +01:00
Lipu Fei
3148027fbe Fix version upgrade for quality_changes 
CURA-4613

Explained in the code comments.
 2017-11-23 12:43:14 +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
jack
1b76d08f01
Merge pull request #2835 from Ultimaker/simulation_view_minor_improvements 
CURA-4609 Minor improvements in Simulation View
 2017-11-23 10:49:08 +01:00
Diego Prado Gesto
b97ed4c211 CURA-4609 Minor improvements in Simulation View: 
Increase simulation speed.
Hide Layer Thickness option in color scheme.
Hide nozzle when switching layers.
Set the handles in front of the view.
Name changed back to "Layer View"
 2017-11-23 09:59:34 +01:00
Mark
3477b902ab
Merge pull request #2834 from Ultimaker/CURA-4527_view_orientation 
Cura 4527 view orientation
 2017-11-23 09:56:26 +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
fe016e336d Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-11-22 16:22:34 +01:00
ChrisTerBeke
6c3eaca0fd fix loading user changes container for single extruder machine 2017-11-22 16:22:23 +01:00
Ghostkeeper
dc105c86a0
Ignore live scripting plug-ins 2017-11-22 16:16:35 +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
Ghostkeeper
3823cca936
Disable Russian translation since it's incomplete 
The maintainer of this translation didn't want to continue spending time to keep his translation up-to-date.

Contributes to issue CURA-4601.
 2017-11-22 12:45:21 +01:00
Ghostkeeper
ffa418660a
Update Korean translations for 3.1 
This adds empty translations and updates the line numbers and such. The original Korean translations for 3.0 are still retained.

Contributes to issue CURA-4601.
 2017-11-22 12:41:31 +01:00
Ghostkeeper
62113df3bd
Update Korean translations with 3.0 translations 
These are so wrong that Cura won't start with these translations loaded. We're asking for corrections.

Contributes to issue CURA-4601.
 2017-11-22 12:41:31 +01:00
Lipu Fei
9fab4070a6 Fix quality_changes upgrade from 2.7 to 3.1 2017-11-22 12:11:18 +01:00
Aleksei S
d7b230269b The icons changed 
CURA-4527
 2017-11-22 11:10:25 +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
Diego Prado Gesto
f69d83cce1 Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-11-21 17:15:14 +01:00
Diego Prado Gesto
72954e758c CURA-4593 Workaround to fix the rendering glitches when the last layer has no data 2017-11-21 17:15:07 +01:00
Ghostkeeper
628e88a7e4
Update translation templates for every language 
These files are to be sent to the translators. Their old translations have been retained but new strings were added.

Contributes to issue CURA-4601.
 2017-11-21 16:59:56 +01:00
Ghostkeeper
1cb109d192
Update translation templates for Cura 3.1 
Generated by calling 'make extract-messages'. This commit introduces a string freeze for Cura 3.1.

Contributes to issue CURA-4601.
 2017-11-21 16:51:40 +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
Diego Prado Gesto
b36f4e497a Merge branch 'CURA-4595_remove_0.1_bam_quality' into 3.1 2017-11-21 15:22:21 +01:00
Lipu Fei
8782e2e529 Rename parameters 
CURA-4581
 2017-11-21 15:12:56 +01:00
Jack Ha
92e273fba9 Merge branch '3.1' of github.com:Ultimaker/Cura into 3.1 2017-11-21 15:12:26 +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
Lipu Fei
f18cb951fc Use workspaceLoaded signal instead of projectFileLoaded 
CURA-4581
 2017-11-21 13:49:25 +01:00
Diego Prado Gesto
d415c5fcbb CURA-4526 Add transparency to the nozzle so the user can see the lines 
and layers through the nozzle.
 2017-11-21 13:42:46 +01:00
Lipu Fei
b09ffaf9e2 Remove "Fine" 0.1mm quality for BAM 
CURA-4595
 2017-11-21 13:35:59 +01:00
Diego Prado Gesto
f216e2df24 Merge branch '3.1_with_simulation_view' into 3.1 2017-11-21 13:31:18 +01:00
Diego Prado Gesto
abe9ba3795 CURA-4526 Stop simulation when changing preferences. 
Hide nozzle node when in compatibility mode.
 2017-11-21 13:23:47 +01:00
Diego Prado Gesto
feb0a08fd9 CURA-4581 The project name is cached instead of set 2017-11-21 12:34:08 +01:00
Diego Prado Gesto
2df06bbbb9 CURA-4526 Add Simulation View plugin 2017-11-21 10:51:57 +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