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

23916 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
6cc8b8c184 Add tests for _renameNodes function 
CURA-6283
 2019-05-24 14:59:35 +02:00
Jaime van Kessel
d1f6ac47f3 Add tests for ObjectsModel 2019-05-24 14:41:00 +02:00
Remco Burema
1cd02766f6
Merge pull request #5777 from Ultimaker/WIP_i18n_4.1 
[CURA-6521] bothoff translations
 2019-05-24 13:39:42 +02:00
Jaime van Kessel
834e6344df Cut up large update function to make testing easier 
CURA-6283
 2019-05-24 13:26:11 +02:00
Remco Burema
5c86984353 Translation: Fix linebreak in Korean. 2019-05-24 13:10:27 +02:00
Jaime van Kessel
0bede7e3c5 Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-24 12:53:56 +02:00
Jaime van Kessel
9bc89534bf Add mouse area to prevent clickthroughs 
CURA-6283
 2019-05-24 12:53:34 +02:00
Lipu Fei
8a18e0c65c Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-24 10:51:19 +02:00
Lipu Fei
7c6c00df84 Merge remote-tracking branch 'origin/4.1' 2019-05-24 10:50:43 +02:00
Lipu Fei
27d6b9b53b Calculate bounding box for helper meshes 2019-05-24 10:49:35 +02:00
Remco Burema
575555186e raw bothoff translations -- not checked yet 2019-05-24 10:30:19 +02:00
Jaime van Kessel
bd39a9c591 Simplify & cleanup objects mode 
CURA-6283
 2019-05-24 09:30:50 +02:00
Jaime van Kessel
502eea4d26 Simplify the objects model further 
CUA-6283
 2019-05-23 16:09:22 +02:00
Jaime van Kessel
71d156b175 Remove unneeded check 
CURA-6283
 2019-05-23 16:04:39 +02:00
Jaime van Kessel
4a6495a0e6 Remove unneeded itemsChanged emit 
CURA-6283
 2019-05-23 16:01:53 +02:00
Jaime van Kessel
48dd9d247c Renamed some local variables so they describe better what they do 
CURA-6283
 2019-05-23 16:01:19 +02:00
Jaime van Kessel
c784a39ec6 Fixed typing 
CURA-6283
 2019-05-23 15:59:14 +02:00
Ghostkeeper
3845da24a1
Add new material properties for cleanly breaking off materials 
When performing a long retract, the firmware can use these material properties to determine how fast and how far it needs to retract.
The retraction goes in two stages: Anti-ooze retraction stops oozing, and then the break retraction breaks off the filament from the bead in the nozzle.

Contributes to issue CURA-6329.
 2019-05-23 15:53:00 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting" 
This reverts commit bec7b6546d, reversing
changes made to 7094b222b1.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
 2019-05-23 13:40:11 +02:00
Lipu Fei
288770b991 Fix merge conflicts 2019-05-23 11:37:51 +02:00
Lipu Fei
fb33497ff1 Fix auto-slice for per-object settings 
CURA-6539
 2019-05-23 11:36:55 +02:00
maukcc
6af43f6497 HMS434 update 
gantry height set
 2019-05-23 11:18:53 +02:00
maukcc
27837feb73 HMS434 update 
start gcode update
 2019-05-23 11:14:12 +02:00
maukcc
86cb9c2f99 HMS434 update 
HMS434 multi tool update
 2019-05-23 11:02:11 +02:00
Lipu Fei
5b7b262d61 Merge remote-tracking branch 'origin/4.1' 2019-05-23 10:53:24 +02:00
Lipu Fei
50e4519298 Fix upgrade 40 to 41 2019-05-23 10:46:14 +02:00
Lipu Fei
3ca272ff72 Merge remote-tracking branch 'origin/4.1' 2019-05-22 07:44:26 +02:00
Remco Burema
083564a184
Merge pull request #5763 from Ultimaker/CL-1329_fix_monitor_progress_bar_bug 
CL-1329 fix monitor progress bar bug
 2019-05-21 17:27:53 +02:00
Lipu Fei
5d58d60a16 Fix typing 
CURA-6283
 2019-05-21 13:39:14 +00:00
Lipu Fei
83b9e5e53b Change import 
CURA-6182
 2019-05-21 15:17:04 +02:00
Lipu Fei
c9642273eb Fix typing 
CURA-6283
 2019-05-21 15:15:18 +02:00
Jaime van Kessel
9e6263b1f1 Change instances of assert_called_once to assert_called_once_with 
Grumbles something about python 3.5 and 3.6...
 2019-05-21 14:56:00 +02:00
Lipu Fei
c282897c1e Fix numbering in object renaming 
CURA-6283

For both individual nodes and grouped nodes.
 2019-05-21 14:49:45 +02:00
Jaime van Kessel
ca8fa9cfac Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5395-orthographic-view 2019-05-21 14:23:24 +02:00
Jaime van Kessel
65a8582a1e Add preference to set the camera rendering type 
CURA-5395
 2019-05-21 09:54:32 +02:00
Lipu Fei
9187738d9c
Merge pull request #4599 from DesktopMetal/feature_nozzle_switch_extra_prime_distance 
Feature: "Nozzle Switch Extra Prime Distance"
 2019-05-21 09:18:11 +02:00
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode 
CURA-6182

Move complex logic to Python.
 2019-05-21 08:10:49 +02:00
Tim Kuipers
e59641eb67 based transmittance on measurements on print 
ratio of luminance of 1.4mm thickness to luminance at 0.4mm
 2019-05-20 20:19:29 +02:00
Jaime van Kessel
2f5dfb8e65 Remove hardcoded set perspective function 
CURA-5395
 2019-05-20 16:34:24 +02:00
Ian Paschal
5a8b70ad0c Simplify can_override conditional 
Contributes to CL-1259
 2019-05-20 15:48:57 +02:00
Ian Paschal
0dc49a66f1
Merge pull request #5762 from Ultimaker/CL-1259_hide_useless_override_button 
CL-1259 hide useless override button
 2019-05-20 15:47:26 +02:00
Ian Paschal
0c9f3a1842 Update MonitorConfigOverrideDialog.qml 
Contributes to CL-1259
 2019-05-20 15:47:19 +02:00
Ian Paschal
7be3863d51 Put override logic in Python instead of QML 
Contributes to CL-1259
 2019-05-20 15:46:07 +02:00
Ghostkeeper
b52b6251b9
Clarify description of build volume temperature a bit 
Contributes to #5756.
 2019-05-20 15:35:53 +02:00
Ian Paschal
2a80a8d0db Simplify can_override conditional 
Contributes to CL-1259
 2019-05-20 15:12:08 +02:00
Tim Kuipers
236b7574c0 fix litho thickness computation 2019-05-20 14:58:26 +02:00
Jaime van Kessel
919420c47a Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-20 14:41:19 +02:00
Jaime van Kessel
f7d0bcd0d4 Prevent modifier meshes from blocking one at a time slicing 
CURA-6030
 2019-05-20 14:40:41 +02:00
Tim Kuipers
3e0b756a6d explain litho transmittance better 2019-05-20 14:37:14 +02:00
Ghostkeeper
cdda24b33a
Merge branch '4.1' 2019-05-20 14:30:47 +02:00