Tim Kuipers
67a4ec2a9e
dark layer view
2017-06-22 18:56:55 +02:00
Jaime van Kessel
9e275cd41c
Merge branch 'feature_dark_theme' of https://github.com/fieldOfView/Cura
2017-06-22 18:44:16 +02:00
Ghostkeeper
bc219a06fe
Add MaterialsModel to make material list update upon metadata change
...
This new model inherits from InstanceContainersModel. The only change is that it updates when the metadata of a material container changes. This is needed to make the list of materials update when the material diameter changes.
Contributes to issue CURA-2822.
2017-06-22 18:17:16 +02:00
Ghostkeeper
0e23930bfe
Fix checking whether the old material diameter was the same
...
Getting the old material diameter wasn't working properly.
Contributes to issue CURA-2822.
2017-06-22 18:17:16 +02:00
Ghostkeeper
1d048f39db
Fix getting old material diameter
...
This diameter works. I still don't know why the properties/diameter one didn't work, but this is good too since they are now equal.
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
7ea1d4cc5a
Add getContainerProperty function
...
The opposite of setContainerProperty.
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
f041473465
Fix applying material diameter undo
...
Somehow it seems to get the wrong value there though. Debugging that next...
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
c192d37daa
Fix connecting undo action to undo button
...
Also hiding the message afterwards. Apparently that's not done automatically.
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
b37fa6f718
Implement warning message when you change material diameter
...
The undo functionality currently gives an error though. Investigating...
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
121bf5897d
Deprecate _updateMaterialContainer
...
There are better alternatives nowadays.
Discovered during CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
fc96dfec4e
Expose approximateMaterialDiameter of the definition
...
This way we can request that from QML.
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Jaime van Kessel
503aa00137
Added rough dialog for the PluginBrowser
...
CURA-3856
2017-06-22 17:55:45 +02:00
Jaime van Kessel
d1e1265215
Merge branch 'master' of github.com:Ultimaker/Cura
2017-06-22 17:26:31 +02:00
Jaime van Kessel
8f1608bc3b
Added model to PluginBrowser
...
We need the model to display items in the popup view.
CURA-3856
2017-06-22 17:25:48 +02:00
Jaime van Kessel
b9241e8070
PluginBrowser now retrieves list of plugins from the server
...
CURA-3856
2017-06-22 16:13:33 +02:00
Jaime van Kessel
b9e863a953
Added PluginBrowser stub
...
CURA-3856
2017-06-22 14:39:46 +02:00
Lipu Fei
293c1690c6
Change to use machine_nozzle_id
...
CURA-3872
We cannot assume that all nozzles will have IDs like "<type> <size>"
such as "AA 0.4", so we should use a complete string as the nozzle IDs.
2017-06-22 14:00:04 +02:00
Lipu Fei
46b6e5b0a1
Add machine_nozzle_type and set them in UM3 and UM3XL variants
...
CURA-3872
We add a new setting "machine_nozzle_type" to give the engine
information about the nozzle type, such as "AA" and "BB". This is
applicable to UM3 and UM3XL.
2017-06-22 14:00:04 +02:00
Lipu Fei
6be76ec806
Fix code style
...
CURA-3872
2017-06-22 14:00:04 +02:00
Jaime van Kessel
14fb01ee46
Merge branch '2.6' of github.com:Ultimaker/Cura
2017-06-22 10:24:36 +02:00
Jaime van Kessel
7b7580daaf
Merge branch 'fix_single_extrusion_multiple_stacks' of https://github.com/fieldOfView/Cura into 2.6
2017-06-22 10:12:49 +02:00
Lipu Fei
5900bb8622
Use "Ultimaker" as the author for ultimaker plugins
...
CURA-3712
2017-06-22 08:58:54 +02:00
Lipu Fei
4ea8cc448a
Use semantic versioning for all plugin.json
...
CURA-3712
2017-06-22 08:57:47 +02:00
Lipu Fei
73f598ff9f
Fix code style
...
CURA-3712
2017-06-22 08:54:04 +02:00
fieldOfView
de01155630
Add documentation
2017-06-21 19:15:05 +02:00
fieldOfView
adc547fa36
Don't send extruder stack settings to CuraEngine when there is just one extruder
...
When there is 1 extruder, the frontend stores all settings in the global stack. Sending an extruder stack confuses CuraEngine into using the values of the extruder stack, which results in defaults being used.
2017-06-21 19:00:18 +02:00
Tim Kuipers
cfe1dd4fb6
fix: group selection box uses proper rendermode now (CURA-3846)
...
Renderer.RenderMode doesn't exist any more.
This should have been fixed way back when RenderBatch was introduced
2017-06-21 15:05:49 +02:00
Jaime van Kessel
827ec9b6a5
Merge branch 'master' of github.com:Ultimaker/Cura
2017-06-21 14:28:10 +02:00
Jaime van Kessel
e3629cec39
Replaced catalog metadata entry with i18n-catalog
...
CURA-3712 & Cura-3856
2017-06-21 14:24:00 +02:00
Ghostkeeper
1d23d659f0
Merge branch '2.6'
2017-06-21 12:29:23 +02:00
Ghostkeeper
8aa420be62
Fix location of log on Windows
...
It's a bit longer, but hopefully clear for both advanced system engineers and for rookies.
2017-06-21 11:53:38 +02:00
Ghostkeeper
e7d5618148
Re-enable Japanese translation
...
Note that this only includes the setting descriptions.
Contributes to issue CURA-3950.
2017-06-21 11:30:16 +02:00
Ghostkeeper
24b19fa0a5
Convert tab to spaces
...
We indent with spaces, not tab. This one was mixed.
2017-06-21 11:29:35 +02:00
Ghostkeeper
1e0b82829b
Update Japanese translation
...
This translation is only translating the setting descriptions. However it is also missing one translation: smooth spiralized contours. We decided not to block these translations just for that one. It was also missing another translation: Support bottom pattern. I inferred that from the description of Support Roof Pattern, basically doing the translation myself.
Contributes to issue CURA-3950.
2017-06-21 11:27:25 +02:00
Jaime van Kessel
44125d3275
Moved certain meta data entries to seperate file
...
CURA-3856 & CURA-3712
2017-06-21 11:22:35 +02:00
fieldOfView
73e951d402
Darken buildplate
2017-06-19 15:48:04 +02:00
fieldOfView
07dc19c299
Add a dark theme
...
Based on the work by @rudowinger
2017-06-19 13:24:01 +02:00
Ghostkeeper
015c253252
Merge branch 'master' of github.com:Ultimaker/Cura
2017-06-19 11:34:06 +02:00
Ghostkeeper
17a610a3a6
Merge branch 'fieldOfView-feature_lsit_themes'
2017-06-19 11:33:13 +02:00
Jaime van Kessel
80cb0e5aac
Merge pull request #1961 from fieldOfView/feature_moai_updates
...
Update Peopoly Moai definition
2017-06-19 11:21:33 +02:00
Jaime van Kessel
5375d43320
Merge branch 'fix_layerview_python3.6' of https://github.com/sheinz/Cura
2017-06-19 11:13:31 +02:00
Ghostkeeper
9acaef8ecc
Merge branch 'feature_lsit_themes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_lsit_themes
2017-06-19 11:05:20 +02:00
Ghostkeeper
e16d88517d
Merge branch '2.6'
2017-06-16 15:54:59 +02:00
Ghostkeeper
694254e299
Fix MIME type of material resources
...
Because of this wrong MIME type, the material profile would get saved using the preferred extension of the instance container, .inst.cfg. This would then get interpreted as having the MIME type of instance containers, and then it would fail to load because it is not an INI file.
Now it stores it as .xml.fdm_material and so the MIME type database interprets it as an XML file.
Contributes to issue CURA-3937.
2017-06-16 15:54:42 +02:00
Jaime van Kessel
41c5aaed69
Merge branch '2.6' of github.com:Ultimaker/Cura
2017-06-16 13:53:05 +02:00
Ghostkeeper
8c5c28d399
Convert tabs to spaces
...
Contributes to issue CURA-3916.
2017-06-16 13:23:54 +02:00
Ghostkeeper
455c5d7865
Merge branch 'beeverycreative-master'
2017-06-16 13:19:23 +02:00
Ghostkeeper
a060cfbc66
Merge branch 'master' of https://github.com/beeverycreative/Cura into beeverycreative-master
2017-06-16 13:18:30 +02:00
Ghostkeeper
107b47ef18
Merge branch 'maukcc-master'
2017-06-16 12:57:24 +02:00
Ghostkeeper
e11a52b4ac
Fix infill pattern
...
Since the value is interpreted as Python code, it needs to have an extra set of quotes to be interpreted as a string instead of a variable.
Contributes to issue CURA-3907.
2017-06-16 12:46:52 +02:00
