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
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
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
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
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
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
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
jack
f197508694
Merge pull request #2814 from Ultimaker/feature_maximum_resolution
...
Maximum mesh resolution
2017-11-20 18:09:11 +01:00
Lipu Fei
d00f3ba79b
Fix for loop
2017-11-20 18:08:13 +01:00
Lipu Fei
8cad79831a
Fix empty containers in stack upgrade
2017-11-20 18:07:51 +01:00
Ghostkeeper
b875f06baf
Add setting to set the maximum mesh resolution
...
Implements issue CURA-4590.
2017-11-20 18:04:34 +01:00
Diego Prado Gesto
a4ed3bb2c6
CURA-4577 Fix the previous change
2017-11-20 17:59:57 +01:00
ChrisTerBeke
85eab3606b
Simplify relative positioning xyz value updates - CURA-4577
2017-11-20 17:58:46 +01:00
Aleksei S
10b5a19043
Fix merge conflict
2017-11-20 17:56:54 +01:00
fieldOfView
a42d054505
Tweak simulation view panel margins
2017-11-20 17:49:00 +01:00
Diego Prado Gesto
dd8e5e2c6e
CURA-4577 Take into account relative movements in GCodes
2017-11-20 17:48:05 +01:00
ChrisTerBeke
657a91c525
Merge pull request #2685 from Ultimaker/container_stack_improvements
...
Container stack improvements
2017-11-20 17:42:26 +01:00
Ghostkeeper
da14ce5bef
Add to all installation to lib/ folders
...
Some systems have a suffix there to indicate the address size, such as lib64.
2017-11-20 17:40:41 +01:00
Ghostkeeper
085e933e34
Move ironing into shell category
...
It is no longer considered experimental.
2017-11-20 17:39:10 +01:00
Ghostkeeper
df1a11ca07
Don't crash if support density is 0
...
Found while working on CURA-4523.
2017-11-20 17:38:39 +01:00
ChrisTerBeke
a08ab656eb
Merge branch '3.1'
2017-11-20 17:18:32 +01:00
fieldOfView
1483683992
Move play button to path slider
2017-11-20 17:17:16 +01:00
