Commit graph

3821 commits

Author SHA1 Message Date
Ghostkeeper
7cb8e549f4
Merge branch 'feature_mold_roof' 2017-05-18 16:47:51 +02:00
Arjen Hiemstra
7e4f983cd6 Fix support settings that need their inheritance value from different extruders
Contributes to CURA-3738
2017-05-18 15:34:50 +02:00
Jaime van Kessel
ff2478ff51 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-17 16:25:02 +02:00
Jaime van Kessel
428d063044 Added missing variants for um2_extended if you have olson block
CURA-3742
2017-05-17 16:24:13 +02:00
Ghostkeeper
236b1dc0ca
Merge branch 'Cura/master' of https://github.com/maukcc/Cura into maukcc-Cura/master 2017-05-17 15:35:05 +02:00
Jaime van Kessel
e608252151 Fixed missing namechanges for global profiles
CURA-3777
2017-05-17 13:21:11 +02:00
Jaime van Kessel
d49dd735bc Merge branch 'transparent_limit_to_extruder' of github.com:Ultimaker/Cura 2017-05-17 11:31:18 +02:00
Arjen Hiemstra
20e46f4d8b Make Extruder setting type update its color properly
The binding for the material color would not get updated properly when
the model changes. This fixes that.

Contributes to CURA-3804
2017-05-17 11:30:48 +02:00
Jaime van Kessel
61faaf4776 Removed unneeded calls to extruder value
CURA-3738
2017-05-17 11:02:16 +02:00
Arjen Hiemstra
9686df285d Merge branch 'master' of github.com:Ultimaker/Cura into transparent_limit_to_extruder 2017-05-17 10:26:48 +02:00
Arjen Hiemstra
616ee34be5 Simplify SettingExtruder setting item
This way it properly updates when a parent setting changes.

Contributes to CURA-3804
2017-05-16 17:43:24 +02:00
Jaime van Kessel
7d5c2a9b6a Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-16 17:19:58 +02:00
Jaime van Kessel
f8b29c4d1f Delete the right not supported profiles 2017-05-16 17:19:41 +02:00
Jaime van Kessel
77843107f6 Revert "Removed no longer used profiles"
This reverts commit 704c6e5d8f.
2017-05-16 17:18:57 +02:00
Ghostkeeper
50bda1c9dd
Remove overrides of support interface speed/accel/jerk
This is a settings updates from the Materials team.
2017-05-16 14:40:42 +02:00
Ghostkeeper
93c249280e
Copy UM3 variants to UM3E
They should be kept in sync for now.
2017-05-16 14:40:42 +02:00
Ghostkeeper
8e3dff76ab
Set support X/Y distance for all PVA profiles
This is an update from the materials team for our settings.
2017-05-16 14:40:42 +02:00
Ghostkeeper
9b3568acae
Sort other PVA profiles as well
Makes it easier to compare profiles and to find setting values by key.
2017-05-16 14:40:42 +02:00
Ghostkeeper
a02ff8df5f
Sort settings alphabetically
Makes it easier to compare profiles.
2017-05-16 14:40:42 +02:00
Ghostkeeper
1ad9ba6c95
Remove lower warnings from Jerk settings
It's sometimes required to be extra careful, and the difference between 0 and 5 isn't that big that it would cause a great increase in print time.
2017-05-16 14:40:42 +02:00
Tim Kuipers
286c4665fc Resolve bed adhesion type to adhesion extruder (CURA-3738)"
The cause for this change is that TPU says we want to print with brim but CPE wants to print with raft.
In those cases the resolve function would choose the raft because that's safer.
However if the default extruder happens to be the TPU one you then get a raft made of TPU which is flexible.
That defeats the purpose of the raft, and causes the raft to warp, clog on the nozzle, destroy the world, etc. So there, I saved the world once more.
2017-05-16 13:28:33 +02:00
Tim Kuipers
b95712ef95 Revert "Resolve bed adhesion type via limit-to-extruder"
This reverts commit 396f4381dd.

The comit introduced an infinite recursion.

You cannot have both a limit_to_extruder and settable_per_extruder=false
2017-05-16 13:23:15 +02:00
Jaime van Kessel
704c6e5d8f Removed no longer used profiles
CURA-3816
2017-05-16 13:19:28 +02:00
Arjen Hiemstra
c5c67ee8be Merge branch 'master' of github.com:ultimaker/Cura into transparent_limit_to_extruder
* 'master' of github.com:ultimaker/Cura: (94 commits)
  Re-enable Japanese from language selection menu
  Add Japanese translations for setting descriptions
  Update PVA profiles
  Changed profile names
  Simplified some code
  Changed final spot where we still used findContainer when looking for container with specific type
  Directly use property instead of searching
  Added a type hinting to QualityManager
  JSON description fix: warn users when not to use spiralize (CURA-3636)
  Add setting_version every time we create InstanceContainer
  Increase warning value for gradual infill steps
  Convert all metadata fields to string
  cleanup: prime => prime blob and lil doc (CURA-3634)
  fix: don't make disallowed area if blob is disabled (CURA-3634)
  Be robust against older specification version numbers
  Read setting_version from version attribute on root
  Added bunch of typing to extruder manager
  Fix resolve strategy "new" for user instance container
  Added missing typehinting
  Row element was not used
  ...
2017-05-16 10:57:06 +02:00
jack
85a29e967f Merge pull request #1757 from fieldOfView/fix_material_uniqueness
Fix material uniqueness
2017-05-16 09:44:10 +02:00
Ghostkeeper
4b28e9bf43
Re-enable Japanese from language selection menu
Contributes to issue CURA-3817.
2017-05-16 09:38:39 +02:00
Ghostkeeper
dd1ce700f7
Add Japanese translations for setting descriptions
Not the labels yet (or anything else for that matter).

Contributes to issue CURA-3817.
2017-05-16 09:38:10 +02:00
Ghostkeeper
2fb73cccb2
Update PVA profiles
These updates bring different speeds for support-top vs. support-bottom, and changes the bottom pattern now that they are separately configurable. I also sorted the BB0.8 variant alphabetically (raft settings were out of place).
2017-05-15 17:11:39 +02:00
Jaime van Kessel
e40f60a52b Changed profile names
CURA-3777
2017-05-15 16:52:25 +02:00
Tim Kuipers
635b97a961 JSON description fix: warn users when not to use spiralize (CURA-3636) 2017-05-15 12:01:39 +02:00
Ghostkeeper
c61baf3355
Increase warning value for gradual infill steps
We set gradual infill steps to 5 if you choose Gradual Infill from recommended mode. This value was provided by the materials testers, so apparently it works fine and we shouldn't give a warning about that.

Contributes to issue CURA-3732.
2017-05-15 09:53:47 +02:00
Scheepers
f8691d6190 New Cartesio build platform 2017-05-13 13:10:24 +02:00
Mark
b100050ee2 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:44:17 +02:00
Mark
aee3b43227 Row element was not used 2017-05-12 16:43:50 +02:00
Ghostkeeper
0cc4f90920
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:34:19 +02:00
Mark
08c0779dde Remove unused file, context menu takes care of the multiply object dialog 2017-05-12 16:18:46 +02:00
Tim Kuipers
0d9514a5d0 Merge pull request #1821 from smartavionics/mb-smooth-spiralized-contours-not-per-model-or-extruder
Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. (CURA-3771)
2017-05-12 14:53:18 +02:00
Ghostkeeper
ebd730a68d
Also add setting_version to fdmextruder
Since it obviously doesn't inherit from fdmprinter.

Contributes to issue CURA-3427.
2017-05-12 14:43:05 +02:00
Ghostkeeper
f0f8871496
Add setting_version to all profiles
This represents the data version number (as opposed to the format version).

Contributes to issue CURA-3427.
2017-05-12 13:40:54 +02:00
Mark
f60765c56c Fix workspace dialog layout so checkbox and buttons dont get hidden 2017-05-12 13:24:58 +02:00
Ghostkeeper
0f5814e52f
Add setting_version and check against it
This breaks all profiles since they have the wrong setting version, of course. Have to change that in every instance container now...

Contributes to issue CURA-3427.
2017-05-12 12:58:15 +02:00
Ghostkeeper
dab50f04b8
Merge branch 'mb-smooth-spiralized-contours-not-per-model-or-extruder' of https://github.com/smartavionics/Cura into smartavionics-mb-smooth-spiralized-contours-not-per-model-or-extruder 2017-05-12 11:56:52 +02:00
Jaime van Kessel
502e977c24 UM2E now has olson block upgrade selection as machine action
CURA-3742
2017-05-12 10:27:13 +02:00
Jaime van Kessel
7508a0a981 Changed infill buttons so they work with all languages
CURA-3634
2017-05-12 10:24:15 +02:00
Mark Burton
bf80e6efd5 Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. 2017-05-12 09:10:21 +01:00
Ghostkeeper
396f4381dd
Resolve bed adhesion type via limit-to-extruder
The cause for this change is that TPU says we want to print with brim but CPE wants to print with raft. In those cases the resolve function would choose the raft because that's safer. However if the default extruder happens to be the TPU one you then get a raft made of TPU which is flexible. That defeats the purpose of the raft, and causes the raft to warp, clog on the nozzle, destroy the world, etc. So there, I saved the world once more.
2017-05-12 10:00:24 +02:00
Ghostkeeper
9de041ade5
Remove theme font from system-themed dialogue
See commit 36dedabd11.
2017-05-12 09:45:53 +02:00
Tim Kuipers
dadb592328 JSON feat: mold roof height (CURA-3797) 2017-05-11 21:26:15 +02:00
fieldOfView
a727e4ffd0 Make sure all materials are shown
Without this workaround, some materials that are listed above the generic materials do not show up untill the user scrolls the scrollview.
2017-05-11 18:17:11 +02:00
Arjen Hiemstra
434aaed767 Remove extruderValue call from raft setting
Contiributes to CURA-3738
2017-05-11 17:56:31 +02:00