3322 Commits

Author SHA1 Message Date
fieldOfView
ae19a101fd Disable a number of features that are not compatible with SLA printing 2017-04-06 12:29:30 +02:00
fieldOfView
5d6d233ecc Add definition for Peopoly Moai SLA printer 2017-04-06 12:29:29 +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
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
Ghostkeeper
b0ecb3ecdf
Unoptimize CPE+, PC and TPU profiles
There have been some problems in the optimization of these profiles, so we undo this for now, preventing people from editing these materials and risking some warnings in Cura's interface, but providing the correct experience for people trying the new materials.
2017-04-03 11:37:48 +02:00
Lipu Fei
6153fd70a8 Set SettingsComboBox value if we get undefined from resolve
CURA-3421
2017-04-03 11:10:05 +02:00
Lipu Fei
f57e866119 Move custom functions into FileDialog
CURA-3495
2017-04-03 10:58:26 +02:00
Jack Ha
abb5d1e76e Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239 2017-04-03 10:40:04 +02:00
Ghostkeeper
1968f5e1e0
Disable bed temperature instead of making it invisible
The visible property doesn't exist any more in favour of the enabled property.
2017-04-03 10:34:34 +02:00
fieldOfView
fd09a1959b Simplify margins and make them DPI aware 2017-04-02 15:54:06 +02:00
fieldOfView
ed8954c1db Replace font.pixelSize with DPI-aware font.pointSize
This also uses the same pointSize as eg the PreferencesPage.qml uses
2017-04-02 15:31:35 +02:00
fieldOfView
2e1dd46ea4 Replace hardcoded color with system-theme color 2017-04-02 14:38:11 +02:00
fieldOfView
c3e19b5ecb Add missing import for Screen.devicePixelRatio to work 2017-04-02 14:36:40 +02:00
fieldOfView
d536bbd6b9 Fix Hi DPI issues with Workspace and Profile Changes dialogs 2017-04-02 12:38:41 +02:00
Ghostkeeper
dd2c25868b
Allow strings with actual text
Previously string fields would only accept numbers, which is ridiculous.
2017-03-30 20:57:23 +02:00
Jaime van Kessel
f82aecb7ca Refactoring; no longer use "Printer" to identify CuraApplication 2017-03-30 20:19:05 +02:00
Jack Ha
3135dc7d77 Solved MC 2017-03-30 16:20:08 +02:00
Ghostkeeper
1bc383b615
Update Russian translations for Cura 2.5.
These are provided to us by RaD: github.com/RaD

Contributes to issue CURA-3487.
2017-03-30 14:51:08 +02:00
Tim Kuipers
e4a1d4dce2 JSON fix: default mold width: 5mm (CURA-3512) 2017-03-30 11:17:52 +02:00
Tim Kuipers
a4272bf7be Merge branch 'master' into feature_mold 2017-03-30 11:16:27 +02:00
Ghostkeeper
6eeb61c6ff
Merge branch 'maukcc-master' 2017-03-29 13:26:14 +02:00
Ghostkeeper
23a09f7f3c
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2017-03-29 13:25:34 +02:00
jack
a8be748df7 Merge pull request #1599 from Ultimaker/feature_CURA-3495_open_menu
CURA-3495 Open project/files menu
2017-03-29 12:58:24 +02:00
Lipu Fei
e92c21af28 Remove FIXME
CURA-3495
2017-03-29 12:53:19 +02:00
Lipu Fei
42b8f06e99 Ignore gcode when selected multiple files
CURA-3495
2017-03-29 12:52:56 +02:00
Jack Ha
02bb575ced Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390 2017-03-29 10:56:36 +02:00
Ghostkeeper
6bf3d084b9
Update translation templates
These are generated from the state of the code at commit b67b41653fc7c24061103993016fb29b86a51488.

Contributes to issue CURA-3487.
2017-03-29 09:31:01 +02:00
Filip Goc
5cf2f9b021 add jellybox variants
there’s a one fan variant and a two fan variant. for now, both are only
0.4mm nozzle.
2017-03-28 12:58:22 -04:00
Filip Goc
a328261456 add jellybox specific profiles
pla and a few petg profiles to get started
2017-03-28 12:57:43 -04:00
Filip Goc
b0627159fa rename jellybox platform mesh
jellybox_platform -> imade3d_jellybox_platform
2017-03-28 12:57:03 -04:00
Filip Goc
0d4a74182b update and rename jellybox definition
- jellybox -> imade3d jellybox
- includes variants
2017-03-28 12:56:19 -04:00