mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-11-01 05:01:10 -06:00
Merge branch 'master' into plater2
Conflicts: lib/Slic3r/GUI/Plater.pm
This commit is contained in:
commit
5b734f4a13
13 changed files with 292 additions and 72 deletions
2
Build.PL
2
Build.PL
|
|
@ -30,7 +30,7 @@ my %recommends = qw(
|
|||
);
|
||||
if (defined $ARGV[0] && $ARGV[0] eq '--gui') {
|
||||
%prereqs = qw(
|
||||
Wx 0.9901
|
||||
Wx 0.9918
|
||||
);
|
||||
%recommends = qw(
|
||||
Wx::GLCanvas 0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue