Jaime van Kessel
22feb03d88
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-08-28 11:44:28 +02:00
Jaime van Kessel
8cbe802881
Added missing )
2015-08-28 11:44:19 +02:00
Tamara Hogenhout
bd5e85144c
Merging of mine and Jaimes work
2015-08-28 10:15:17 +02:00
Tim Kuipers
75cf4c922a
Merge branch 'master' of
...
https://github.com/Ultimaker/Cura
2015-08-28 09:20:56 +02:00
adamarumjahn
99ff043596
Update innovo-inventor.json
...
added manufacturer and author
2015-08-27 12:48:50 -05:00
adamarumjahn
34f474a82d
Update innovo-inventor.json
...
added Version
2015-08-27 12:47:38 -05:00
adamarumjahn
8033f7b8e5
Update innovo-inventor.json
...
Updated overrides and cleaned up machine settings.
2015-08-27 12:40:33 -05:00
Jaime van Kessel
ccd95c2ecf
Removed font from rectangle
2015-08-27 17:18:44 +02:00
Tim Kuipers
1b6cfc39c0
JSON: git diff! removed triangles and grid top/bottom skin options (though they are available)
2015-08-27 17:17:05 +02:00
Jaime van Kessel
74a1a5f6f1
Fixed merge issues
2015-08-27 16:09:42 +02:00
Jaime van Kessel
d195c859a2
Code style & switch to translation catalog
2015-08-27 16:04:02 +02:00
Tamara Hogenhout
3d5f4e6bd6
15.10 re-alignment of the toolbar
...
This is a test to be reviewed
Contributes to: issue CURA-60
2015-08-27 14:59:33 +02:00
Tamara Hogenhout
26c46eb56a
15.10 New Icons
...
Contributes to: issue CURA-60
2015-08-27 14:30:07 +02:00
Tamara Hogenhout
55f51a53b6
15.10 restyling of the savebutton Area
...
More elaborate shortdescription for especially the outputdevices still have to be implemented. And the filename textfield is not finished.
Contributes to: issue CURA-60
2015-08-27 14:29:44 +02:00
Jaime van Kessel
f17cc811c4
Added message asking about sending data to server
2015-08-27 13:24:37 +02:00
Arjen Hiemstra
712ec6acdf
Fix normal profile and add a very basic High Quality profile
2015-08-27 09:36:52 +02:00
Arjen Hiemstra
e6e563cf09
Use the profile for getting setting values, not the machine instance
2015-08-27 09:36:09 +02:00
Arjen Hiemstra
4d4192d6d6
Ignore some active machine changes since we need to port code
2015-08-27 09:35:05 +02:00
Arjen Hiemstra
5637c9ad94
Remove active machine preference from CuraApplication, it is now handled by MachineManager
2015-08-27 09:34:22 +02:00
Arjen Hiemstra
5ee587a745
Options property should now be a key - value dict
2015-08-27 09:33:07 +02:00
adamarumjahn
2eb21e1d37
Create innovo-inventor.json
...
This is a custom machine profile for the Innovo Inventor.
2015-08-26 15:55:48 -05:00
Jaime van Kessel
af18019ce0
Added exception handling for checking overlap.
...
Fixes Ultimaker/Cura#297
2015-08-26 16:08:00 +02:00
Jaime van Kessel
4fb577b893
Fixed default button for general and view page
...
contributes to Ultimaker/Cura#245
2015-08-26 15:49:53 +02:00
Jaime van Kessel
87364f37a6
Fixed double ID in qml
2015-08-26 15:37:10 +02:00
Jaime van Kessel
fdd8a7bb6c
Removed unused import
2015-08-26 15:30:26 +02:00
Jaime van Kessel
c300b4d95a
Rephrased description of cool_min_layer_time_fan_speed_max
...
Fixes Ultimaker/Cura#263
2015-08-26 15:27:49 +02:00
Jaime van Kessel
a8afb9045f
Disabled bounding box intersection for physics
...
Fixes Ultimaker/Cura#294
2015-08-26 15:24:10 +02:00
Jaime van Kessel
a49ce21fbe
Adding a machine now hides if there are no more pages
2015-08-26 15:18:01 +02:00
Jaime van Kessel
97f80914c5
Fixed slice settings sender
2015-08-26 15:09:53 +02:00
Jaime van Kessel
0b6a0f7bd1
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-08-26 12:24:34 +02:00
Jaime van Kessel
721dd8e2d8
Fixed ported urllib code from old cura
2015-08-26 12:24:17 +02:00
Arjen Hiemstra
9a88176f6f
Clean up Add Machine Wizard and use the new MachineDefintionsModel
2015-08-25 18:14:48 +02:00
Arjen Hiemstra
b9a306865e
Add some data about wizard pages to ultimaker_original_plus JSON file
2015-08-25 18:13:09 +02:00
Arjen Hiemstra
cbd685596e
Add metadata to dual_extrusion_printer file
2015-08-25 18:12:40 +02:00
Arjen Hiemstra
1fc4d28864
Use firstRun property for the Add machine wizard
2015-08-25 18:12:24 +02:00
Arjen Hiemstra
17d3033b9a
Move new JSON files to the right location
2015-08-25 18:11:49 +02:00
Jaime van Kessel
3fddd262d5
Merge pull request #292 from bq/BQ_profiles_update
...
BQ profiles update
2015-08-25 17:03:20 +02:00
Tim Kuipers
4eb37a1cc9
JSON: feat: infill before walls
2015-08-25 16:18:12 +02:00
Jaime van Kessel
529617bc06
Removed state check that broke connection for printrbot
2015-08-25 14:44:50 +02:00
Tim Kuipers
222eabed8b
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-08-25 14:35:59 +02:00
Jaime van Kessel
f92b4d72c7
Added getPrintInformation to curaApp
2015-08-25 14:16:35 +02:00
Jaime van Kessel
dafe0c8b0d
Added sliceInfo
2015-08-25 13:34:51 +02:00
Jaime van Kessel
9b6ed1f0ee
Added self to output device signals
2015-08-25 13:34:25 +02:00
Tim Kuipers
c83ef32c17
changed support roof defaults (now concentric)
2015-08-25 13:30:28 +02:00
Tim Kuipers
34eb78cbaa
JSON: made every fill option available for all fill types (skin, support, infill)
2015-08-25 13:10:14 +02:00
Tamara Hogenhout
534c277b00
15.10 restyling of the layerview slider
...
Adds a textfield to the handle for per layer selection and removes the display of the min- and maxvalue
Contributes to: issue CURA-60
2015-08-25 12:20:13 +02:00
Jaime van Kessel
86b6f60809
Added status events to usb printer
2015-08-25 11:36:44 +02:00
Jaime van Kessel
bbebeeb66d
Added sliceInfo plugin stub
2015-08-25 11:34:33 +02:00
Tim Kuipers
ed60c3c929
JSON: support hammock density and pattern
2015-08-25 10:05:47 +02:00
Tim Kuipers
289f9df67e
moved infill_pattern outside density ; made retraction visible by default
2015-08-25 09:19:30 +02:00
