GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 06:09:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,047 Commits 288 Branches 260 Tags
Commit Graph

4060 Commits

Author SHA1 Message Date
Jaime van Kessel
0cb83d2c92 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-07-02 13:51:52 +02:00
Jaime van Kessel
6544c123a4 Add camera view selector to the view application menu 2019-07-01 11:15:26 +02:00
pkuiper-ultimaker
67191c4040
Merge pull request #5863 from Ultimaker/CURA-6414_no_blob_for_one_at_a_time 
Don't prime-blob when print-sequence is one-at-a-time. [CURA-6414]
 2019-06-25 17:44:51 +02:00
Ghostkeeper
5ab1881a21
Merge branch 'master' into feature_intent 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
 2019-06-19 13:10:36 +02:00
Ghostkeeper
487673e780
Always uncheck zoom to mouse if preference is disabled 2019-06-18 11:19:41 +02:00
Ghostkeeper
7f559987a0
Disable move to mouse position preference in orthogonal view 2019-06-18 11:16:21 +02:00
Ghostkeeper
0190247c5a
Don't show tooltip if it shows the same text as the button 
It's only useful if the text on the button gets elided.
 2019-06-14 14:17:10 +02:00
Remco Burema
6f928ad97c Merge branch 'master' into feature_intent 2019-06-07 10:39:52 +02:00
Lipu Fei
960a20652a Add warning state for prime blob and CheckBox 
CURA-6414
 2019-06-06 12:30:27 +02:00
Lipu Fei
0e55b25e0b
Merge pull request #5768 from Ultimaker/CURA-5395-orthographic-view 
Support for orthographic view
 2019-06-06 11:49:25 +02:00
Jaime van Kessel
499e02579e Fix hiding settings that were not visible by default 
CURA-6556
 2019-06-05 16:36:30 +02:00
Remco Burema
7aa17da536
Merge pull request #5791 from Ultimaker/CURA-6490_fix_ppa_attempt2 
CURA-6490 Fix settings attempt 2
 2019-06-05 13:07:47 +02:00
Jaime van Kessel
35ec70a3cf Add a selector for the intent profile 
CURA-6534
 2019-06-05 11:13:32 +02:00
Jaime van Kessel
c9f07c898c Refactoring the rotateView to setCameraRotation 
The new name actualy reflects what it was doing (it sets the rotation, it
doesn't apply a new one to it!)

CURA-5395
 2019-05-31 11:32:16 +02:00
Jaime van Kessel
8b7c95da35 ViewOrientationControls now use actions 
This prevents code duplication

CURA-5395
 2019-05-31 11:23:44 +02:00
Jaime van Kessel
27f60a6d5d Directly show feedback when pressing the slice button 
CURA-6034
 2019-05-29 16:32:43 +02:00
Remco Burema
fc908cdf9b Revert "Settings-GUI: Max decimal places to 4 (from 3)." 
This reverts commit 020bedcfeea844a3a785fc12d5a590cef4b8e0a8.
 2019-05-28 11:33:17 +02:00
Cherubim
b19c6dad64
Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-28 11:07:48 +02:00
Cherubim
0ebb2a35fe
Merge branch '4.1' 
Conflicts:
	resources/i18n/es_ES/cura.po -> Correction being made on master while translations were being done for 4.1.
 2019-05-28 11:07:20 +02:00
Remco Burema
020bedcfee Settings-GUI: Max decimal places to 4 (from 3). 2019-05-28 11:07:18 +02:00
Cherubim
376c5445e4
Re-enable Polish 
It was disabled yesterday because it was incomplete then, but we got the translations yesterday evening.

Contributes to issue CURA-6547.
 2019-05-28 10:48:58 +02:00
Lipu Fei
0bc8a67a37 Merge master 2019-05-28 10:43:51 +02:00
Lipu Fei
f9af9754c8 Make reset button and revert stack levels configurable 
CURA-6490
 2019-05-28 10:33:26 +02:00
Lipu Fei
a14eb50fec Handle the case that resolve is undefined 
CURA-6490
 2019-05-28 10:33:26 +02:00
Diego Prado Gesto
b234485592 Merge branch '4.1' 2019-05-27 11:31:08 +02:00
Diego Prado Gesto
fa197f53a7 Hide Polish from the list of available languages in 4.1 
The tranlations are incomplete so not available in 4.1

Contributes to CURA-6521.
 2019-05-27 11:16:54 +02:00
Jaime van Kessel
9bc89534bf Add mouse area to prevent clickthroughs 
CURA-6283
 2019-05-24 12:53:34 +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
80827bdf70 Fix adhesion checkbox in recommended mode 
CURA-6182

Move complex logic to Python.
 2019-05-21 08:10:49 +02:00
Ghostkeeper
19cc267726
Merge branch '4.1' 2019-05-20 13:42:38 +02:00
Jaime van Kessel
fbc4c5fb1e
Merge pull request #5719 from Ultimaker/CURA-6497_fix_empty_material_name 
CURA-6497 Add validation for empty strings in SettingDefinition
 2019-05-20 13:40:39 +02:00
Jaime van Kessel
5ae103964a Merge branch 'CURA-6497_fix_empty_material_name' of github.com:Ultimaker/Cura into 4.1 2019-05-20 13:38:37 +02:00
Lipu Fei
0c15f69c44 Merge remote-tracking branch 'origin/4.1' 2019-05-17 15:01:40 +02:00
Lipu Fei
0555cbae4e Fix add machine dialog state 2019-05-17 15:01:18 +02:00
Lipu Fei
33aae24d6d Merge remote-tracking branch 'origin/4.1' 2019-05-17 14:41:52 +02:00
Lipu Fei
361636af29 Allow WizardDialog to resize 2019-05-17 14:30:18 +02:00
Diego Prado Gesto
a28ca19647 Change the font size 
To make it consistent with the size of texts in the other Welcome pages.
 2019-05-17 11:54:40 +02:00
Lipu Fei
be4e05c13f
Merge pull request #5393 from Ultimaker/feature_model_list 
Add an object list/selector
 2019-05-17 07:48:22 +02:00
Jaime van Kessel
f5e31060a6 Fixed unknown reference in qml 2019-05-16 16:44:29 +02:00
Lipu Fei
961f6403ad Change preference key to cura/show_list_of_objects 2019-05-16 15:49:08 +02:00
Jaime van Kessel
ff0a18603b Remove a few more usages of deprecated functions 2019-05-16 15:20:38 +02:00
Lipu Fei
28172c9ad2 Merge remote-tracking branch 'origin/master' into feature_model_list 2019-05-16 15:17:46 +02:00
Jaime van Kessel
a0c705e900 Remove usage of some deprecated functions 2019-05-16 14:49:53 +02:00
Jaime van Kessel
2eb8203c70 Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-16 14:29:24 +02:00
Jaime van Kessel
99e6ec9509 Fix the last material qml warnings 2019-05-16 14:29:05 +02:00
Ghostkeeper
0352553193
Read resolved value for adhesion type 
We still write to the value property.
We need the resolved value because we want to read from the extruder stacks which may overwrite the adhesion type in a profile.

Contributes to issue CURA-6182.
 2019-05-16 14:28:10 +02:00
Ghostkeeper
f3ea522811
Use === to compare strings in JavaScript 2019-05-16 14:28:09 +02:00
Jaime van Kessel
bfe1275d46 Fix a number of QML warnings 2019-05-16 14:23:09 +02:00
Lipu Fei
1bed5c9c11 Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name 2019-05-15 08:40:45 +02:00