3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
2276 commits 307 branches 272 tags 787 MiB
Commit graph

320 commits

Author SHA1 Message Date
Tim Kuipers
a144a51da4 Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura 
This is a manual merge. I did a checkout on specific files from another branch

That branch branched from 2.1 and I cherry-picked all commits which were on master but not on 2.1 manually by reviewing each of them

This way of merging bypasses all problems we had with the standard merges from 2.1 into master

CURA-1349
 2016-04-11 18:50:41 +02:00
Simon Edwards
8fad56c1f4 Revert a number of Settings names changes after code review. 
CURA-1177
 2016-04-11 11:13:20 +02:00
Jaime van Kessel
14edc8aac8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-08 15:07:46 +02:00
Jaime van Kessel
dc1630c268 Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-04-08 15:02:30 +02:00
Tim Kuipers
2ccdf674c8 JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374) 2016-04-08 14:34:36 +02:00
Jaime van Kessel
c176c608d7 Added extra mm to UM2+ lower right disallowed area 
CURA-1166
 2016-04-06 17:23:11 +02:00
Ghostkeeper
db173f1347 Add more speed limits 
Can't have our users breaking the laws of physics.
 2016-04-06 13:58:56 +02:00
Simon Edwards
a15d864f0f Updated the Surface Mode description 
Fixes CURA-850
 2016-04-06 13:56:23 +02:00
Simon Edwards
3fa19e576b Fixed a few minor english errors in the settings names. 2016-04-06 11:47:02 +02:00
Simon Edwards
0187224137 Settings names are now meaningful outside their place/category in the sidebar. 
Fixes CURA-1177
 2016-04-06 11:46:53 +02:00
Jaime van Kessel
6a4b83b54b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-04-05 10:28:29 +02:00
fieldOfView
b3b04ff7b0 Removed Olsson block upgrade option from UM2Extended 2016-04-05 09:59:02 +02:00
fieldOfView
78038e90b8 Removed Olsson block upgrade option from UM2Extended 2016-04-05 09:52:33 +02:00
Ghostkeeper
7a217130a7
Fix profiles and FDMprinter after merge 
Merge didn't go too well.

Contributes to issue CURA-1235.
 2016-04-05 09:49:44 +02:00
Ghostkeeper
0684cee681 Merge branch '2.1' 
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
 2016-04-04 18:49:09 +02:00
Tim Kuipers
efdd92d358 JSON: fix: hide alternate skin rotation when skin pattern is concentric (CURA-1235) 2016-04-04 14:27:19 +02:00
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