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
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
Jack Ha
bf08d30e7d
Added first arrange function and smart placement after loading. CURA-3239
2017-03-28 14:27:22 +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 a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
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 a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
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
Jack Ha
bd10e50249
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-22 13:24:37 +01:00
Jack Ha
4eff58995d
Merge branch '2.5'
2017-03-22 13:24:32 +01:00
Jack Ha
79ea09d616
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-22 13:24:21 +01:00
Jack Ha
6dcd4d13e4
Removed quality profile aa0.8 PLA Not Supported. CURA-3555
2017-03-22 13:24:13 +01:00
Lipu Fei
f9e377ec43
Enable/disable Keep/Discard buttons according to selection
2017-03-22 13:07:58 +01:00
Lipu Fei
12918b02b5
CTRL-P only works when the button is enabled
...
CURA-3496
2017-03-22 12:01:41 +01:00
MaukCC
83f5619be0
Update cartesio.def.json
2017-03-22 09:45:41 +01:00
MaukCC
4e698cb685
Update cartesio.def.json
2017-03-22 09:45:23 +01:00
Jack Ha
8275c419c1
Merge branch '2.5'
2017-03-22 09:34:06 +01:00
Jack Ha
40a7d2fecc
Added not supported quality profiles. CURA-3555
2017-03-22 09:33:17 +01:00
Jaime van Kessel
f379791d70
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-21 14:43:58 +01:00
Jaime van Kessel
0752c4440c
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-21 14:43:30 +01:00
