pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3141 commits 20 branches 22 tags 141 MiB
Commit graph

3141 commits

This branch
This branch
All branches
Author SHA1 Message Date
make-ing
ff8b77500b changed pull command in git-pull.py script to fix my github delete repo fuck up. 2017-01-20 11:30:05 +01:00
make-ing
39c8f7886a chrome vs. firefox bugfix... Maybe needs further check to see if it can be simplyfied. Maybe use other values etc... 2016-10-04 13:03:35 +02:00
Florian
eb5e7408a9 Merge pull request #80 from mrbeam/mrbeam-dev 
July Release
 2016-07-06 15:08:57 +02:00
clemniem
0e346add14 #77 fixed 
dataURL needed to be encoded correctly for non latin1

- rephrasing of popup for DPI conversion (Illustrator)
 2016-07-06 12:11:53 +02:00
clemniem
5a696e01fa - cleanup of code 2016-07-01 12:42:40 +02:00
clemniem
9311463cfa - remove text deleted (again) 
- clippath text edited
 2016-07-01 12:35:32 +02:00
Florian
b19477dcfb Merge pull request #74 from mrbeam/stable-1.2.2 
bux fixing issue #67: Chrome now treats the event target attributes l…
 2016-07-01 10:18:32 +02:00
Clem
75f69dd0df Merge pull request #73 from mrbeam/mrbeam-dev-textInSvg 
Mrbeam dev text in svg
 2016-07-01 10:10:31 +02:00
clemniem
793b009ab6 popup dialoge informing user about the handling of text elements in SVG that have been detected 2016-06-30 17:45:41 +02:00
clemniem
e366b4c805 popup shows always laser infill if text is in userContent. 2016-06-30 17:31:07 +02:00
make-ing
bcfa42a034 changed back to the correct grbl.hex file 2016-06-24 10:39:38 +02:00
clemniem
6c44d8e243 added text to infill conversion, text will be treated like an image and always engraved. 2016-06-23 16:51:50 +02:00
make-ing
24cebced83 removed the xml stuff which magically appeared a previous commit 2016-06-23 15:49:47 +02:00
clemniem
8e02a97a61 added text to infill conversion, test 2 2016-06-23 14:53:04 +02:00
clemniem
4cb819fd7b added text to infill conversion 2016-06-23 14:43:04 +02:00
clemniem
3ffdceb5af fixed conversion dialog, added second checkbox for text_fills, no real functionality added yet 2016-06-23 14:09:39 +02:00
clemniem
fffc0c4ecb excluded text from being jumped over, because it is not on the paper 2016-06-23 11:04:22 +02:00
make-ing
1966a8b68c fixed #28: select all elements with attribute "display=none" and remove them. 2016-06-21 16:20:41 +02:00
clemniem
aad5efff2d WIP show text after upload in svg. 
missing:
- add warning/dialogue about text in conversion dialogue
- cleanup
 2016-06-21 15:13:36 +02:00
make-ing
f486a24914 fixed the DPI settings not working Problem, and added a PNotify messsage if an Illustrator comment is detected. 2016-06-21 13:44:19 +02:00
make-ing
179d2571ee Merge remote-tracking branch 'origin/mrbeam-dev' into mrbeam-dev 2016-06-21 09:49:29 +02:00
make-ing
074140bcd0 removed "?" from position commands to avoid aditional "ok" response and mazbe problems with advanced character counting. 2016-06-21 09:49:04 +02:00
clemniem
6641390620 resolved #69 
rectangles are now removed after pressing clear button
 2016-06-20 11:26:08 +02:00
make-ing
12a3f092e2 fixed problem when svg elements contain mm units, by converting them to pixel with a fixed dpi of 90. 2016-06-17 14:18:44 +02:00
make-ing
25be52587e fixed problem when xml tag in svg file is missing. 2016-06-17 12:02:56 +02:00
make-ing
3bbdd702db added functionality to remove comments ahead of time to remove the progress bar bug on gcode files with embeded (base64) images. 2016-06-15 11:30:53 +02:00
make-ing
0c5804e51a added functionality to remove all clipPath elements from svg into the placeSVG function 2016-06-02 18:12:50 +02:00
make-ing
36837246fe Merge branch 'mrbeam' into mrbeam-dev 2016-06-02 15:28:11 +02:00
make-ing
2c416eafc2 added functionality to unlock the GUI when grbl is also unlocked with "$x" command 2016-06-02 14:43:20 +02:00
make-ing
16d2e18daa bux fixing issue #67: Chrome now treats the event target attributes like Firefox, so no need for distinction anymore. 
(cherry picked from commit 3128ac7)
 2016-05-27 18:27:13 +02:00
make-ing
3128ac7765 bux fixing issue #67: Chrome now treats the event target attributes like Firefox, so no need for distinction anymore. 2016-05-27 18:17:39 +02:00
clemniem
6ffcaabbeb bugfix #64 renamed update notification to mention mrbeam 2016-05-25 16:04:39 +02:00
make-ing
48f5b659e1 changed back last commit 2016-05-04 16:35:55 +02:00
make-ing
9e95f49461 changed to new grbl.hex file 2016-05-04 16:23:43 +02:00
make-ing
64763e8ce1 added version check again... was missing since the change to comm_acc2.py 2016-05-02 09:57:58 +02:00
make-ing
e7fcb5b228 Merge branch 'nativeserial' into mrbeam 2016-04-18 17:16:28 +02:00
make-ing
020073f3ae Merge branch 'mrbeam' into stable-1.2.2 2016-04-18 14:44:52 +02:00
make-ing
c0e4f123ff Firefox bug fixes 2016-04-18 11:35:28 +02:00
make-ing
94c673473b Merge branch 'mrbeam' into stable-1.2.2 2016-04-15 16:00:28 +02:00
make-ing
974094b907 changed "toElement" to "target" for better cross browser compatibility 2016-04-15 15:53:48 +02:00
make-ing
dc23dac20c fix for the chrome 50 changes where they removed the SVGElement.offset* attributes. 2016-04-15 15:42:04 +02:00
make-ing
ba2716f968 added the Raspberry Pi native serial port ttyAMA* to serialList function 2016-04-13 12:09:39 +02:00
make-ing
a0e685ef1c fixed reset of finished passes bug. 2016-03-21 12:45:50 +01:00
make-ing
cfacbe2610 Merge branch 'stable-1.2.2' into mrbeam-multipass 
Conflicts:
	src/octoprint/static/js/app/viewmodels/printerstate.js
	src/octoprint/util/comm_acc2.py
 2016-03-18 13:38:05 +01:00
make-ing
4da0c3dbe0 added number of passes reset on print start 2016-03-18 13:33:57 +01:00
make-ing
a1d9d2ea7b moved reset override slider functionality to separate method. 
(cherry picked from commit e5c600e)
 2016-03-18 13:28:40 +01:00
make-ing
3201053e16 added multi passes support in backend 2016-03-18 12:24:41 +01:00
make-ing
e5c600e972 moved reset override slider functionality to separate method. 2016-03-17 09:59:49 +01:00
make-ing
d7b5fae614 fixed wrong feedrate and intensity slider bug. On every new print start the sliders are set back to 100%. 2016-03-16 14:16:15 +01:00
make-ing
bf4c9c2105 fixed bug within placeIMG where the picture was to high to fit into the workspace area. 2016-03-15 17:11:54 +01:00