GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 18:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,072 Commits 295 Branches 267 Tags
Commit Graph

261 Commits

Author SHA1 Message Date
Jaime van Kessel
bfba095655 Updated disallowed areas for um2 & um2+ 
CURA-1166
 2016-04-04 14:13:18 +02:00
Jaime van Kessel
c1e0b38b8e Moved multiple settings (draft shield, coasting, conical support, etc) into experimental 
CURA-1267
 2016-04-04 13:42:15 +02:00
Jaime van Kessel
9fce463153 Removed olson block as upgrade from UM2 
Fixes CURA-1280
 2016-04-04 13:34:43 +02:00
Jaime van Kessel
2b8914ea46 Removed duplicate settings from machine profiles 
CURA-1166
 2016-04-01 16:39:32 +02:00
Ghostkeeper
fd75276ed8
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 
Conflicts:
	resources/machines/fdmprinter.json
 2016-03-31 18:42:03 +02:00
Ghostkeeper
2d86606b5a
Use double quotes for string 
Contributes to issue CURA-1309.
 2016-03-31 18:31:04 +02:00
Ghostkeeper
53018b49a4
Restore Extra Skin Wall Count description 
Contributes to issue CURA-1309.
 2016-03-31 18:26:20 +02:00
Ghostkeeper
b2042b84f9
Capitalise all setting labels 
Contributes to issue CURA-1309.
 2016-03-31 18:11:59 +02:00
Ghostkeeper
5387699174
American spelling 
Contributes to issue CURA-1309.
 2016-03-31 18:04:26 +02:00
Ghostkeeper
b11051b281 Improve language construction 
Contributes to issue CURA-1309.
 2016-03-31 17:56:00 +02:00
Ghostkeeper
3a7a1a4baa
Remove superfluous spaces 
Contributes to issue CURA-1309.
 2016-03-31 17:47:15 +02:00
Tim Kuipers
d237148441 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 16:51:26 +02:00
Tim Kuipers
29de13a661 JSON: removed setting description override (CURA-1309) 
Proposed by Jeroen and backed by Tim. The new global description precludes everything said in the override description already now
 2016-03-31 16:51:06 +02:00
Jaime van Kessel
926dc1a010 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 16:46:00 +02:00
Jaime van Kessel
6951b78ee0 Set magic_fuzzy_skin_thickness min value to 0.001 
CURA-1125
 2016-03-31 16:45:15 +02:00
Tim Kuipers
2290c8298d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 16:15:05 +02:00
Tim Kuipers
76bd1cc78c JSON: language fixes by Jeroen (CURA-1309) 2016-03-31 16:14:48 +02:00
Jaime van Kessel
f3d600b72e Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 13:51:19 +02:00
Jaime van Kessel
b7a465afd6 Added round to top/bottom layer calculation 
This is because 1.12 / 0.04 = 28.000000000000004 according to python.
The math.ceil then ensured that the result was 29 (instead of expected 28)
CURA-1140
 2016-03-31 13:50:04 +02:00
Tim Kuipers
9a780b56ef Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 12:51:26 +02:00
Tim Kuipers
b8dee1b166 JSON: max warning value draft shield height 2016-03-31 12:51:15 +02:00
Jaime van Kessel
effcbe5842 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 10:39:28 +02:00
Jaime van Kessel
82eda02d37 Created a new category (experimental) & moved a number of settings there 
CURA-1267
 2016-03-31 10:38:54 +02:00
Tim Kuipers
52d064d7ab JSON: bug fix last commit (CURA-1309) 2016-03-30 19:19:44 +02:00
Tim Kuipers
92cb16cf8c JSON: Connect zigzags was visibile with zigzags disabled (CURA-1309) 2016-03-30 19:15:51 +02:00
Tim Kuipers
4c47615145 JSON+profiles: removed shell thickness as a whole (CURA-1309) 2016-03-30 19:12:41 +02:00
Tim Kuipers
c8aa770fed JSON: language fixes by Tim (CURA-1309) 2016-03-30 19:00:59 +02:00
Tim Kuipers
3b7650729a JSON: changed order of settings (CURA-1309) 
Changes made by Jeroen
 2016-03-30 18:58:57 +02:00
Tim Kuipers
4501ec98b7 JSON: reintroduced moved skin_no_small_gaps_heuristic (CURA-1309) 
Changes made by Jeroen to setting which changed order
 2016-03-30 18:56:29 +02:00
Tim Kuipers
50aa14fc16 JSON: updated settings descriptions (CURA-1309) 
Changes made by Jeroen to settings which changed order
 2016-03-30 18:56:05 +02:00
Tim Kuipers
ffe1b4bc1e JSON: updated settings descriptions (CURA-1309) 
Changes made by Jeroen to settings which didn't change order
 2016-03-30 18:55:43 +02:00
Tim Kuipers
82d3c19fe1 JSON: fix min_value for magic_fuzzy_skin_point_density (CURA-1225) 
value is based on firmware flood limit based on baudrate
 2016-03-29 16:58:44 +02:00
Tim Kuipers
981e3f3851 JSON: fix: max_value for call_fan_speed_min (CURA-863) 2016-03-29 10:42:13 +02:00
Tim Kuipers
5bb63c5cfb Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-29 10:34:13 +02:00
Tim Kuipers
3a3c7fbbc8 JSON: updated Olsson block heat zone length (CURA-1281) 2016-03-29 10:31:33 +02:00
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
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
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
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
978cf3e824 JSON fix: removed inherit cause it already had an inherit_function (CURA-1195) 2016-03-23 18:19:50 +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
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