GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-21 13:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,324 Commits 287 Branches 260 Tags
Commit Graph

2324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas-Karl Pietrowski
a8e13f13ba Add missing import of 'os' 2016-04-19 18:56:58 +02:00
Thomas-Karl Pietrowski
e7e1dab53d Merge remote-tracking branch 'upstream/master' into pythonpath-fix-reworked 2016-04-19 18:54:27 +02:00
Arjen Hiemstra
c2ac0e8217 Fix resource paths after Uranium API change 
Contributes to CURA-1390
 2016-04-19 18:11:11 +02:00
Tim Kuipers
3e94c37f57 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-19 17:39:46 +02:00
Tim Kuipers
e7e4512fd0 JSON: fix: moved line distance computation from engine to frontend (CURA-1317) 2016-04-19 17:39:30 +02:00
Arjen Hiemstra
c329c2e12d Do not try to recreate the socket when we are shutting down anyway 
This prevents issues where closing the socket triggers socket creation
and then a deadlock occurs.

Contributes to CURA-1391
 2016-04-19 16:52:22 +02:00
Youness Alaoui
df8207747a Force PYTHONPATH to be in the top of the sys.path list. 
This fixes https://github.com/Ultimaker/Cura/issues/704
 2016-04-18 14:42:29 -04:00
fieldOfView
919e2f55e9 Replace "notice" icon with an icon that is less jarring and differs more in shape with the "reset" icon 
Contributes to CURA-1176
 2016-04-18 17:39:28 +02:00
Tim Kuipers
083c6dc630 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-18 16:49:12 +02:00
Tim Kuipers
1ffcb8419a JSON: Enable Combing ==> Combing Mode (CURA-694) 2016-04-18 16:49:02 +02:00
Jaime van Kessel
71b4c983d0 Merge pull request #700 from thopiekar/master-bq_hephestos2-firmware 
USBPrinting: Adding entry for BQ Hephestos 2 firmware
 2016-04-18 15:21:49 +02:00
Jaime van Kessel
8a94739de0 Raft line widths now inherit from line_width 
CURA-695
 2016-04-15 16:08:23 +02:00
Jaime van Kessel
ef9be8a2d8 Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-04-15 14:56:24 +02:00
Jaime van Kessel
d606d6dfe4 Merge pull request #701 from THeijmans/2.1 
UM2+ profile improvements
 2016-04-15 14:43:06 +02:00
Tom Heijmans
7ce5c6c6bc Fixed inheritance issues 2016-04-15 14:36:13 +02:00
Tom Heijmans
00305f1c53 Updated inheritance functions for um2+ 2016-04-15 13:35:25 +02:00
Tom Heijmans
3776d3c6d2 Updated material & UM2+ profiles 2016-04-15 13:33:30 +02:00
Thomas-Karl Pietrowski
efb5c668fe USBPrinting: Adding entry for BQ Hephestos 2 firmware 2016-04-14 17:13:29 +02:00
Tim Kuipers
77e719619d JSON fix: indentation only (CURA-1400) 2016-04-14 14:02:26 +02:00
Tim Kuipers
cd7513971b JSON fix: support&platform extruder nr not children of extruder nr (CURA-1400) 2016-04-14 14:01:56 +02:00
Tim Kuipers
7ea02f9d98 JSON fix: Infill Overlap mm didn't default to 0 when infill was too dense (CURA-786) 2016-04-14 13:50:40 +02:00
Tim Kuipers
f426ba3168 changed infill overlap min_value to min_value_warning and made it -50% (CURA-786) 
-50% corresponds to the value where the hole in the nozzle just at the boundary of the inner wall
 2016-04-14 13:33:00 +02:00
Tim Kuipers
401e020f9c machine extruder trains now can't be an array anymore (CURA-494) 2016-04-14 13:18:40 +02:00
fieldOfView
50c2760af1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-14 12:29:50 +02:00
fieldOfView
003f973ba4 Prevent profiles being added if there is no active machine 2016-04-14 12:29:28 +02:00
Arjen Hiemstra
e5cc84cb3e Handle negative layers in the Layer view 
Offset all layers by the minimum layer count. This makes raft just a
minor special case when processing layers instead of needing to adjust
everything.

Contributes to CURA-653
 2016-04-14 12:17:40 +02:00
fieldOfView
2afea115da Fix width of troubleshooting guide link in Simple mode sidebar 2016-04-14 11:56:36 +02:00
fieldOfView
5c723cc9d6 Fix string comparison in fdmprinter.json 
CURA-1394
 2016-04-14 11:49:46 +02:00
Ghostkeeper
6223c0e2e9 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-13 16:23:27 +02:00
Ghostkeeper
7435010dd4
Code style: No whitespace at end of line 
Contributes to issue CURA-494.
 2016-04-13 15:59:48 +02:00
Ghostkeeper
f222c870f1
Codestyle: No whitespace at end of line 
Contributes to issue CURA-494.
 2016-04-13 15:56:56 +02:00
Arjen Hiemstra
9b88f06970 Merge branch '2.1' 2016-04-13 13:53:51 +02:00
Tim Kuipers
cdd2466bec Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-13 09:57:30 +02:00
Tim Kuipers
592d98d4fd JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694) 2016-04-13 09:56:34 +02:00
Tim Kuipers
cc06c632a1 JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694) 2016-04-13 09:50:51 +02:00
fieldOfView
3ad65e315f Terminate CuraEngine if it is still running when Cura is closed 
CURA-1388
 2016-04-12 18:05:33 +02:00
Ghostkeeper
ea6a4d5f27
../resources/i18n/nl/fdmprinter.json.po 2.1.0 2016-04-12 17:39:03 +02:00
fieldOfView
db7777a6e7 Move Rotation "tooltip" out of cura.qml and make it useful for other tools as well 
Tool hint is now a child of Toolbar.qml, where it fits with the tools for which it is useful.

CURA-1014
 2016-04-12 17:09:32 +02:00
Ghostkeeper
7cc31c3d2e Update translations 
Updates the translations with the updated strings. Made by Bothof.

Contributes to issue CURA-1190.
 2016-04-12 16:34:45 +02:00
Arjen Hiemstra
4253a3f9ef Round convex hull data to 0.1mm, then remove duplicates 
This greatly reduces convex hull complexity while at the same
time not introducing much error into the convex hull. This keeps
things responsive when dealing with more complex models.

Contributes to CURA-1387
 2016-04-12 15:40:10 +02:00
fieldOfView
6e1265a822 Add width, height in addition to minimumWidth, minumumHeight to fix retina issue on OSX 
Without these additions, windows (preferences, wizards, about) open larger than fullscreen, making some controls inaccessible

Fixes CURA-504
 2016-04-12 10:23:43 +02:00
fieldOfView
967c062357 Fix import error starting up with an empty profile 
CURA-1376
 2016-04-12 07:41:42 +02:00
fieldOfView
a862f29794 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-11 20:59:45 +02:00
fieldOfView
0259457d2e Prevent overly long names for printers and profiles 
Contributes to CURA-1342
 2016-04-11 20:58:53 +02:00
Tim Kuipers
a57125292d JSON fix: syntax mistake 2016-04-11 19:10:16 +02:00
Tim Kuipers
3c919e9652 Revert "JSOn/profiles: changed infill overlap to mm (CURA-786)" 
This reverts commit 24f1726585781b74838952691c98973c4bf6fb16.
 2016-04-11 19:04:36 +02:00
Tim Kuipers
59f5bcb1cd feat: infill overlap in mm (besides %) (CURA-786) 2016-04-11 18:57:37 +02:00
Tim Kuipers
de64e812ff removed old duplicate profiles introduced by rename and merge (CURA-1349) 2016-04-11 18:51:06 +02:00
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
Arjen Hiemstra
d5bf9b3733 Merge branch '2.1' 
* 2.1:
  Do not round convex hull points to nearest int
  Use fdmprinter.json If we have no active machine instead of returning None
  JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374)
 2016-04-11 15:40:36 +02:00