GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 20:26:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,023 Commits 290 Branches 260 Tags
Commit Graph

23023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arjen Hiemstra
67086b4d9f Update translated strings and contexts 2015-09-12 20:08:41 +02:00
Arjen Hiemstra
0148186c7a Display a slicing message when performing a slice operation 2015-09-12 20:08:40 +02:00
Jaime van Kessel
d6defe09e6 Merge pull request #388 from markwal/nogtypo 
Fix a few typos in comments and tooltip
 2015-09-12 16:49:16 +02:00
Mark Walker
f95fcef19d Fix a few typos in comments and tooltip 
nog to not
 2015-09-11 18:26:32 -07:00
Tamara Hogenhout
29c0c7c6f4 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-11 17:41:33 +02:00
Tamara Hogenhout
cf4bd45f3f Insert nescessary strings for Addmachine Wizard for string freeze 
Contributes to: issue CURA-132
 2015-09-11 17:41:24 +02:00
Jaime van Kessel
f47fc058a8 Merge pull request #387 from thopiekar/patch-1 
Fixes "could not create shader program" #385
 2015-09-11 16:43:10 +02:00
Thomas-Karl Pietrowski
02fd71fe58 Fixes "could not create shader program" #385 
For any reason this problem seems to be Ubuntu-specific and is also present since pyqt4.
* Updated the #131 pull request and added platform.linux_distribution to check for "Ubuntu"
* Added notice about the bug report above the if-clause
* Added comment why <platform.system() == "Linux"> is needed
 2015-09-11 15:46:17 +02:00
Arjen Hiemstra
dc280c53df Drop unused files 2015-09-11 14:47:53 +02:00
Arjen Hiemstra
7f9ad28a1f ChangeLog: Use an ordered dict for items 
This way we respect the ordering of the original text file instead of a
random ordering.
 2015-09-11 14:47:53 +02:00
Arjen Hiemstra
907f53240d Drop dual_extrusion JSON for 15.10 
We do not support dual extrusion prinitng in 15.10 so there is no need
to bother with this currently.
 2015-09-11 14:47:53 +02:00
Arjen Hiemstra
147c6c3d7b Update pot files and drop cura_qt.pot 2015-09-11 14:47:53 +02:00
Arjen Hiemstra
8966054373 Remove Qt translation generation and only use gettext for extracting translations 2015-09-11 14:47:53 +02:00
Arjen Hiemstra
0a2baec53b Use the right catalog for RemovableDriveOutputDevice 2015-09-11 14:47:53 +02:00
Jaime van Kessel
e08aa9f2ec Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-11 13:49:49 +02:00
Jaime van Kessel
d14816bae5 Center of group node is now on correct position. 
Fixes Ultimaker/Cura#378
 2015-09-11 13:49:16 +02:00
Tamara Hogenhout
b816f0b03b Implement simplemode -> profilesetup -> infill selection 
not yet fully functional. Fast implement for string freeze

Contributes to: issue CURA-123
 2015-09-11 13:02:01 +02:00
Tamara Hogenhout
506180fff9 changing the i18n call so that the actual string is shown instead of the context ;) 
fixes #369
 2015-09-11 10:06:34 +02:00
Arjen Hiemstra
2ea0a3c02a Fix strings in crash handler 
Contributes to CURA-132
 2015-09-10 16:54:20 +02:00
Arjen Hiemstra
add3776526 Add missing languages to General page and update other strings as well 
Contributes to CURA-132
 2015-09-10 16:30:51 +02:00
Arjen Hiemstra
80c5adc59a Add several actions to menus that were missing 2015-09-10 16:30:51 +02:00
Arjen Hiemstra
cdc93d3839 Use the right strings for Manage actions and add a bunch of missing icons 
Contributes to CURA-132
 2015-09-10 16:30:51 +02:00
Arjen Hiemstra
b99a67ceb5 Display a more appropriate message when processing layers 
Contributes to CURA-132
 2015-09-10 16:25:26 +02:00
Jaime van Kessel
76d2fd3665 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-10 15:18:21 +02:00
Jaime van Kessel
5d7abb5864 Ungrouping now copies parent transformation onto children. 
Fixes Ultimaker/Cura#360
 2015-09-10 15:17:42 +02:00
Tamara Hogenhout
7ef41d1556 implements the new load file button styling 
(so that the mouse-over label can be translated..). The final icon will be added later.

Contributes to: issue CURA-129
 2015-09-10 14:57:55 +02:00
Tamara Hogenhout
096065a441 changes some word-usage and the use of capital letters 
Contributes to: issue CURA-129
 2015-09-10 14:23:47 +02:00
Jaime van Kessel
00cdafc50a Added new features to changelogplugin list 2015-09-10 11:50:50 +02:00
Jaime van Kessel
f272820100 Fixed paths for firmware 2015-09-10 11:24:47 +02:00
Jaime van Kessel
a0a0f3ea01 Added exception handling to layerview 
Fixes Ultimaker/Cura#362
 2015-09-10 11:16:55 +02:00
Jaime van Kessel
9c873c7d34 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-10 11:07:41 +02:00
Jaime van Kessel
ade65870c6 Scale is now taken into account for merging. 
Fixes Ultimaker/Cura#359
 2015-09-10 11:07:03 +02:00
Tim Kuipers
e78ea4b916 JSON: rename hammock to support roof 2015-09-10 11:02:34 +02:00
Tim Kuipers
eacc3ac58f JSON: bugfix: faulty description 2015-09-10 10:09:00 +02:00
Tim Kuipers
d1a87f6add Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-09 17:05:22 +02:00
Tim Kuipers
7e01273d87 JSON: bugfix: skin_no_small_gaps_heuristic interpreted the wrong way around 2015-09-09 17:05:11 +02:00
Tamara Hogenhout
ae2a07ca06 re-implements the safebutton -> filename -> textfield 
Not yet fully functional but re-implemented for stringfreeze

Contributes to: issue CURA-125
 2015-09-09 16:40:01 +02:00
Tamara Hogenhout
032b6e4000 Just a little cleanup related to the translations 
Contributes to: issue CURA-116
 2015-09-09 15:50:28 +02:00
Tamara Hogenhout
dd0fc78e77 adds text as a 'Toggle Full Screen' menu item 
Contributes to: issue CURA-125
 2015-09-09 15:47:34 +02:00
Tamara Hogenhout
776683219d Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-09 15:25:59 +02:00
Tamara Hogenhout
ef93524d78 adds/adapts translation context markers 
last nesscessary changes for internationalisation -> Cura

Contributes to: issue CURA-116
 2015-09-09 15:25:39 +02:00
Tim Kuipers
42d8f38cf8 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-09 13:48:25 +02:00
Tim Kuipers
1401265fc1 JSON bugfix: default support roof pattern 2015-09-09 13:48:15 +02:00
Jaime van Kessel
98ee8cab85 Pages are now reset when adding a new machine. 
Contributes to Ultimaker/Cura#353
 2015-09-09 13:16:24 +02:00
Jaime van Kessel
926ac69c71 Added close button to changelog 
Fixes Ultimaker/Cura#350
 2015-09-09 09:54:53 +02:00
Jaime van Kessel
e2fe27e534 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-09 09:50:35 +02:00
Jaime van Kessel
f1417858c1 Merged objects are no longer moved on platform plate 
Fixes Ultimaker/Cura#354
 2015-09-09 09:49:53 +02:00
adamarumjahn
ff0e742910 Fixed syntax 
fixed syntax, double checked with JSONLint Validator
 2015-09-08 18:31:16 -05:00
Arjen Hiemstra
09cf161b59 Bump application version 2015-09-08 17:42:36 +02:00
Arjen Hiemstra
e40c785d86 Use the right values when sending profile overrides 
Contributes to #325
 2015-09-08 17:41:46 +02:00