3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-02-14 04:39:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
7663 commits 364 branches 332 tags 724 MiB
Commit graph

3281 commits

Author SHA1 Message Date
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
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
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
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
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 b67b41653f.

Contributes to issue CURA-3487.
 2017-03-29 09:31:01 +02:00
Lipu Fei
208935960f Add comments for putting open file logic in qml 
CURA-3495
 2017-03-28 15:02:50 +02:00
Lipu Fei
e4af8e36bb Fix dialog text for opening multiple files with project(s) 
CURA-3495
 2017-03-28 14:38:26 +02:00
Lipu Fei
1fc7120fff Fix dialog text "file(s)" -> "files" 
CURA-3495
 2017-03-28 14:27:40 +02:00
Lipu Fei
5bec46a29c Drag-and-drop files behave the same as open file menu 
CURA-3495
 2017-03-28 14:27:40 +02:00
Tim Kuipers
7a67ab4e66 Merge branch '2.5' 2017-03-28 12:55:18 +02:00
Tim Kuipers
db2766aba1 fix: move prime positions to the sides (CURA-3605) 2017-03-28 12:53:46 +02:00
Jaime van Kessel
6367755875 Disabled center_on_select for windows, as pyqt has a bug with it 2017-03-28 10:21:52 +02:00
Ghostkeeper
2810054f8e
Fix spelling of maximum skin angle expansion description 2017-03-27 16:00:09 +02:00
Lipu Fei
50266f760b
Revert "Prevent MachineSettings dialog go beyond the top of screen" 
This reverts commit a0f841e8eb.
 2017-03-27 16:00:08 +02:00
Jack Ha
efa1513e4c
Changed all Not Supported Draft quality profiles to Not Supported Superdraft to prevent double Not Supported entries. CURA-3555 2017-03-27 16:00:08 +02:00
Ghostkeeper
b67b41653f
Fix spelling of maximum skin angle expansion description 2017-03-27 15:59:27 +02:00
Jaime van Kessel
88704051d1 Filter bar is now always visible 
CURA-3574
 2017-03-27 15:47:30 +02:00
Lipu Fei
6644a4d386 Revert "Prevent MachineSettings dialog go beyond the top of screen" 
This reverts commit a0f841e8eb.
 2017-03-27 11:09:40 +02:00
Jack Ha
088202c366 Changed all Not Supported Draft quality profiles to Not Supported Superdraft to prevent double Not Supported entries. CURA-3555 2017-03-27 10:30:51 +02:00
Jaime van Kessel
dafeab4e8a Merge branch 'feature_CURA-3495_open_menu' of github.com:Ultimaker/Cura 2017-03-24 11:52:26 +01:00
Jaime van Kessel
298fa52da5 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-24 11:51:16 +01:00
fieldOfView
33f20710d9 Ups the limit of the maximum cost of a spool of filament 
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.

Fixes https://github.com/Ultimaker/Cura/issues/1567
 2017-03-24 11:23:40 +01:00
Ghostkeeper
e76c3f72e7
Lower QtQuick requirement further to 2.2 
2.2 is required for the modifications we make to the Button objects.
 2017-03-24 10:49:46 +01:00
Lipu Fei
578f72c91e Use "False" instead "false" in cfg files 
CURA-3555
 2017-03-24 10:44:44 +01:00
Lipu Fei
7ad5a64b91 Add msg dialog for ignoring gcode in multiple file selection 
CURA-3495
 2017-03-24 09:53:12 +01:00
fieldOfView
6474f3eb25 Ups the limit of the maximum cost of a spool of filament 
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.

Fixes https://github.com/Ultimaker/Cura/issues/1567
 2017-03-24 09:12:48 +01:00
Jaime van Kessel
8023341090 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-23 15:15:08 +01:00
Lipu Fei
a0f841e8eb Prevent MachineSettings dialog go beyond the top of screen 2017-03-23 13:46:01 +01:00
Lipu Fei
08f6ee319e Use default font for open file dialog text 
CURA-3495
 2017-03-23 08:46:48 +01:00
Lipu Fei
ef0a502dcf Add { } around statements in "if" 
Make nitpicking people happy :P
 2017-03-22 21:05:45 +01:00
Lipu Fei
fa7dc3a708 Use onActivated for profile override combobox 2017-03-22 16:01:50 +01:00
Jack Ha
33d16f8601 Added Not Supported profiles when second extruder is a 0.8 nozzle. CURA-3555 2017-03-22 14:51:53 +01:00