GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 13:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,396 Commits 291 Branches 265 Tags
Commit Graph

14396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
4c61e190ae Add exclude materials for UMO, UM2, and UM2+ 
CURA-5271
 2018-04-23 12:51:06 +02:00
Lipu Fei
37bcf1694d Remove translation wrapper for unnecessary parts 
CURA-5221
 2018-04-23 12:00:05 +02:00
Lipu Fei
f92985b4ac Add Ultimaker S5 for printer type detection 
CURA-5221
 2018-04-23 11:57:01 +02:00
Diego Prado Gesto
95a26837b6 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-23 11:35:45 +02:00
Diego Prado Gesto
b85b39ff35 CURA-5188 If the auto_slice option was enabled in previous version, 
keep it like this in the new version.
Since the default value of this preference changed, we don't want to
confuse users that still use the auto_slice option. Those users with
clean install or intalling Cura for the first time will have this
preference disabled.
 2018-04-23 11:29:18 +02:00
Ghostkeeper
7c3fe6ac93
Publish Tough PLA profiles 
The Tough PLA material is now published, so we can publish these files too.

Contributes to issue CURA-5272.
 2018-04-23 11:28:33 +02:00
Ghostkeeper
aec2b9dafe
Add Ultimaker S5 resources 
The Ultimaker S5 has now been published, so these files may be published as well.

Contributes to issue CURA-5272.
 2018-04-23 11:27:13 +02:00
Lipu Fei
f62ce1966b Fix material manager to use dict as a fallback 
CURA-5266
 2018-04-23 11:22:44 +02:00
Ian Paschal
54c32c52f6 CURA-5221 Added S5 ID code 2018-04-23 11:22:11 +02:00
Ghostkeeper
d857541677
Update PO headers 
We're releasing 3.3 now.
 2018-04-23 10:29:59 +02:00
Ian Paschal
5809cc949f
Update ISSUE_TEMPLATE.md 2018-04-23 09:35:19 +02:00
Cláudio Sampaio (Patola)
b4ddeab47e updated pt-br translations 2018-04-21 21:16:03 -03:00
kerog777
85fb9441ea Made requested changes to version numbers, etc. per comments fro 
previous pull request.
 2018-04-21 09:34:41 -07:00
Ian Paschal
dc0dcac199 CURA-5035 Small style tweaks 2018-04-20 17:06:16 +02:00
Diego Prado Gesto
dbd30abd86 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-20 17:06:09 +02:00
Diego Prado Gesto
b8a26f3187 CURA-5218 Disable the Activate and Duplicate button in the management 
page if the selected profile is not supported
 2018-04-20 17:04:51 +02:00
Ian Paschal
0944bba86b CURA-5035 Added typings 2018-04-20 16:21:57 +02:00
Ghostkeeper
ac2301a8fd
Fix code style: Brackets on new line 
And one comma without a space after it.

Contributes to issue CURA-5204.
 2018-04-20 15:36:32 +02:00
Ghostkeeper
e13c3b1f13
Merge branch '3.3' 2018-04-20 15:34:06 +02:00
Ghostkeeper
f675b0b858
Fix 'Setting up scene...' translation 
This was replaced with its English term, even though it's not really an industry term or anything.

Contributes to issue CURA-5166.
 2018-04-20 15:33:48 +02:00
Diego Prado Gesto
626c424a02 CURA-5246 Just update the job name when it must be updated. 2018-04-20 15:00:40 +02:00
Lipu Fei
d0c6d87417 Fix Rigid3D Mucit definition 
CURA-5257

 - Remove extra trailing spaces
 - Replace TABs with SPACEs
 - "value"s should use quotes ""
 2018-04-20 14:52:52 +02:00
Lipu Fei
addcf5236a
Merge pull request #3642 from Rigid3D/master 
Printer Definitions for Rigid3D Mucit
 2018-04-20 14:43:58 +02:00
Ghostkeeper
70aed244ca
Merge branch '3.3' 2018-04-20 14:36:51 +02:00
Ghostkeeper
74016f0fb3
Merge branch 'jbkim-3.3' into 3.3 2018-04-20 14:19:03 +02:00
Ghostkeeper
132efba272
Undo some of the changes that we thought were wrong 
In these cases we trust the original translation of Bothof better.

Contributes to issue CURA-5166.
 2018-04-20 14:18:45 +02:00
Diego Prado Gesto
576881bfeb CURA-5204 Update the checkbox if the setting has changed in the 'More 
information' dialog.
 2018-04-20 14:12:05 +02:00
Ian Paschal
9b556e9c86 CURA-5035 Removed all base units 2018-04-20 14:08:44 +02:00
Diego Prado Gesto
122b5e36cf CURA-5204 Revert a change since it sets the setting to false if the 
panel is not visible.
 2018-04-20 13:36:07 +02:00
Ghostkeeper
1578a76aa4
Merge branch '3.3' of https://github.com/jbkim/Cura into jbkim-3.3 2018-04-20 13:32:48 +02:00
Ghostkeeper
d2caeee8c1
Clarify warning for filament diameter change 
It's the diameter of the filament, not the diameter of the material. Diameter of a material doesn't make any sense. Also corrected grammar and clarified context.
 2018-04-20 13:32:14 +02:00
Ian Paschal
668a92952c CURA-5035 Review changes 2018-04-20 13:26:23 +02:00
Diego Prado Gesto
121d1806be Don't show the corresponding element in the general preference panel 
if the related plugin is not enabled.
Contributes to CURA-5204
 2018-04-20 11:56:59 +02:00
Diego Prado Gesto
fc1eef2b0c Merge branch '3.3' 2018-04-20 11:43:49 +02:00
Ian Paschal
7f622eb300 Cura with a capital "C" 2018-04-20 11:27:53 +02:00
Ian Paschal
fbf73176d3 Use UM.Version instead of VersionTools 2018-04-20 11:25:39 +02:00
Diego Prado Gesto
4e53f219f0 Merge branch 'master' into CURA-5204_send_anonymous_data 2018-04-20 10:35:52 +02:00
Diego Prado Gesto
f003adeb1e CURA-5250 Add color to the text so it also works fine with other themes. 2018-04-20 10:19:25 +02:00
kerog777
52d2057e64 Add profile data for Felix Tec4 
Includes 2 extruder definitions, platform mesh, and variants for 0.25,
0.35, 0.5, and 0.7 mm nozzles
 2018-04-19 08:24:45 -07:00
kerog777
d235bc78ad Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile 2018-04-19 08:11:57 -07:00
Ian Paschal
921e8f7602 CURA-5035 Clean-up 2018-04-19 16:07:31 +02:00
Lipu Fei
53495604f8 Merge remote-tracking branch 'origin/feature_show_config_errors' 2018-04-19 15:38:29 +02:00
Diego Prado Gesto
5567d6f168 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-19 10:24:04 +02:00
Diego Prado Gesto
cdc297c87e CURA-5250 Temporary hide buildplate selector. 
Put back again when the whole feature is ready.
 2018-04-19 10:23:01 +02:00
Diego Prado Gesto
62b586a6ff CURA-5250 Add hint when the buildplate is just usable but not the 
recommended.
 2018-04-19 10:21:19 +02:00
Lipu Fei
94b2209b49 Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:40:30 +02:00
Lipu Fei
aab87a5558
Merge pull request #3584 from ohrn/zyyx 
Add ZYYX Agile printer.
 2018-04-19 09:38:19 +02:00
Lipu Fei
db5c18295b Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:20:22 +02:00
Lipu Fei
f24e1da934 Always update job name for gcode files 
CURA-5246
 2018-04-19 09:17:22 +02:00
Jinbuhm Kim
0a5f1878b7 Update Korean translation for Cura 3.3 2018-04-19 16:13:40 +09:00