Commit graph

1428 commits

Author SHA1 Message Date
Jaime van Kessel
51b9ac78bd Added speed of light as max value for speed
CURA-1252
2016-03-25 15:18:18 +01:00
Jaime van Kessel
89162e3286 Fixed crash caused by circular dependency 2016-03-25 14:08:50 +01:00
Jaime van Kessel
637f793f48 Simplified some of the inheritance functions 2016-03-25 14:03:49 +01:00
Jaime van Kessel
918d8005bc Removing unneeded overwritten settings 2016-03-25 13:59:43 +01:00
Tim Kuipers
355f5210c9 JSON: travel_avoid_distance should default to nozzle_outer radius, not diameter (CURA-1195) 2016-03-24 17:29:46 +01:00
Tim Kuipers
11a65e249d JSON: changed description and name of cooling settings (CURA-863) 2016-03-24 15:55:20 +01:00
Tim Kuipers
90e81de8cd JSON: fixed gantry heights of Olsson block machines to match difference with UM2 nozzle (CURA-1281) 2016-03-24 14:19:53 +01:00
Tim Kuipers
1f38402645 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-24 14:11:21 +01:00
Tim Kuipers
178943aa59 JSON: introduce machine_heat_zone_length for Olsson block based on guessing (CURA-1281)
The heat zone length is only used in dual extrusion settings, which are unavailable for UM2+ and UM2 with olsson block
2016-03-24 14:11:10 +01:00
Tim Kuipers
78e844ef18 JSON: made UM2E_olsson inherit from UM2_olsson (CURA-1281) 2016-03-24 14:08:58 +01:00
Jaime van Kessel
2cda0283c7 Increased width of sidebar a bit to improve readability for other languages
CURA-1268
2016-03-24 14:00:23 +01:00
Tim Kuipers
7edb9ab3a0 JSON: introduce basic Olsson nozzle stats (CURA-1281) 2016-03-24 13:54:17 +01:00
Tim Kuipers
1f4763fca2 JSON: edit machine height based on longer olsson nozzle (CURA-1281) 2016-03-24 13:53:22 +01:00
Tim Kuipers
2e7d370497 JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
Tim Kuipers
69fab0489d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 18:43:28 +01:00
Tim Kuipers
6e7be5995c profiles: got print speed from old cura (CURA-1195) 2016-03-23 18:26:03 +01:00
Tim Kuipers
978cf3e824 JSON fix: removed inherit cause it already had an inherit_function (CURA-1195) 2016-03-23 18:19:50 +01:00
Tim Kuipers
47b04efcfe profiles fixes: removed double settings, introduced missing ones (CURA-1195)
I've made it such that all ABS and CPE profiles contain the same settings and also all PLA profiles contain the same settings. This is to verify that no settings have been overlooked.
2016-03-23 18:09:59 +01:00
Tim Kuipers
2539042858 profiles: did all profiles ABS and CPE with Paul by hand (CURA-1195)
also reordered settings to match Pauls sheet
2016-03-23 17:43:09 +01:00
Ghostkeeper
81fe0ab958 Update translation templates
Includes the new strings after string freeze.

Contributes to issue CURA-1190.
2016-03-23 16:45:41 +01:00
Tim Kuipers
f7c842dabe JSON fix: default retraction amount on UM2+ is 6mm (CURA-1195) 2016-03-23 14:02:10 +01:00
Tim Kuipers
fd27fcb52d profiles: removed superfluous/outdated infill_wipe_dist (CURA-1195) 2016-03-23 13:50:34 +01:00
Tim Kuipers
a7aafe958b profiles: removed superfluous speed_slowdown_layers (CURA-1195) 2016-03-23 13:49:08 +01:00
Tim Kuipers
fc974c25c2 profiles: removed superfluous/outdated travel_avoid_distance (CURA-1195) 2016-03-23 13:47:12 +01:00
Tim Kuipers
12349d1228 profiles: removed superfluous/outdated retraction_min_travel (CURA-1195) 2016-03-23 13:45:38 +01:00
Tim Kuipers
40adb5b7e3 profiles: removed superfluous/outdated retraction_count_max (CURA-1195) 2016-03-23 13:42:19 +01:00
Tim Kuipers
6a150b3b7d profiles: removed superfluous cool_fan_full=2 (CURA-1195) 2016-03-23 13:28:27 +01:00
Tim Kuipers
5037fab1b3 JSON: fixed defaults which should hold for all machines (CURA-1195) 2016-03-23 13:26:51 +01:00
Tim Kuipers
8eb4007334 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 12:40:56 +01:00
Tim Kuipers
feb1ed4c2e JSON fix: handle fuzzy skin min/max (CURA-1225) 2016-03-23 12:40:46 +01:00
Ghostkeeper
be57fa03d2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 12:14:53 +01:00
Ghostkeeper
71721811f5
Rename Shell Speed to Wall Speed
It only applies to the walls, not the skin, after all.

Contributes to issue CURA-1183.
2016-03-23 12:14:16 +01:00
Jaime van Kessel
5b04787106 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 12:04:19 +01:00
Jaime van Kessel
db628760d8 Comment in start g-code for umo now has correct value 2016-03-23 12:04:08 +01:00
fieldOfView
fd29baccd4 Fix backplate texture of UM2Ex with Olsson block
CURA-1239
2016-03-22 22:53:15 +01:00
Ghostkeeper
4725b1b074
Rename 'Other Wall' to 'Inner Wall'
This is both more correct and more consistent with the descriptions.

Contributes to issue CURA-1212.
2016-03-22 18:00:46 +01:00
fieldOfView
c37c63fa89 Add tooltip to "customised values" indicator
CURA-909
2016-03-22 17:24:35 +01:00
Ghostkeeper
94b8ff7492
Add period at the end
The English translation had properly a period at the end of this sentence. German must too, for consistency.

Contributes to issue CURA-1190.
2016-03-22 15:06:13 +01:00
Ghostkeeper
6525e4637e Fix some of the translations
In particular, I removed some fuzziness and uncommented some outcommented translations.

Contributes to issue CURA-1190.
2016-03-22 13:04:17 +01:00
fieldOfView
6b2b948623 Prevent qml errors when adding/deleting profiles
CURA-855
2016-03-21 16:28:58 +01:00
Tim Kuipers
ec06226907 quickfix for fan full at height 2016-03-21 14:16:37 +01:00
fieldOfView
2e5868cb82 Removed separators from profilesmodel
Profile menu now inserts separators in QML
CURA-855
2016-03-21 13:47:14 +01:00
Jaime van Kessel
235f324d56 Added missing enabled parameters 2016-03-21 11:12:00 +01:00
Ghostkeeper
e5a5cffe7d
Remove unnecessary parameter to JS toString
This parameter has no effect.

Contributes to issue CURA-1110.
2016-03-18 15:59:05 +01:00
Jaime van Kessel
bb220ed952 Removing min warning from support_tower_diameter
The min warning caused an infinite recursion when support was
enabled / disabled

CURA-1156
2016-03-18 15:52:56 +01:00
Jaime van Kessel
43d13096a1 Added decodeURIComponent to mesh names
Fixes CURA-1110
2016-03-18 14:56:35 +01:00
Jaime van Kessel
834e2148d2 Major cleanup for profiles
This removes a bunch of settings that override default values from machine defaults (or inheritance)
2016-03-18 14:18:19 +01:00
fieldOfView
1583018e75 Clean up theme: tweak colors, remove unused styles
Contributes to CURA-1143
2016-03-17 21:09:18 +01:00
fieldOfView
476ab9226d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-17 16:29:37 +01:00
fieldOfView
745bc8051a Fix generic material profiles
Makes sure that the generic PLA material profile has all the same settings as the ABS and CPE settings, so a printer that uses the non-printer-specific material profiles can switch back to the proper settings for PLA when they are merged into the current settings.

CURA-1188
2016-03-17 16:29:19 +01:00