11897 Commits

Author SHA1 Message Date
anraf1001
474e146c46 Polish translation - updated version 2017-11-22 16:34:57 +01:00
Dinow
187e4babdc import from 3.0 2017-11-22 23:34:46 +08: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
97000d8538
Merge branch '3.1' 2017-11-22 12:45:33 +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
dfe29fa482
Merge branch '3.1' 2017-11-22 12:41:57 +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
Jaime van Kessel
7465a6551a Setup the authentication stuff for LegacyUM3
CL-541
2017-11-22 11:59:07 +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
Diego Prado Gesto
1e79f28842 Merge branch 'fieldOfView-feature_simulation_ux_tweaks' 2017-11-22 10:19:50 +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
Diego Prado Gesto
10ec02840e Merge branch 'feature_simulation_ux_tweaks' of https://github.com/fieldOfView/Cura into fieldOfView-feature_simulation_ux_tweaks 2017-11-22 09:55:57 +01:00
Jack Ha
82a7b3718d Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-22 09:42:13 +01:00
Jack Ha
0a2a9a2589 CURA-4533 added setting 'Filter out tiny gaps' 2017-11-22 09:42:03 +01:00
Lipu Fei
68920043ff Merge branch '3.1' 2017-11-22 09:34:58 +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
Jaime van Kessel
f987e6d977 Functionality properties (canPause, canPreHeatBed, etc) are now in the Controller.
It's actually up to the controller to say something about this, so this location makes more sense

CL-541
2017-11-21 16:59:17 +01:00
Jaime van Kessel
0fe91db636 Moved HeatedBedBox to own qml file
CL-541
2017-11-21 16:52:37 +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
fieldOfView
863b40b900 Merge branch 'master' into feature_simulation_ux_tweaks
# Conflicts:
#	plugins/SimulationView/SimulationView.qml
2017-11-21 16:49:41 +01:00
ChrisTerBeke
9db5fa2ed5 Merge branch '3.1' 2017-11-21 16:46:50 +01:00
ChrisTerBeke
0625d22e04 Fix update script for single extrusion quality changes - CURA-4482 2017-11-21 16:43:05 +01:00
Jaime van Kessel
34e808d585 PrinterOutputModel now has different extruders if it has more than one.
It used to just fill the list with references to the first one created.
CL-541
2017-11-21 16:36:51 +01:00
Jaime van Kessel
d8b12be5e4 LegacyUM3 now correctly gets material set
CL-541
2017-11-21 16:26:17 +01:00
Jaime van Kessel
e3d07f1806 Moved ExtruderBox and OutputDeviceHeader to their own files.
This makes it a whole lot easier to get an overview.

CL-541
2017-11-21 16:06:30 +01:00
Lipu Fei
83b25a1498 Merge 3.1 into master 2017-11-21 15:35:57 +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
Jaime van Kessel
0f78b05802 Connection states changes are now tied into the UI again
CL-541
2017-11-21 15:12:23 +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
Jaime van Kessel
9cfe9769d3 Printers now automatically try to connect again
CL-541
2017-11-21 14:47:55 +01:00
Jaime van Kessel
3f1167a7d2 Results in printer discovery are sorted again
CL-541
2017-11-21 14:39:03 +01:00
Jaime van Kessel
a8e71cf50c NetworkManager is now created on demand and re-created after a certain timeout.
CL-541
2017-11-21 14:35: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