Merge branch 'gh-pages' of github.com:n0sr3v/SLAcer.js into gh-pages

lautr3k · Mar 4, 2018 · 0e46fd0b39fce476addf34f8afa79d3be061a9f4 · 0e46fd0
2 parents 4bcc1fc + b219d3d
commit 0e46fd0b39fce476addf34f8afa79d3be061a9f4
Unified Split

Showing with 4 additions and 3 deletions.

+2 −1 index.html

+2 −2 js/main.js
diff --git a/index.html b/index.html
@@ -21,11 +21,12 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="#">SLAcer.js for SparkMaker (bêta)</a>
+                    <a class="navbar-brand" href="#">SLAcer.js for SparkMaker (beta)</a>
                 </div>
                 <div id="navbar" class="navbar-collapse collapse">
                     <ul class="nav navbar-nav navbar-right">
                         <li><a href="#">About</a></li>
+                        <li><a href="https://www.thingiverse.com/groups/sparkmaker/forums/gadgets/topic:28168">Thingiverse</a></li>
                         <li><a href="https://github.com/n0sr3v/SLAcer.js">GitHub (Fork)</a></li>
                         <li><a href="https://github.com/lautr3k/SLAcer.js">GitHub</a></li>
                     </ul>

diff --git a/js/main.js b/js/main.js
@@ -1291,9 +1291,9 @@ loader.onError = errorHandler;
 // -----------------------------------------------------------------------------
 // example STL file
 //var stl = 'stl/Octocat-v2.stl';
-//var stl = 'stl/StressTest.stl';
+var stl = 'stl/StressTest.stl';
 //var stl = 'stl/SLAcer.stl';
-var stl = 'stl/SparkMaker.stl';
+//var stl = 'stl/SparkMaker.stl';
 
 
 // File url