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

17030 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Ghostkeeper
def7b6994d
Store correct ID in metadata after deserialising 
Contributes to issue CURA-4243.
 2017-11-21 12:50:10 +01:00
Diego Prado Gesto
feb0a08fd9 CURA-4581 The project name is cached instead of set 2017-11-21 12:34:08 +01:00
Ghostkeeper
4fa38c26e8
Don't add any extra metadata to the end of the list you're iterating over 
Stupid mistake. This causes infinite loops.

Contributes to issue CURA-4243.
 2017-11-21 11:46:14 +01:00
Ghostkeeper
0831451371
Fix returning resulting metadata 
Forgot to change that back.

Contributes to issue CURA-4243.
 2017-11-21 11:05:11 +01:00
Jaime van Kessel
b1649f2d38 Added PrintJob handling to ClusterUM3 
CL-541
 2017-11-21 11:01:19 +01:00
Jaime van Kessel
152f3462ce Also added any to callable mypy decorator 
For some reason it also wants to know that it also calls self. Weird.
CL-541
 2017-11-21 11:00:37 +01:00
Ghostkeeper
c4debbea8b
Implement deserializeMetadata 
Let's hope this works...

Contributes to issue CURA-4243.
 2017-11-21 10:59:01 +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
Jaime van Kessel
10a2dbb134 Extended the typing for the calllbacks 
CL-541
 2017-11-21 10:35:53 +01:00
Jaime van Kessel
fd548975cc Closing a connection now actually stops the updates 
CL-541
 2017-11-21 10:19:17 +01:00
fieldOfView
b4b39f0949 Tweak compatibility mode collapsed view panel 2017-11-20 20:32:45 +01:00
fieldOfView
532331bd44 Add a collapse button to the Simulation View panel 
See https://github.com/Ultimaker/Cura/pull/2732
 2017-11-20 20:24:38 +01:00
ChrisTerBeke
7556271d2b Fix merge conflict 2017-11-20 18:20:06 +01:00
Mark
43f339f927 Update fdmprinter.def.json 2017-11-20 18:14:08 +01:00
Jack Ha
7219d84b91 CURA-4104 added settings for flow rate compensated extrusion 2017-11-20 18:13:28 +01:00