kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity
24,998 Commits 41 Branches 6 Tags
fc50ef8f0f8a874eae716e60bf1895b8910c7b60
Commit Graph

24998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sliptonic
fc50ef8f0f Merge pull request #4826 from sliptonic/master 
Path cleanup PathGuiInit
 2021-06-01 13:19:10 -05:00
sliptonic
fd4870992b Path cleanup PathGuiInit 2021-06-01 13:15:59 -05:00
sliptonic
bc764120ad Merge pull request #4825 from FreeCAD/revert-4817-fix/camotics_import 
Revert "[Path] Handle unavailability of Camotics library/module"
 2021-06-01 12:56:23 -05:00
sliptonic
d23393923a Revert "[Path] Handle unavailability of Camotics library/module" 2021-06-01 12:55:48 -05:00
Yorik van Havre
f7cdb4cc04 Merge pull request #4822 from marioalexis84/draft-fillet 
Draft: Add shortcut to fillet command
 2021-06-01 17:01:53 +02:00
Yorik van Havre
9332e52d94 Draft: Added ExclusionPoints property to shape2dview object 2021-06-01 11:30:04 +02:00
donovaly
7436bbfa30 [Sketch] fix too long tooltips 
- they were too long for smaller screens
- the other UI file changes were automatically make by Qt Designer
 2021-06-01 08:12:52 +02:00
sliptonic
b28a22152d Merge pull request #4821 from FreeCAD/revert-4672-feature/camotics2 
Revert "[PATH]  CAMotics simulation.  First Draft"
 2021-05-31 16:30:28 -05:00
marioalexis
d363f10edf Draft: Add shortcut to fillet command 2021-05-31 16:18:36 -03:00
sliptonic
f316cb337d Revert "[PATH] CAMotics simulation. First Draft" 2021-05-31 12:49:25 -05:00
Yorik van Havre
43a2e2e640 Merge pull request #4820 from Roy-043/Draft_Fix_make_text 
Draft: make_text fixed 3 small issues
 2021-05-31 19:44:13 +02:00
Yorik van Havre
ff6845e2f3 OpenSCAD: Fixed typo 2021-05-31 14:54:48 +02:00
Yorik van Havre
5ddf75d358 Arch: Added arrow and bar bubble modes to Arch Axis object 2021-05-31 14:14:46 +02:00
Yorik van Havre
6b3c3a60f6 Merge branch 'master' of github.com:FreeCAD/FreeCAD 2021-05-31 10:54:49 +02:00
Roy-043
cd31a4f026 Draft: make_text fixed 3 small issues 
Fixed 3 small issues in make_text that came up while working on make_label (pull request #4801).
 2021-05-30 19:53:02 +02:00
sliptonic
ce2d17b5ae Merge pull request #4819 from sliptonic/bug/postcancel 
[path] fix minor bug when cancelling post process
 2021-05-30 10:51:28 -05:00
sliptonic
d80d6fa844 fix cancel bug 2021-05-30 10:49:16 -05:00
sliptonic
9b644b4303 Merge pull request #4817 from Russ4262/fix/camotics_import 
[Path] Handle unavailability of Camotics library/module
 2021-05-30 10:44:47 -05:00
Russell Johnson
71b5050707 Path: Handle unavailability of Camotics library/module 2021-05-29 13:52:00 -05:00
Russell Johnson
0a710faecc Path: Alphabetize import list and remove comments therein 2021-05-29 13:50:06 -05:00
sliptonic
af1e1149a2 Merge pull request #4673 from sliptonic/bug/proxyerror 
[PATH]  Fix proxy error bug that occurs when postprocessing
 2021-05-28 13:04:44 -05:00
sliptonic
f1d7a4277d removed PathUtils import from all post-processors to avoid the deleted proxy error 
I removed or commented out code using this import.  In all cases,
the import was used to get descriptive information from the Job
 2021-05-28 13:04:16 -05:00
sliptonic
bb50a37024 Merge pull request #4672 from sliptonic/feature/camotics2 
[PATH]  CAMotics simulation.  First Draft
 2021-05-28 13:03:13 -05:00
sliptonic
a9f6fad531 Merge pull request #4812 from jimzim111/patharray_multibase 
Path: PathArray based on multiple bases, and choice of direction
 2021-05-28 10:38:55 -05:00
sliptonic
9e795191bc add missing reference in cmakelists 2021-05-28 10:29:06 -05:00
sliptonic
ad5445d40f Initial Commit 2021-05-28 10:25:46 -05:00
Yorik van Havre
f94f4257cf Merge branch 'master' of github.com:FreeCAD/FreeCAD 2021-05-28 14:11:51 +02:00
Yorik van Havre
cc1140489e Merge pull request #4801 from Roy-043/draft_make_label_text_input 
Draft: Fixed make_label to accept list of strings for custom_text
 2021-05-28 13:46:10 +02:00
Yorik van Havre
750f8ae643 Merge pull request #4814 from Syres916/patch-18 
[Material] Change Graphite File encoding to UTF-8
 2021-05-28 13:40:26 +02:00
sliptonic
7c412e6eaf Merge pull request #4798 from Russ4262/refactor/remove_rotation 
[Path] Remove rotational code from Path modules
 2021-05-27 13:47:12 -05:00
Russell Johnson
16015f66e3 Path: Remove first-draft rotational code Path 
Remove all first-draft rotational-related code from Path workbench to make way for more stable, long-term integration of a rotational indexing capability.
 2021-05-27 10:04:31 -05:00
Yorik van Havre
b1d9a5607f Merged crowdin translations 2021-05-27 14:51:33 +02:00
Yorik van Havre
c6771853ae Updated translation files 2021-05-27 14:44:40 +02:00
Roy-043
c0105690f4 Merge branch 'master' into draft_make_label_text_input 2021-05-26 16:23:22 +02:00
jim
e728c9226c Merge branch 'patharray_multibase' of https://github.com/jimzim111/FreeCAD into patharray_multibase 2021-05-25 18:37:05 -07:00
jim
815679a487 fix whitespace 2021-05-25 18:36:51 -07:00
jimzim111
a2960cd4e6 Merge branch 'master' into patharray_multibase 2021-05-25 18:34:49 -07:00
jim
b0ab46878b Clean up logic that tests whether there any base Paths to process 2021-05-25 18:34:19 -07:00
jim
9234c33db1 Hide ToolController property. TC can be chosen by the first operation in the PathArray Base property. 2021-05-25 18:24:50 -07:00
jim
4e2137b358 Wrap strings in QT_TRANSLATE_NOOP 2021-05-25 18:11:15 -07:00
Syres916
13cb80ef5e [Material] Change File encoding to UTF-8 
See discussion https://forum.freecadweb.org/viewtopic.php?f=3&t=58892
 2021-05-25 15:02:22 +01:00
Yorik van Havre
1e8c848544 Merge pull request #4802 from meapeteze/TD_Spreadsheet_merged_cells 
TechDraw: Fix View Spreadsheet with merged cells.
 2021-05-25 15:09:51 +02:00
Yorik van Havre
e8a7e4794e Merge branch 'master' into TD_Spreadsheet_merged_cells 2021-05-25 15:09:42 +02:00
Yorik van Havre
da53836d06 Merge pull request #4806 from meapeteze/TD_Spreadsheet_merged_cells_optimal 
Fix TechDraw View Spreadsheet with merged cells, 2
 2021-05-25 15:07:54 +02:00
Yorik van Havre
e6af8032e2 Merge pull request #4804 from luzpaz/Crowdin-Draft 
Crowdin: fix Draft mirror code typo
 2021-05-25 15:07:28 +02:00
Yorik van Havre
601d6ca466 Merge pull request #4808 from matthijskooijman/movewithhost-link-exception 
Draft: Do not move children of App::Link objects
 2021-05-25 15:06:55 +02:00
Yorik van Havre
0a4ea36073 Merge pull request #4805 from luzpaz/StartWB-tooltip 
StartWB: Add missing tooltip for 'Show tips' preference dialog
 2021-05-25 15:06:31 +02:00
Yorik van Havre
5d57496f25 Merge pull request #4809 from matthijskooijman/draft-arch-simplifications 
Draft & Arch: Python code simplifications
 2021-05-25 15:05:46 +02:00
Yorik van Havre
8896d74e6e Merge pull request #4810 from matthijskooijman/fix-autogroup-groups 
Draft: Fix "Show groups in layer list drop-down button" preference
 2021-05-25 15:04:00 +02:00
jim
6e818208bf Merge branch 'patharray_multibase' of https://github.com/jimzim111/FreeCAD into patharray_multibase 2021-05-24 21:22:10 -07:00