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

6825 Commits

Author SHA1 Message Date
Lipu Fei
849ac3551d
Merge branch 'master' into master-1 2019-12-11 10:57:50 +01:00
Nino van Hooff
8aae5f7563 Fix: extra ConfigParsaer arg added to wrong call 
CURA-6522
 2019-12-10 16:33:47 +01:00
Jaime van Kessel
f66b1e6fde
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_revert_edge_distance_hack 2019-12-10 13:06:37 +01:00
Jaime van Kessel
4811f15a7b
Merge pull request #6662 from Ultimaker/CURA-6981_add_build_type 
CURA-6981 Add build_type into crash reports and stats
 2019-12-05 15:09:38 +01:00
Ghostkeeper
250774c4cd
Merge branch 'master' of https://github.com/iLyngklip/Cura into iLyngklip-master 2019-12-05 11:19:42 +01:00
Nino van Hooff
b30b641034 Merge remote-tracking branch 'origin/CURA-6522_one_at_a_time_overlapping_build_area' into CURA-6522_one_at_a_time_overlapping_build_area 2019-12-04 14:28:48 +01:00
Nino van Hooff
e2db4e873d Add paramteter to Config Parser constructor to prevent comments in 
Gcode to be remnoved by upgrade, as in CURA-6994

CURA-6522
 2019-12-04 14:28:30 +01:00
Dimitriovski
74d919a5d2 Prevent deleting comments from Start/End G-codes by changing the comment_prefixes in ConfigParser 
CURA/6994
 2019-12-03 14:40:54 +01:00
translucentfocus
4fc32b036e
Fixed typo 
Only correcting in master; may want to consider correcting in other branches
 2019-11-27 11:46:07 -06:00
Mathias Lyngklip Kjeldgaard
8835a0cb99 Fixed a typo in the title 
I noticed a typo in the title of the plugin, so that is fixed. I also
added more info to the description.
 2019-11-26 20:20:45 +01:00
Jaime van Kessel
b1072029ba
Merge branch 'CURA-6971_add_break_prep_temp' of github.com:Ultimaker/Cura 2019-11-25 13:48:27 +01:00
Remco Burema
25f0460231
Add missing 'material break preparation temperature'. 
part of CURA-6971
 2019-11-22 12:01:46 +01:00
Remco Burema
432ed02aa6
Fix skip (or late) pause at height. 
Previously, the line after the layer change would also contain the z height.
If not found, the could would break the per-line reading, and skip to the next layer.
However, if the code doesn't contain the Z on the first gcode line of the layer, this would cause it to skip past all layers, until there was a layer with the Z in the first line (so this also explains the 'late' pauses).
I just ignored the optimization and made it a continue.
I checked, and I don't think there's any way this causes the postproc.-gcode to be inserted twice, since it returns the complete data after insering it once.

CURA-6965
 2019-11-21 14:08:51 +01:00
Jaime van Kessel
50d72692d8
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_one_at_a_time_overlapping_build_area 2019-11-20 16:48:00 +01:00
Dimitriovski
94a5b5ef90 CURA-6522_one_at_a_time_overlapping_build_area 
Changed the setting_version to 11
 2019-11-19 15:27:17 +01:00
Jaime van Kessel
c6f42766c7
Remove hardcoded sizes from dialogs & popups 
Contributes to #6670
 2019-11-19 13:00:39 +01:00
Lipu Fei
a6203f462d Add build_type into crash reports and stats 
CURA-6981
 2019-11-15 15:00:46 +01:00
Jaime van Kessel
c65ccf29b0
Merge branch 'mb-shared-heater' of https://github.com/smartavionics/Cura 2019-11-14 11:06:12 +01:00
Nino van Hooff
c31c1dd6fb Refactor: simplify SimulationSliderLabel font metrics 2019-11-12 14:56:56 +01:00
Nino van Hooff
27b4e9a063 Refactor: simplify SimulationSliderLabel width 2019-11-12 14:55:00 +01:00
Nino van Hooff
f4b9c0fdd4 Fix SimulationSliderLabel width 2019-11-12 14:52:11 +01:00
Nino van Hooff
ae245ed0e5 Cleanup: remove warnings for non-existing margins 2019-11-12 14:51:48 +01:00
Jaime van Kessel
3da53a3a89
Merge branch 'CURA-6856_signed_plugins_and_packages' of github.com:Ultimaker/Cura 2019-11-12 10:48:43 +01:00
Jaime van Kessel
2195dbaad0
Make backup window modal 
It could get hidden on osx quite easily, which is confusing as hell
 2019-11-12 10:31:45 +01:00
Remco Burema
c3d1ab0931
Small refactor: Rename in UM. 
part of CURA-6856
 2019-11-12 08:40:50 +01:00
Jaime van Kessel
7e3905059d
Let the simulation slider label scale on actual font size 
CURA-6854
 2019-11-11 16:10:26 +01:00
Jaime van Kessel
4335acb19f
Fix text jitter for the layer slider 
CURA-6854
 2019-11-11 14:27:31 +01:00
Lipu Fei
534b432e7e Fix another is None check for typing 2019-11-11 09:08:13 +01:00
Lipu Fei
7495d7900f Fix is None check for typing 2019-11-11 09:03:21 +01:00
Lipu Fei
adaea90d50 Fix typing 2019-11-11 08:48:04 +01:00
Jaime van Kessel
9940bc8551
Merge branch 'master' of github.com:Ultimaker/Cura 2019-11-08 13:38:58 +01:00
Jaime van Kessel
00078fd659
Remove a bunch of unused imports 2019-11-08 13:38:42 +01:00
Lipu Fei
832b4f28dc Fix merge conflicts with 4.4 2019-11-07 13:56:20 +01:00
ninovanhooff
d503f9df25
Merge pull request #6635 from Ultimaker/CURA-6854_align_layer_label_top_bottom 
Fix window resize bug in LayerSlider concerning handle position
 2019-11-07 13:04:01 +01:00
Nino van Hooff
ba6cf8eae5 Fix window resize bug in LayerSlider concerning handle position 
Upper handle position would not be updated on resize

CURA-6854
 2019-11-07 12:46:45 +01:00
ChrisTerBeke
7dc38cd55d Merge branch '4.4' into CS-476_improve_packages_api_speed 2019-11-07 10:31:37 +01:00
Lipu Fei
5e255b548e Fix TestLegacyProfileReader 2019-11-07 10:21:01 +01:00
Lipu Fei
7c36b6a8ba Resolve merge conflicts with master 2019-11-06 12:01:49 +01:00
Jaime van Kessel
cb7552a926
Merge branch 'CURA-6854_align_layer_label_top_bottom' of github.com:Ultimaker/Cura 2019-11-05 13:23:34 +01:00
Lipu Fei
af909b25a2
Merge pull request #6624 from Ultimaker/CURA-6569_mandatory_marketplace_login 
WIP: CURA-6569_mandatory_marketplace_login
 2019-11-05 11:04:14 +01:00
Lipu Fei
8baa009f1f Use IsEnterpriseVersion in Toolbox 
CURA-6569
 2019-11-05 10:53:52 +01:00
Lipu Fei
b843210fd3 Add machine name to the machine settings dialog 2019-11-05 10:48:18 +01:00
Nino van Hooff
ed7134ded8 Organize Toolbox (marketplace) qml files according to type 
CURA-6569
 2019-11-04 17:35:24 +01:00
Ghostkeeper
b34c0e8eb7
Don't check A: and B: drives for USB sticks 
Fixes #2438.
 2019-11-04 16:35:49 +01:00
Nino van Hooff
7af5f132e0 Only show toolbox/marketplace welcome screen for Essentials builds 
CURA-6569
 2019-11-04 16:15:00 +01:00
Nino van Hooff
3d352b3585 Show welcome page in marketplace window when not logged in 
TODO: marketplace logo

CURA-6569
 2019-11-04 15:44:04 +01:00
Jaime van Kessel
ad85e29c0a
Fix stupid identation issue 2019-11-04 13:11:46 +01:00
ChrisTerBeke
b1316b8a05 Fix installed_packages query params 2019-11-04 12:56:41 +01:00
Ghostkeeper
e13108f267
Don't request updates if update checking is disabled 
I remember remarking this at one point but then it was said that we'd only need to implement the 'Minimum Viable Product' for the Toolbox. Well this is what happens then...
 2019-11-04 11:52:11 +01:00
Jaime van Kessel
aa5b788b59
Fix issue with profiles getting added to non creality printers in upgrade 2019-11-04 11:30:48 +01:00