Merge branch '0.9.11-beta'

jon-harper · Mar 15, 2024 · 2f7db23 · 2f7db23
2 parents 7d0de21 + 41e5942
commit 2f7db23
Show file tree

Hide file tree

Showing 249 changed files with 669,217 additions and 54,101 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 /site
 *.bat
+__*/
+*.pyc
diff --git a/Core/Base/36mm HSI/Front/Base - 36mm Front - Basic HSI.stl b/Core/Base/36mm HSI/Front/Base - 36mm Front - Basic HSI.stl
diff --git a/Core/Base/36mm HSI/Front/Base - 36mm Front - HSI with Rocker.stl b/Core/Base/36mm HSI/Front/Base - 36mm Front - HSI with Rocker.stl
diff --git a/Core/Base/36mm HSI/Front/Base - 36mm Front - HSI with Toggle.stl b/Core/Base/36mm HSI/Front/Base - 36mm Front - HSI with Toggle.stl
diff --git a/Core/Base/36mm HSI/Rear/Base - 36mm Rear - Basic HSI.stl b/Core/Base/36mm HSI/Rear/Base - 36mm Rear - Basic HSI.stl
diff --git a/Core/Base/36mm HSI/Rear/Base - 36mm Rear - IEC HSI.stl b/Core/Base/36mm HSI/Rear/Base - 36mm Rear - IEC HSI.stl
diff --git a/Core/Base/36mm HSI/Unified/Base - 36mm Unified - Basic HSI.stl b/Core/Base/36mm HSI/Unified/Base - 36mm Unified - Basic HSI.stl
diff --git a/Core/Base/36mm HSI/Unified/Base - 36mm Unified - IEC HSI with Rocker.stl b/Core/Base/36mm HSI/Unified/Base - 36mm Unified - IEC HSI with Rocker.stl
diff --git a/Core/Base/36mm HSI/Unified/Base - 36mm Unified - IEC HSI with Toggle.stl b/Core/Base/36mm HSI/Unified/Base - 36mm Unified - IEC HSI with Toggle.stl
diff --git a/Core/Base/36mm HSI/Unified/Base - 36mm Unified - IEC HSI.stl b/Core/Base/36mm HSI/Unified/Base - 36mm Unified - IEC HSI.stl
diff --git a/Core/Base/36mm Stock/Front/Base - 36mm Front - Basic Stock.stl b/Core/Base/36mm Stock/Front/Base - 36mm Front - Basic Stock.stl
diff --git a/Core/Base/36mm Stock/Front/Base - 36mm Front - Stock with Rocker.stl b/Core/Base/36mm Stock/Front/Base - 36mm Front - Stock with Rocker.stl
diff --git a/Core/Base/36mm Stock/Front/Base - 36mm Front - Stock with Toggle.stl b/Core/Base/36mm Stock/Front/Base - 36mm Front - Stock with Toggle.stl
diff --git a/Core/Base/36mm Stock/Rear/Base - 36mm Rear - Basic Stock.stl b/Core/Base/36mm Stock/Rear/Base - 36mm Rear - Basic Stock.stl
diff --git a/Core/Base/36mm Stock/Rear/Base - 36mm Rear - IEC Stock.stl b/Core/Base/36mm Stock/Rear/Base - 36mm Rear - IEC Stock.stl
diff --git a/Core/Base/36mm Stock/Unified/Base - 36mm Unified - Basic Stock.stl b/Core/Base/36mm Stock/Unified/Base - 36mm Unified - Basic Stock.stl
diff --git a/Core/Base/36mm Stock/Unified/Base - 36mm Unified - IEC Stock with Rocker.stl b/Core/Base/36mm Stock/Unified/Base - 36mm Unified - IEC Stock with Rocker.stl
diff --git a/Core/Base/36mm Stock/Unified/Base - 36mm Unified - IEC Stock with Toggle.stl b/Core/Base/36mm Stock/Unified/Base - 36mm Unified - IEC Stock with Toggle.stl
diff --git a/Core/Base/36mm Stock/Unified/Base - 36mm Unified - IEC Stock.stl b/Core/Base/36mm Stock/Unified/Base - 36mm Unified - IEC Stock.stl
diff --git a/Core/Base/42mm HSI/Front/Base - 42mm Front - Basic HSI.stl b/Core/Base/42mm HSI/Front/Base - 42mm Front - Basic HSI.stl
diff --git a/Core/Base/42mm HSI/Front/Base - 42mm Front - HSI with Rocker.stl b/Core/Base/42mm HSI/Front/Base - 42mm Front - HSI with Rocker.stl
diff --git a/Core/Base/42mm HSI/Front/Base - 42mm Front - HSI with Toggle.stl b/Core/Base/42mm HSI/Front/Base - 42mm Front - HSI with Toggle.stl
diff --git a/Core/Base/42mm HSI/Rear/Base - 42mm Rear - Basic HSI.stl b/Core/Base/42mm HSI/Rear/Base - 42mm Rear - Basic HSI.stl
diff --git a/Core/Base/42mm HSI/Rear/Base - 42mm Rear - IEC HSI.stl b/Core/Base/42mm HSI/Rear/Base - 42mm Rear - IEC HSI.stl
diff --git a/Core/Base/42mm HSI/Unified/Base - 42mm Unified - Basic HSI.stl b/Core/Base/42mm HSI/Unified/Base - 42mm Unified - Basic HSI.stl
diff --git a/Core/Base/42mm HSI/Unified/Base - 42mm Unified - IEC HSI with Rocker.stl b/Core/Base/42mm HSI/Unified/Base - 42mm Unified - IEC HSI with Rocker.stl
diff --git a/Core/Base/42mm HSI/Unified/Base - 42mm Unified - IEC HSI with Toggle.stl b/Core/Base/42mm HSI/Unified/Base - 42mm Unified - IEC HSI with Toggle.stl
diff --git a/Core/Base/42mm HSI/Unified/Base - 42mm Unified - IEC HSI.stl b/Core/Base/42mm HSI/Unified/Base - 42mm Unified - IEC HSI.stl
diff --git a/Core/Base/42mm Stock/Front/Base - 42mm Front - Basic Stock.stl b/Core/Base/42mm Stock/Front/Base - 42mm Front - Basic Stock.stl
diff --git a/Core/Base/42mm Stock/Front/Base - 42mm Front - Stock with Rocker.stl b/Core/Base/42mm Stock/Front/Base - 42mm Front - Stock with Rocker.stl
diff --git a/Core/Base/42mm Stock/Front/Base - 42mm Front - Stock with Toggle.stl b/Core/Base/42mm Stock/Front/Base - 42mm Front - Stock with Toggle.stl
diff --git a/Core/Base/42mm Stock/Rear/Base - 42mm Rear - Basic Stock.stl b/Core/Base/42mm Stock/Rear/Base - 42mm Rear - Basic Stock.stl
diff --git a/Core/Base/42mm Stock/Rear/Base - 42mm Rear - IEC Stock.stl b/Core/Base/42mm Stock/Rear/Base - 42mm Rear - IEC Stock.stl
diff --git a/Core/Base/42mm Stock/Unified/Base - 42mm Unified - Basic Stock.stl b/Core/Base/42mm Stock/Unified/Base - 42mm Unified - Basic Stock.stl
diff --git a/Core/Base/42mm Stock/Unified/Base - 42mm Unified - IEC Stock with Rocker.stl b/Core/Base/42mm Stock/Unified/Base - 42mm Unified - IEC Stock with Rocker.stl
diff --git a/Core/Base/42mm Stock/Unified/Base - 42mm Unified - IEC Stock with Toggle.stl b/Core/Base/42mm Stock/Unified/Base - 42mm Unified - IEC Stock with Toggle.stl
diff --git a/Core/Base/42mm Stock/Unified/Base - 42mm Unified - IEC Stock.stl b/Core/Base/42mm Stock/Unified/Base - 42mm Unified - IEC Stock.stl
diff --git a/Core/Base/Extension Shim/10mm/Front Extension - 10mm.stl b/Core/Base/Extension Shim/10mm/Front Extension - 10mm.stl
diff --git a/Core/Base/Extension Shim/10mm/Rear Extension - 10mm.stl b/Core/Base/Extension Shim/10mm/Rear Extension - 10mm.stl
diff --git a/Core/Base/Extension Shim/10mm/Unified Extension - 10mm.stl b/Core/Base/Extension Shim/10mm/Unified Extension - 10mm.stl
diff --git a/Core/Base/Extension Shim/13mm/Front Extension - 13mm.stl b/Core/Base/Extension Shim/13mm/Front Extension - 13mm.stl
diff --git a/Core/Base/Extension Shim/13mm/Rear Extension - 13mm.stl b/Core/Base/Extension Shim/13mm/Rear Extension - 13mm.stl
diff --git a/Core/Base/Extension Shim/13mm/Unified Extension - 13mm.stl b/Core/Base/Extension Shim/13mm/Unified Extension - 13mm.stl
diff --git a/Core/Base/Front/Base - Front - Full HSI.stl b/Core/Base/Front/Base - Front - Full HSI.stl
diff --git a/Core/Base/Front/Base - Front - Stock - Rocker Switch.stl b/Core/Base/Front/Base - Front - Stock - Rocker Switch.stl
diff --git a/Core/Base/Front/Base - Front - Stock - Toggle Switch.stl b/Core/Base/Front/Base - Front - Stock - Toggle Switch.stl
diff --git a/Core/Base/Rear/Base - Rear - Full HSI.stl b/Core/Base/Rear/Base - Rear - Full HSI.stl
diff --git a/Core/Base/Rear/Base - Rear - HSI.stl b/Core/Base/Rear/Base - Rear - HSI.stl
diff --git a/Core/Base/Rear/Base - Rear - Stock.stl b/Core/Base/Rear/Base - Rear - Stock.stl
diff --git a/Core/Base/Unified/Base - Unified - HSI.stl b/Core/Base/Unified/Base - Unified - HSI.stl
diff --git a/Core/Base/Unified/Base - Unified - Stock.stl b/Core/Base/Unified/Base - Unified - Stock.stl
diff --git a/Core/Base/Unified/Base - Unified Extended - HSI.stl b/Core/Base/Unified/Base - Unified Extended - HSI.stl
diff --git a/Core/Main Body/Crossbar/Main Body - Crossbar - HSI.stl b/Core/Main Body/Crossbar/Main Body - Crossbar - HSI.stl
diff --git a/Core/Main Body/Crossbar/Main Body - Crossbar - Stock.stl b/Core/Main Body/Crossbar/Main Body - Crossbar - Stock.stl
diff --git a/Core/Main Body/Front/Main Body - Front - Full HSI.stl b/Core/Main Body/Front/Main Body - Front - Full HSI.stl
diff --git a/Core/Main Body/Front/Main Body - Front - HSI.stl b/Core/Main Body/Front/Main Body - Front - HSI.stl
diff --git a/Core/Main Body/Front/Main Body - Front - Stock.stl b/Core/Main Body/Front/Main Body - Front - Stock.stl
diff --git a/Core/Main Body/Rear/Main Body - Rear - Full HSI.stl b/Core/Main Body/Rear/Main Body - Rear - Full HSI.stl
diff --git a/Core/Main Body/Rear/Main Body - Rear - HSI - No Fans.stl b/Core/Main Body/Rear/Main Body - Rear - HSI - No Fans.stl
diff --git a/Core/Main Body/Rear/Main Body - Rear - HSI - Quad 40mm Fans.stl b/Core/Main Body/Rear/Main Body - Rear - HSI - Quad 40mm Fans.stl
diff --git a/Core/Main Body/Rear/Main Body - Rear - HSI.stl b/Core/Main Body/Rear/Main Body - Rear - HSI.stl
diff --git a/Core/Main Body/Rear/Main Body - Rear - Stock - No Fans.stl b/Core/Main Body/Rear/Main Body - Rear - Stock - No Fans.stl
diff --git a/Core/Main Body/Rear/Main Body - Rear - Stock - Quad 40mm Fans.stl b/Core/Main Body/Rear/Main Body - Rear - Stock - Quad 40mm Fans.stl
diff --git a/Core/Main Body/Rear/Main Body - Rear - Stock.stl b/Core/Main Body/Rear/Main Body - Rear - Stock.stl
diff --git a/Core/Main Body/Unified/Main Body - Unified - Full HSI.stl b/Core/Main Body/Unified/Main Body - Unified - Full HSI.stl
diff --git a/Core/Main Body/Unified/Main Body - Unified - HSI.stl b/Core/Main Body/Unified/Main Body - Unified - HSI.stl
diff --git a/Core/Main Body/Unified/Main Body - Unified - Stock.stl b/Core/Main Body/Unified/Main Body - Unified - Stock.stl
diff --git a/Fans/50x10/5010 Fan.step b/Fans/50x10/5010 Fan.step
diff --git a/Fans/50x10/Fan Cage.stl b/Fans/50x10/Fan Cage.stl
diff --git a/Fans/50x10/TPU Gasket.stl b/Fans/50x10/TPU Gasket.stl
diff --git a/Fans/50x15/5015 Fan.step b/Fans/50x15/5015 Fan.step
diff --git a/Fans/50x15/Fan Cage.stl b/Fans/50x15/Fan Cage.stl
diff --git a/Fans/50x15/TPU Gasket.stl b/Fans/50x15/TPU Gasket.stl
diff --git a/...l/Closed/Front Bottom Panel - Closed.step → ...2/Closed/Front Bottom Panel - Closed.step b/...l/Closed/Front Bottom Panel - Closed.step → ...2/Closed/Front Bottom Panel - Closed.step
diff --git a/...el/Closed/Front Bottom Panel - Closed.stl → ...V2/Closed/Front Bottom Panel - Closed.stl b/...el/Closed/Front Bottom Panel - Closed.stl → ...V2/Closed/Front Bottom Panel - Closed.stl
diff --git a/...el/Closed/Rear Bottom Panel - Closed.step → ...V2/Closed/Rear Bottom Panel - Closed.step b/...el/Closed/Rear Bottom Panel - Closed.step → ...V2/Closed/Rear Bottom Panel - Closed.step
diff --git a/...nel/Closed/Rear Bottom Panel - Closed.stl → .../V2/Closed/Rear Bottom Panel - Closed.stl b/...nel/Closed/Rear Bottom Panel - Closed.stl → .../V2/Closed/Rear Bottom Panel - Closed.stl
diff --git a/...m Panel/Hex/Front Bottom Panel - Hex.step → ...anel/V2/Hex/Front Bottom Panel - Hex.step b/...m Panel/Hex/Front Bottom Panel - Hex.step → ...anel/V2/Hex/Front Bottom Panel - Hex.step
diff --git a/...om Panel/Hex/Front Bottom Panel - Hex.stl → ...Panel/V2/Hex/Front Bottom Panel - Hex.stl b/...om Panel/Hex/Front Bottom Panel - Hex.stl → ...Panel/V2/Hex/Front Bottom Panel - Hex.stl
diff --git a/...om Panel/Hex/Rear Bottom Panel - Hex.step → ...Panel/V2/Hex/Rear Bottom Panel - Hex.step b/...om Panel/Hex/Rear Bottom Panel - Hex.step → ...Panel/V2/Hex/Rear Bottom Panel - Hex.step
diff --git a/...tom Panel/Hex/Rear Bottom Panel - Hex.stl → ... Panel/V2/Hex/Rear Bottom Panel - Hex.stl b/...tom Panel/Hex/Rear Bottom Panel - Hex.stl → ... Panel/V2/Hex/Rear Bottom Panel - Hex.stl
diff --git a/...m Panel/LRS Series/Front Bottom Panel.stl → ...anel/V2/LRS Series/Front Bottom Panel.stl b/...m Panel/LRS Series/Front Bottom Panel.stl → ...anel/V2/LRS Series/Front Bottom Panel.stl
diff --git a/...om Panel/LRS Series/Rear Bottom Panel.stl → ...Panel/V2/LRS Series/Rear Bottom Panel.stl b/...om Panel/LRS Series/Rear Bottom Panel.stl → ...Panel/V2/LRS Series/Rear Bottom Panel.stl
diff --git a/...Template/Bottom Panels - Template v2.step → ...Template/Bottom Panels - Template v2.step b/...Template/Bottom Panels - Template v2.step → ...Template/Bottom Panels - Template v2.step
diff --git a/Panels/Bottom Panel/V3/Blank/Bottom Panel V3 - Blank Front.stl b/Panels/Bottom Panel/V3/Blank/Bottom Panel V3 - Blank Front.stl
diff --git a/Panels/Bottom Panel/V3/Blank/Bottom Panel V3 - Blank Rear.stl b/Panels/Bottom Panel/V3/Blank/Bottom Panel V3 - Blank Rear.stl
diff --git a/Panels/Bottom Panel/V3/Blank/Bottom Panel V3 - Blank Unified.stl b/Panels/Bottom Panel/V3/Blank/Bottom Panel V3 - Blank Unified.stl
diff --git a/Panels/Bottom Panel/V3/Hexagons/Bottom Panel V3 - Hexagons Front.stl b/Panels/Bottom Panel/V3/Hexagons/Bottom Panel V3 - Hexagons Front.stl
diff --git a/Panels/Bottom Panel/V3/Hexagons/Bottom Panel V3 - Hexagons Rear.stl b/Panels/Bottom Panel/V3/Hexagons/Bottom Panel V3 - Hexagons Rear.stl
diff --git a/Panels/Bottom Panel/V3/Hexagons/Bottom Panel V3 - Hexagons Unified.stl b/Panels/Bottom Panel/V3/Hexagons/Bottom Panel V3 - Hexagons Unified.stl
-Original file line number
+Diff line change
@@ -1,2 +1,4 @@
     /site
     *.bat
+    __*/
+    *.pyc