Commit graph

3364 commits

Author SHA1 Message Date
Tim Kuipers
4c6f9486be feat: cutting mesh (CURA-966) 2017-04-08 12:49:00 +02:00
Ghostkeeper
5a39ed6793
Merge branch 'maukcc-master' 2017-04-07 10:09:53 +02:00
Tim Kuipers
36255fcabb The magic_spiralize setting is no longer settable per mesh (or extruder)
by smartavionics, Mark Burton
2017-04-06 17:51:06 +02:00
MaukCC
2ea6487368 Update cartesio.def.json 2017-04-06 15:27:59 +02:00
MaukCC
cb86482d44 Update cartesio_extruder_0.def.json 2017-04-06 14:29:36 +02:00
MaukCC
7936696239 Update cartesio_extruder_3.def.json 2017-04-06 14:28:51 +02:00
MaukCC
438ae5c29b Update cartesio_extruder_2.def.json 2017-04-06 14:28:22 +02:00
MaukCC
5495937198 Update cartesio_extruder_0.def.json 2017-04-06 14:27:42 +02:00
MaukCC
8f170a49f3 Update cartesio_extruder_1.def.json 2017-04-06 14:26:56 +02:00
MaukCC
5754df5061 Update cartesio_extruder_0.def.json 2017-04-06 14:25:47 +02:00
MaukCC
d7caa860a7 Update cartesio.def.json 2017-04-06 14:13:05 +02:00
MaukCC
e5d6fbcf1e Update cartesio_0.25.inst.cfg 2017-04-06 14:04:58 +02:00
MaukCC
66b5a1d0bc Update cartesio_0.8.inst.cfg 2017-04-06 14:04:39 +02:00
MaukCC
f54e671ede Update cartesio_0.4.inst.cfg 2017-04-06 14:04:07 +02:00
MaukCC
288e519278 Update cartesio.def.json 2017-04-06 12:13:39 +02:00
MaukCC
8d49bbd2f5 Update cartesio.def.json 2017-04-05 16:40:02 +02:00
MaukCC
575256227c Update cartesio_0.4.inst.cfg 2017-04-05 16:19:06 +02:00
MaukCC
2c12e5e4d9 Update cartesio_0.25.inst.cfg 2017-04-05 16:17:42 +02:00
MaukCC
6bc76f7b8c Update cartesio_0.4.inst.cfg 2017-04-05 16:16:03 +02:00
MaukCC
0f5bcb57e0 Update cartesio_0.25.inst.cfg 2017-04-05 16:12:29 +02:00
MaukCC
eee382b1d8 Update cartesio_0.25.inst.cfg 2017-04-05 16:09:28 +02:00
MaukCC
cb943cba98 Update cartesio_0.4.inst.cfg 2017-04-05 16:07:13 +02:00
Jack Ha
07ed1bedc3 Fix boo boo with open multi files including project files. 2017-04-05 16:07:02 +02:00
Jaime van Kessel
ecf905f580 Merge branch 'feature_arrange_cleanup' of github.com:Ultimaker/Cura 2017-04-05 10:45:42 +02:00
Ghostkeeper
210e9b5869
Merge branch '2.5' 2017-04-05 09:53:53 +02:00
Ghostkeeper
7b4375e3d1
Adjust minimum value warnings for line width
This was discussed with Tom from materials. The minimum warning value is now a linear function with a y-intercept. I tuned it so that it just sails under the minimum values of all of our profiles.
2017-04-05 09:53:14 +02:00
MaukCC
513ede0fda Update cartesio.def.json 2017-04-05 09:07:14 +02:00
MaukCC
8ff057d483 Update cartesio.def.json 2017-04-05 09:05:29 +02:00
MaukCC
e6bdf8c8f6 Update cartesio.def.json 2017-04-05 09:04:16 +02:00
MaukCC
edbfd4343a Update cartesio.def.json 2017-04-04 20:46:37 +02:00
MaukCC
21c14f58aa Update cartesio.def.json 2017-04-04 18:05:27 +02:00
MaukCC
bb200fa9e8 Update cartesio.def.json 2017-04-04 18:04:25 +02:00
MaukCC
c9397fd986 Update cartesio.def.json 2017-04-04 18:01:52 +02:00
Ghostkeeper
0dfe3f4109 Merge branch '2.5' 2017-04-04 17:25:50 +02:00
Ghostkeeper
81e639522d
Streamline headers of translation files
They now show correct attribution and sort of correct times, and they are consistent. Only ptbr isn't updated yet, because I expect an update soon from our translator.

Contributes to issue CURA-3487.
2017-04-04 17:24:33 +02:00
Lipu Fei
6b9d3e8041 Merge pull request #1636 from fieldOfView/fix_recent_dialogs
Fix issues with Workspace and Profile Changes dialogs
2017-04-04 14:35:12 +02:00
Ghostkeeper
6366d303f0
Update translations for 2.5
These are the translation files we received from Bothof. They have not been checked or corrected yet.

Contributes to issue CURA-3487.
2017-04-04 14:33:42 +02:00
Jaime van Kessel
a69bf967e5 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-04 13:31:02 +02:00
Jaime van Kessel
d5382c7924 Merge branch 'revise_jellybox_support' of git://github.com/IMADE3D/cura 2017-04-04 13:28:53 +02:00
Jaime van Kessel
7e201439d3 Merge branch 'feature_spaghetti_infill' of github.com:Ultimaker/Cura 2017-04-04 13:03:34 +02:00
Jaime van Kessel
68f536dc5f Merge pull request #1538 from Ultimaker/feature_mold
Mould
2017-04-04 12:53:33 +02:00
Ghostkeeper
6f2efbee61
Merge branch '2.5' 2017-04-04 11:24:12 +02:00
Ghostkeeper
28555c685f
Add profiles for 0.8mm ABS and CPE
These profiles are not optimised yet. I'm not allowed to optimise them since there seem to be bugs in the optimisation.
2017-04-04 11:23:46 +02:00
jack
0ad344f91d Merge pull request #1640 from Ultimaker/bugfix_CURA-3421_per_model_combobox
CURA-3421 Set SettingsComboBox value if we get undefined from resolve
2017-04-04 10:57:42 +02:00
Ghostkeeper
db4854702b
Add Japanese and Hangul to the language drop-down
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.

Contributes to issue CURA-3487.
2017-04-04 09:05:12 +02:00
Ghostkeeper
6a8bcd4da6
Add Japanese and Korean partial translations
Normally we don't allow partial translations in here, but this came from higher up: Ultimaker's distributors in Korea and Japan. We're making an exception for those.

Contributes to issue CURA-3487.
2017-04-04 09:05:12 +02:00
Ghostkeeper
a127d463bc
Add Japanese and Hangul to the language drop-down
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.

Contributes to issue CURA-3487.
2017-04-04 09:04:45 +02:00
Ghostkeeper
eab7741711
Add Japanese and Korean partial translations
Normally we don't allow partial translations in here, but this came from higher up: Ultimaker's distributors in Korea and Japan. We're making an exception for those.

Contributes to issue CURA-3487.
2017-04-04 09:02:53 +02:00
Jack Ha
a83b1dd638 Split ShapeArray from Arranger. CURA-3239 2017-04-03 14:48:31 +02:00
Ghostkeeper
2e790852ce
Merge branch '2.5' 2017-04-03 11:38:28 +02:00