1039 Commits

Author SHA1 Message Date
Tamara Hogenhout
096065a441 changes some word-usage and the use of capital letters
Contributes to: issue CURA-129
2015-09-10 14:23:47 +02:00
Jaime van Kessel
00cdafc50a Added new features to changelogplugin list 2015-09-10 11:50:50 +02:00
Jaime van Kessel
f272820100 Fixed paths for firmware 2015-09-10 11:24:47 +02:00
Jaime van Kessel
a0a0f3ea01 Added exception handling to layerview
Fixes Ultimaker/Cura#362
2015-09-10 11:16:55 +02:00
Jaime van Kessel
9c873c7d34 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-10 11:07:41 +02:00
Jaime van Kessel
ade65870c6 Scale is now taken into account for merging.
Fixes Ultimaker/Cura#359
2015-09-10 11:07:03 +02:00
Tim Kuipers
e78ea4b916 JSON: rename hammock to support roof 2015-09-10 11:02:34 +02:00
Tim Kuipers
eacc3ac58f JSON: bugfix: faulty description 2015-09-10 10:09:00 +02:00
Tim Kuipers
d1a87f6add Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-09 17:05:22 +02:00
Tim Kuipers
7e01273d87 JSON: bugfix: skin_no_small_gaps_heuristic interpreted the wrong way around 2015-09-09 17:05:11 +02:00
Tamara Hogenhout
ae2a07ca06 re-implements the safebutton -> filename -> textfield
Not yet fully functional but re-implemented for stringfreeze

Contributes to: issue CURA-125
2015-09-09 16:40:01 +02:00
Tamara Hogenhout
032b6e4000 Just a little cleanup related to the translations
Contributes to: issue CURA-116
2015-09-09 15:50:28 +02:00
Tamara Hogenhout
dd0fc78e77 adds text as a 'Toggle Full Screen' menu item
Contributes to: issue CURA-125
2015-09-09 15:47:34 +02:00
Tamara Hogenhout
776683219d Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-09 15:25:59 +02:00
Tamara Hogenhout
ef93524d78 adds/adapts translation context markers
last nesscessary changes for internationalisation -> Cura

Contributes to: issue CURA-116
2015-09-09 15:25:39 +02:00
Tim Kuipers
42d8f38cf8 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-09 13:48:25 +02:00
Tim Kuipers
1401265fc1 JSON bugfix: default support roof pattern 2015-09-09 13:48:15 +02:00
Jaime van Kessel
98ee8cab85 Pages are now reset when adding a new machine.
Contributes to Ultimaker/Cura#353
2015-09-09 13:16:24 +02:00
Jaime van Kessel
926ac69c71 Added close button to changelog
Fixes Ultimaker/Cura#350
2015-09-09 09:54:53 +02:00
Jaime van Kessel
e2fe27e534 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-09 09:50:35 +02:00
Jaime van Kessel
f1417858c1 Merged objects are no longer moved on platform plate
Fixes Ultimaker/Cura#354
2015-09-09 09:49:53 +02:00
Arjen Hiemstra
09cf161b59 Bump application version 2015-09-08 17:42:36 +02:00
Arjen Hiemstra
e40c785d86 Use the right values when sending profile overrides
Contributes to #325
2015-09-08 17:41:46 +02:00
Arjen Hiemstra
566db2cb76 Add theme items for per-object settings
Contributes to #325
2015-09-08 17:41:46 +02:00
Arjen Hiemstra
0d0a823b54 Fix plus icon to not have black background
Contributes to #325
2015-09-08 17:41:46 +02:00
Tamara Hogenhout
34c252b2db Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-08 16:30:38 +02:00
Tamara Hogenhout
28aec71c02 adds/adapts translation context markers
all nescessary in folder: Cura/resources

Contributes to: issue CURA-116
2015-09-08 16:30:10 +02:00
Tim Kuipers
99deac2870 bugfixes for skin extrusion width; feature: toggle skin_no_small_gaps_heuristic 2015-09-08 16:25:38 +02:00
Jaime van Kessel
77bda1a7b1 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-08 15:31:36 +02:00
Jaime van Kessel
dd0c6f9f41 Extentions with no options are no longer shown
Fixes CURA-118
2015-09-08 15:31:10 +02:00
Tamara Hogenhout
4a9bf2b4d6 adds/adapts translation context markers
all nescessary in folder: Cura/plugins

Contributes to: issue CURA-116
2015-09-08 15:26:49 +02:00
Tamara Hogenhout
79f69f30f5 adds/adapts translation context markers
minor change

Contributes to: issue CURA-116
2015-09-08 15:26:06 +02:00
Tamara Hogenhout
6c7536a167 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-08 13:35:12 +02:00
Tamara Hogenhout
ff855ccf1b adds/adapts translation context markers
all nescessary in folder: Cura/cura

Contributes to: issue CURA-116
2015-09-08 13:34:35 +02:00
Jaime van Kessel
07031b6b65 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-08 13:31:26 +02:00
Jaime van Kessel
dfe4b348b4 Fixed push free for one at a time 2015-09-08 13:31:16 +02:00
Tamara Hogenhout
e8c796ee24 adds/adapts translation context markers
all nescessary in folder: Cura/cura

Contributes to: issue CURA-116
2015-09-08 12:29:05 +02:00
Jaime van Kessel
f3eefd7be1 Delete all now correctly handles grouped objects
fixes CURA-111
2015-09-08 11:56:05 +02:00
Jaime van Kessel
56e8b01f22 Fixed resetting to center of groups
Fixes #CURA-112
2015-09-08 11:48:08 +02:00
Jaime van Kessel
ee513b0b83 Fixed resetting transformation / position of groups.
Contributes to #CURA-112
2015-09-08 11:34:05 +02:00
Jaime van Kessel
f1efcea088 Added missing checks 2015-09-08 09:46:38 +02:00
Jaime van Kessel
995c077627 Fixed wrong saving of preferences.
Fixes #Cura-110
2015-09-08 09:30:45 +02:00
Jaime van Kessel
0530f107c7 Fixed qml undefined errors 2015-09-07 15:17:15 +02:00
Jaime van Kessel
a5720adb66 State is now only changed when its different
Fixes Ultimaker/Cura#327
2015-09-07 14:44:57 +02:00
Jaime van Kessel
7d954c18c5 Made print window non blocking modal
Fixes Ultimaker/Cura#332
2015-09-07 14:03:56 +02:00
Jaime van Kessel
9cf383aa7c Force changelog to load with utf-8
Fixes ultimaker/cura#335
2015-09-07 13:51:16 +02:00
Jaime van Kessel
50f557f5a8 Updated warnings & errors for fdm printer 2015-09-07 13:38:03 +02:00
Jaime van Kessel
955fe0034f Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-07 10:01:40 +02:00
Jaime van Kessel
0c6b57f897 Fixed wrong error state of infill_sparse_density 2015-09-07 10:01:29 +02:00
Jaime van Kessel
509bcd90e0 Merge pull request #334 from fieldOfView/fix_umo_standardoptions
Change the default UMO uprade options
2015-09-04 23:04:09 +02:00