GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-29 01:31:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,822 Commits 65 Branches 55 Tags
Commit Graph

76 Commits

Author SHA1 Message Date
Joseph Lenox
acdf25cb15 actually get to the path 2018-08-19 19:53:50 -05:00
Joseph Lenox
8fefac8d61 set SLIC3R_DIR properly? 2018-08-19 19:51:41 -05:00
Joseph Lenox
0eaf610875 go back to gcc49 2018-07-26 21:39:17 -05:00
Joseph Lenox
3b52855497 use gcc7 perlbrew 2018-07-26 20:45:57 -05:00
Joseph Lenox
a9b3b0ab7f Merge remote-tracking branch 'thethirdone/Scene3D' into test-merge-thethirdone-3d-plater 
# Conflicts:
#	.gitignore
#	.travis.yml
#	README.md
#	package/linux/travis-setup.sh
#	src/CMakeLists.txt
#	src/GUI/ColorScheme/Default.hpp
#	src/GUI/Plater.cpp
#	src/GUI/Plater/Plate2D.cpp
#	src/GUI/Plater/Plate3D.hpp
#	src/GUI/Plater/Preview3D.hpp
#	src/GUI/Preset.hpp
#	src/GUI/misc_ui.cpp
#	src/GUI/misc_ui.hpp
#	src/slic3r.cpp
#	src/test/GUI/test_field_checkbox.cpp
#	xs/src/libslic3r/Config.cpp
#	xs/src/libslic3r/Config.hpp
#	xs/src/libslic3r/ConfigBase.cpp
#	xs/src/libslic3r/ConfigBase.hpp
#	xs/src/libslic3r/Log.hpp
 2018-07-17 17:35:05 -05:00
Joseph Lenox
5053a52562 add WXVERSION back in 2018-07-11 22:14:51 -05:00
Joseph Lenox
67c65cce94 Use old packaging system instead of new packaging (REVERT THIS LATER) 2018-07-11 22:14:51 -05:00
Joseph Lenox
fa382ebd70 Put build system into a hybrid. 2018-07-11 22:14:51 -05:00
Joseph Lenox
a5df41042f Revert "Put build system back the way it was so we don't break things when merging in cppgui stuff" 
This reverts commit 961dd6b06fba9ce7f2fd46e52db241e256531f4a.
 2018-07-11 22:14:51 -05:00
Joseph Lenox
667af0be2a Put build system back the way it was so we don't break things when merging in cppgui stuff 2018-07-11 22:14:51 -05:00
Joseph Lenox
0facb7dcb2 Update pushed to main travis file. 
Quiet down wxmac install as well.
 2018-07-11 22:14:51 -05:00
Joseph Lenox
093a621187 Make brew louder so that it doesn't trip Travis timeouts. 2018-07-11 22:14:51 -05:00
Joseph Lenox
017e3af98d Issue brew update before install. 2018-07-11 22:14:51 -05:00
Joseph Lenox
d1d75c4c0f ... 2018-07-11 22:14:51 -05:00
Joseph Lenox
6ea42b2aae Fix boost download and travis 2018-07-11 22:14:51 -05:00
Joseph Lenox
a8b51536bd fix bash 2018-07-11 22:14:51 -05:00
Joseph Lenox
1fd6558c66 setting envionment variables via matrix 2018-07-11 22:14:51 -05:00
Joseph Lenox
9bbee7a627 try homebrew 2018-07-11 22:14:51 -05:00
Joseph Lenox
720d4f1571 made download more flexible. 2018-07-11 22:14:51 -05:00
Joseph Lenox
cb07da66c7 Build wx and cache the build dir instead of the installdir. Also add it to PATH so that wx-config will be found. 2018-07-11 22:14:51 -05:00
Joseph Lenox
49f41e55d4 wrong argument to tar 2018-07-11 22:14:51 -05:00
Joseph Lenox
310301e964 Build wxwidgets on osx if it's not cached. 2018-07-11 22:14:51 -05:00
Joseph Lenox
687a814c11 push CXX and CC to a subscript. 2018-07-11 22:14:51 -05:00
Joseph Lenox
afaf0889e7 Oops, forgot a ] 2018-07-11 22:14:51 -05:00
Joseph Lenox
26f875f161 try to build on both linux and osx with travis 2018-07-11 22:14:51 -05:00
Joseph Lenox
b8c34866f0 fix the startup script to point at the binary. 2018-07-11 22:14:51 -05:00
Joseph Lenox
ef9a0871d1 ripped out most of the perl-dependent stuff from Slic3r's archive build script on Linux (do less useless stuff on Travis). 2018-07-11 22:14:51 -05:00
Joseph Lenox
919345ada4 Tweaks; removing perl deps from travis. 2018-07-11 22:14:51 -05:00
Joseph Lenox
708c6d0b74 ... 2018-05-13 23:14:28 -05:00
Joseph Lenox
86b98c4eb6 Fix boost download and travis 2018-05-13 22:52:01 -05:00
Joseph Lenox
cb6264afde fix bash 2018-05-13 22:39:06 -05:00
Joseph Lenox
e07dfdf54f setting envionment variables via matrix 2018-05-13 22:26:10 -05:00
Joseph Lenox
86b0d18a2e try homebrew 2018-05-13 13:43:03 -05:00
Joseph Lenox
dd90924578 made download more flexible. 2018-05-13 12:41:42 -05:00
Joseph Lenox
3f77c838b8 Build wx and cache the build dir instead of the installdir. Also add it to PATH so that wx-config will be found. 2018-05-13 12:33:22 -05:00
Joseph Lenox
685ed01ac6 wrong argument to tar 2018-05-13 11:58:24 -05:00
Joseph Lenox
437c4f8cf3 Build wxwidgets on osx if it's not cached. 2018-05-13 11:55:55 -05:00
Joseph Lenox
86b620d8a0 push CXX and CC to a subscript. 2018-05-13 11:25:50 -05:00
Joseph Lenox
9474e2bbc0 Oops, forgot a ] 2018-05-13 11:20:09 -05:00
Joseph Lenox
8558050979 try to build on both linux and osx with travis 2018-05-13 11:14:58 -05:00
Jacob Greenfield
4fa6251dd5 Pillar config (#4410) 
Implements workaround for #4407 

* Added support for pillar size configuration.
* Pillars UI fix
* Pillar configuration fix
* Fixed misspelled variable name.
* Strings are not numbers.
* Fixed pillar spacing label.
 2018-05-12 20:03:50 -05:00
Joseph Lenox
a73366b00e fix the startup script to point at the binary. 2018-05-05 00:16:44 -05:00
Joseph Lenox
25d9c110a6 ripped out most of the perl-dependent stuff from Slic3r's archive build script on Linux (do less useless stuff on Travis). 2018-05-04 23:41:39 -05:00
Joseph Lenox
108fc93fce Tweaks; removing perl deps from travis. 2018-04-29 12:56:17 -05:00
efa
dc9d7ed70f Now work as startup script from every directory, also if runt from a link in /usr/bin, with spaces, or from a desktop shortcut (#4266) 2018-01-21 16:16:28 -06:00
Joseph Lenox
19ea7a596a
Long retract support in marlin and repetier for FW retract. (#4108) 
* For reprap (really Marlin) or Repetier flavors and a toolchange retract, produce G10 S1 instead of G10.

Also refactored comments (were getting eaten by fw retract)

* Fixed tests to check for correct retract gcode output.

* Better reference to scalar.

* Added config checks for if fw tool retracts are in place and firmware is repetier/marlin, disable the advanced option.

* Disable z lift if firmware retraction is enabled.

* With gcode comments on, indicates which extruder Slic3r thinks it is retracting/unretracting.
 2018-01-08 15:08:30 -06:00
Joseph Lenox
d6469b284a Added --no-gui flag to force CLI usage (allows for CLI usage with AppImage build). 
Forced --gui flag in AppImage build.
 2017-09-02 13:36:20 -05:00
Joseph Lenox
66074f5398 Merge pull request #4110 from probonopd/patch-2 
Fix Version= key
 2017-09-02 10:16:31 -05:00
Joseph Lenox
5da256283d Removed Version (which was improperly used). Fixes #4109 2017-09-02 10:12:57 -05:00
probonopd
eba7d99d53 Fix Version= key 
Closes #4109
 2017-09-02 17:07:44 +02:00