Fix merge conflicts by removing apostrophes from .srt filenames

.git-crypt/keys/default/0/056EA5F1EBAADD98C9A26A270150AFF0563B61F9.gpg

@@ -0,0 +1,3 @@
+<EFBFBD>^<03>n<EFBFBD><11>a<EFBFBD>F
@<40><>20]<5D>6<EFBFBD><36><EFBFBD>
<0A>*<2A><>9Ȕ<39>I<1E><>a?<3F><>?h0i<1B>ZʯW<0B><><EFBFBD><EFBFBD>Y7_<37>avw<76><77><EFBFBD><0F><><EFBFBD>|<7C><><EFBFBD>Ng-<2D><1E>{<7B><>䡝R<E4A19D><52><EFBFBD><EFBFBD>
	<10><>\2<>Z<EFBFBD>|<7C><15>DÉ<R<>=<3D><>匾W<E58CBE>l<EFBFBD>9XJc<4A>=<3D>ݛu<DD9B>0<EFBFBD>q<><71>a_+<>
g<><67>0<EFBFBD>'w;
+q<><71>1fM1w<31>,<2C>щ<EFBFBD>{s3w9x<10>:7Ī<12><10><><EFBFBD>CF<43>si<73><69><EFBFBD>a<1C>?<3F><>21<32>@얡
+a[<5B><><EFBFBD>Y1<59><31>u<EFBFBD>ʻ<CABB><7F>_<EFBFBD>/=<3D><>n<EFBFBD><6E>t`F<1D>q<EFBFBD><71><15><><EFBFBD> )6AcԊ<0F> i<><14>1<EFBFBD>?J{h8j`ۅ<>A<EFBFBD>eޒ<65><DE92>䇮֘O<D698>6

.git-crypt/keys/default/0/3D052C137F67B27702B3A3D755AE33167A5E8BAC.gpg

@@ -0,0 +1 @@
+<EFBFBD>^Nm<4E>	jP<1F>
@dT<64><54>)-<2D>u_<75>b2<62><32>Bi<11><><EFBFBD><EFBFBD><EFBFBD>:<3A>><3E><><EFBFBD>bp0A<30>5,6<><36><EFBFBD>V<0F>
P<><50><EFBFBD><EFBFBD><EFBFBD>Sx<53>
G<><47>K<EFBFBD>BU<07><><EFBFBD>& <20><>A<10>1:<3A><><EFBFBD>)<29><><EFBFBD>

	v<>J<>j<EFBFBD><6A><EFBFBD><EFBFBD>U<EFBFBD>+<2B><><EFBFBD><EFBFBD><19><%!<21>Ct;e<>}3q<><71>o8@<<3C><>`רS
<0A><03>)<29><>,<2C><><EFBFBD><EFBFBD><EFBFBD>繐<03><><EFBFBD>=P<><50>7<EFBFBD><37>'D<><44><EFBFBD><EFBFBD>8<EFBFBD>)<29>W$^P<>)<0F>v<EFBFBD><76>?uZ`<19><15>PܜQ^rw<72><77>^<1C><><EFBFBD> <20><>q_qk<71><6B>*<2A>50<35>Y<04>J<EFBFBD><4A><1D><10>d%<25><><EFBFBD><1A><1D><>s<1E>r<EFBFBD><1D>-<2D><0E>3<EFBFBD><33>/<2F><05><>.D<>tK<74>9t[<5B><>۴C<0F>|<7C>(M<>

.git-crypt/keys/default/0/8DD608D955551A9CB7C471D54C7794EF1595A813.gpg

@@ -0,0 +1,2 @@
+<EFBFBD>
?<3F>Y<EFBFBD>v2t
<07>/<2F>3<17>+<2B>Th<54> bPn<50>q<1E><><1C>o<EFBFBD>|<7C>L<p;<3B>yf<79><66><EFBFBD><EFBFBD>֌<EFBFBD><D68C>a<>7V<37><56>ܙ;<3B><1D>
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD>S:<3A><><EFBFBD><EFBFBD>D,T<><54><EFBFBD><EFBFBD>{$<24><>.@y\񻌹<>N<EFBFBD>F<EFBFBD><Ё#<23><><EFBFBD><EFBFBD>G<EFBFBD><47>N<EFBFBD><4E><EFBFBD>3HW̍h<CC8D>N-<2D>D<EFBFBD>7<EFBFBD>&<26>u<1F><><EFBFBD><EFBFBD>ܑ<EFBFBD>2<EFBFBD><32>Z<EFBFBD><12><0E>ikT<15><><EFBFBD><EFBFBD>)<29>D<EFBFBD>:<3A><>=,<2C><>Ɯ<03>i<EFBFBD>@<40>."<22>YXǫİ"ǩ\<5C>R<EFBFBD>&<26>K<EFBFBD><4B><EFBFBD>F24Aβ<41><CEB2><EFBFBD>2\<5C><><EFBFBD><EFBFBD>7B<37><42>{?4<>lx<6C>=<3D>]<5D><><13>V:/ݬ2<DDAC><32>'q<>K<><4B>R<EFBFBD>S0<53><30>v<EFBFBD>S<EFBFBD>i<EFBFBD>$/<2F><05><><EFBFBD>
n<>+<2B><L<>i<EFBFBD>=y<><79><EFBFBD>g<><1E>Z<04>%2<><32><EFBFBD>L<EFBFBD>{<7B><>!O<><4F><EFBFBD>~Ǩ<><C7A8>E<EFBFBD>.a<>'Î<><C38E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>LQ^<5E>U<EFBFBD>><3E><>z뺆<7A>6`Z_<0E>MU<4D>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>6{<7B>ʦm<CAA6> F<><46><EFBFBD>7T<37>W<EFBFBD>z\<5C>ឆlQ<6C><51><EFBFBD><EFBFBD>|<7C><>}G<1C>!<21><><EFBFBD>ڜ<EFBFBD>I<EFBFBD>Zd<5A>uY<75>`\[	w&<26>֯=<3D>r;<3B><>`<60>㕎/<1F><><EFBFBD>)<<3C><><EFBFBD><02><>o<EFBFBD>oS<6F>ddK%<25><><EFBFBD>

.git-crypt/keys/default/0/956DC77DA080EECF5730FD01FA4B1CAAEB11F2FF.gpg

@@ -0,0 +1 @@
+<EFBFBD>^<03><>H_C~bH
@
<01>zoN賕(<28><><EFBFBD><EFBFBD><EFBFBD>]ƍ*D<><44>F:<3A><><EFBFBD><EFBFBD>YoG0<47><30>yڿ<1D><><EFBFBD><EFBFBD>P/̢8\s,<2C><><19><1F><>
<15>Կ<EFBFBD><D4BF>Z<EFBFBD>q<03>Uu<1A>I<><49>
	7<><37>A}0<>OJF<><46><EFBFBD><1D>h<EFBFBD><68>u%N<>i܁3\<5C>@<40>!<21>&I6<11><>㌧'q5<71>Lj<4C>wQ<0E><><EFBFBD><13><1D><><EFBFBD>s)<29><>@T<12>
<0A>F<EFBFBD><46>V<EFBFBD><56>1<EFBFBD><1C><><08><><EFBFBD>#<23><>
<0A>.<2E><><EFBFBD>0<EFBFBD><30><16><><EFBFBD>Ҁ<EFBFBD><D280>==<3D>$Ň<>TbV<62><56>x%<25>$C<><43><EFBFBD>7<EFBFBD><37>[<5B><>.C<>/<2F>(<28><>2<EFBFBD>y<EFBFBD>r<EFBFBD><72>E<EFBFBD>Y7<><37>u<EFBFBD>p9<70>KL<4B><g<><67>j<EFBFBD>m<><11><>,s<><73><<3C><11><1C><><EFBFBD>:<3A><>

.git-crypt/keys/default/0/B22DDEAAF325799662FFC61B7F761F95CDD8EF94.gpg

@@ -0,0 +1,7 @@
+<EFBFBD>=n<><1E><>+f
<0F>0<EFBFBD><30>J<0B><><EFBFBD>Xo<58><6F>^%<25>ֹW<D6B9>{#P<>Wh<><68><EFBFBD><EFBFBD><EFBFBD><03>
+9<EFBFBD><EFBFBD>&<26><><1A>
<1B><><EFBFBD>P<>"L<>z\<5C>G$!"<22>*%<25>+<2B>"<t<>Bz<42><7A>k<EFBFBD><13><><EFBFBD><EFBFBD>1<EFBFBD>(燠,oSgC<67><14><><EFBFBD><EFBFBD><19><><EFBFBD><EFBFBD>x
<01><>
+<EFBFBD><EFBFBD>
+<EFBFBD>+ŏ<><C58F><EFBFBD>+<2B> <20>X<EFBFBD><58>y#<23><>4<12><>HLXnW><3E>Մ6f<>ьu7<11>JƯ<4A>X<EFBFBD>_Ujh<6A>.<04>*4(<1B><>
<01><>'
<01>n9<6E><39><EFBFBD><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD>
-<2D>A<0B>Oo	<09>6*0l<30>0<EFBFBD>"5<><35><EFBFBD><EFBFBD>:<3A><><EFBFBD>^<5E><>P|<17><>d<EFBFBD>x<EFBFBD>KC<13>j<EFBFBD>w=<3D><>/f<>-<2D>eq<65><71>l<EFBFBD>x:@pC<70>ؒ<EFBFBD>^<03><><EFBFBD>nd%<25>fX><3E>;<3B>:<3A><07><11>ze<7A>&Fڣ;*ޛ<=<3D>r<EFBFBD>lc<6C><63><EFBFBD><EFBFBD>7\2<><16>P!<21>s{M<><4D><EFBFBD><EFBFBD><EFBFBD>jO'<27><04>:X<>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD>
q<>.Kʡ<4B><CAA1>Pk<50>q<EFBFBD>#<23><>J<EFBFBD>l*<2A><>/:<3A>x
j<>6H<36>w<EFBFBD><77>pU<16><><EFBFBD>GȧL<C8A7><4C><EFBFBD>N<EFBFBD><4E><EFBFBD><>u<EFBFBD><12> (<28><>-S<>P<EFBFBD>͓禦<CD93>r<EFBFBD>
+<EFBFBD>5<EFBFBD>ɋv<EFBFBD>A<EFBFBD>+<2B>N<1F>ߟ$7<><37>B<EFBFBD>_H?<3F><><02>VQ<56><51><EFBFBD><EFBFBD><EFBFBD>q<EFBFBD>t<EFBFBD>H昿?<3F>'<27>Y<EFBFBD><59>g<EFBFBD>R<EFBFBD><03><><EFBFBD>ě<15><><EFBFBD>
	<10>:@<40><>DH<44>,PSE<08><>#
<01><>A<EFBFBD>ҡ<EFBFBD><D2A1><EFBFBD>U?7x<18><><EFBFBD><EFBFBD>ع<EFBFBD><D8B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>cs<63><73><EFBFBD><EFBFBD>GX|<7C><>YW<59>.?n<><6E><EFBFBD>H^89%0<><30>S F<>Ϯ<EFBFBD>%<25>CU8<02><><EFBFBD><05>e.<2E><>`<18>5<EFBFBD><35>2`~O<><4F>8<EFBFBD><38>_f<5F>i<EFBFBD><69><EFBFBD> <20>{-Q<>U<><04><><1C>~|<7C><13><1C><><EFBFBD>,><3E><>
+
vĢ<76><C4A2><0F>
+FPpR<70><52>ivId<><64><EFBFBD><EFBFBD><EFBFBD>3#<23>Ǹ<EFBFBD><C7B8>{><3E>n<15><>(<28>Y<EFBFBD><59>~jh<6A>>

.git-crypt/keys/default/0/CD7B104AF4379985EDC9C9401E2F813D88AAF821.gpg

@@ -0,0 +1,3 @@
+<EFBFBD><03><><<3C>n<EFBFBD><6E>a
<0F>-<2D>SD{ܜ=
?\~F<>d1<64>Ø<EFBFBD>_T<5F>E<EFBFBD>E7<45><37><EFBFBD><EFBFBD><EFBFBD>b<62><7F><EFBFBD>%<25>,<2C>lJ)<M?<3F><>ѼC<D1BC><43><EFBFBD>x¦Q<<3C><>^2^<5E>*l<>q<EFBFBD>5<EFBFBD>#X><3E><><14>-<2D><>ȏ<EFBFBD>G(<28>QZ<51>	<09>j<EFBFBD><6A><EFBFBD><EFBFBD>%<25><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e/<2F><><EFBFBD>y$<24><><EFBFBD><EFBFBD>OͲ*<03>-_wʙ\6<>6<EFBFBD>~m<>HС<48><D0A1>Q<EFBFBD>k5p<35><70><EFBFBD>wJTb<07><><02>Ĉ<I<>K7<><37>XڲC4<43>: <20><>촑y<ECB491><79>><3E><><EFBFBD>YS*p
+ㄯ]ųu<C5B3>WX⏔<58><E28F94>J<EFBFBD><4A>7g<37><67><EFBFBD>
Bn<42>ZO<1B>_<10><>U<EFBFBD>;<13><><EFBFBD>;<3B>.<2E><>@<40>m
+n<><6E>(<28>P<0F><><EFBFBD><EFBFBD>o<EFBFBD>b<EFBFBD><62><EFBFBD>8<>+ܾ*w<><77><EFBFBD>@"B<><42><EFBFBD>L<1F><><06>VNg<4E>IPC<50><43>f4	W<><57>L76m#<23>n<EFBFBD><1A>G<EFBFBD>X]{V}#-o<><6F>Y'<Kb<4B><62>4<EFBFBD><19>Q0g<30><+<2B><17>Z޲<5A><DEB2>xF<78>
%tWXou<><75><EFBFBD>Z<EFBFBD>kM<6B><4D>b<EFBFBD>w<EFBFBD><77>zg<7A><0E><15><>PcS<63><53><EFBFBD><EFBFBD><EFBFBD> C<08>Ձ<EFBFBD><D581><EFBFBD>[<5B>xCV<43><56>Ȍ2@Fcf<08>:<3A><><EFBFBD>><3E>)<29>l<EFBFBD><6C>7<EFBFBD>B<EFBFBD>P<EFBFBD>r!<21><>"z'<27>Z<EFBFBD><03><><EFBFBD><EFBFBD><EFBFBD>l79<37>S<>Lw<4C><77> L]<5D><>_<EFBFBD><05>W<EFBFBD>?z<><10>`<0C>}<7D><><EFBFBD>ԟ<EFBFBD><D49F>P<02><>
~<7E><>
	4<>"<22><>ޖ<EFBFBD><DE96><EFBFBD>֣gZ/^ɕÀNI<4E><49><EFBFBD><EFBFBD><14>7<EFBFBD>w<EFBFBD><77><EFBFBD><10><>5<EFBFBD><35><EFBFBD>B<EFBFBD>l)<29><><0B>WK<06>H<EFBFBD>T <_5˼<35>`iN:<3A><>+x><3E><>Xb<0B>.b1<62><31>Z<05>74<15>$/<2F><>v<EFBFBD><76><EFBFBD><EFBFBD>,<2C><>.ܭ<>æOå<4F>ߝҖaa<><61><EFBFBD>c<06><>+lߤ<6C><DFA4><EFBFBD>wc<77>ESy<53><79><EFBFBD><EFBFBD>o<EFBFBD><6F>^<5E>,<2C>ei85<38><1B>V<EFBFBD><56>o<>is<69>b<EFBFBD><62><EFBFBD>NL^<5E>!<21>Q<EFBFBD><51><EFBFBD><EFBFBD><1F>&<26><><EFBFBD>L<EFBFBD><4C>i<EFBFBD>

.gitignore

@@ -2,3 +2,6 @@
 *.blend1
 Content
 /add in the future.md
+/_Marketing
+/*.ffs_lock
+_admin

131000_20250630_1310 - Style drawings based on the materials category and layers material name/You can now style the layers via the layers category.url

@@ -0,0 +1,6 @@
+[InternetShortcut]
+URL=https://github.com/IfcOpenShell/IfcOpenShell/commit/21137b926885e6a9a1aca449bf6297d2cf62c8f7
+IDList=
+HotKey=0
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,11

_Setup/Install Git.md

@@ -165,13 +165,20 @@ To check your configuration:
 
 - A few Windows configurations.  These are important as some of the videos have long names, and this will trigger an error when cloning the repo. Run [Git Bash, CMD, or Powershell](Open%20Command%20Prompt%20or%20Git%20Bash.md#windows) (as the administrator)
 
+    >  Make sure you open Git Bash, CMD, or Powershell **as the administrator**.
+
     1. Tell Windows to enable long file paths system-wide
-        - If CMD or Powershell:
-            -  `reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1 /f`
-        - If Git Bash:
-            - `cmd.exe /c "reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1 /f"`
-    
-        #### The following commands work in either Git Bash, CMD, or Powershell
+        - 2 options
+            - If CMD or Powershell:
+                -  `reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1 /f`
+            - If Git Bash:
+                - `cmd.exe /c "reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1 /f"`
+        - To manually verify.
+            - Go to start menu and type 'regedit'
+            - Navigate to `Computer\HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem`
+            - Right click on `LongPathsEnabled`. It should read as the following value, if not, change it to `1`. 
+                - Value data = `1`
+
 
     2. `git config --system core.longpaths true`
        <!-- - Long answer [here](https://stackoverflow.com/questions/22575662/filename-too-long-in-git-for-windows/22575737#22575737) -->

readme.md

@@ -143,11 +143,49 @@ The tutorials series also covers integrating, an always evolving, open source se
 *We are using [OpenCollective](https://opencollective.com/openingdesign/projects/blender_bonsai_tutorials_od) to manage payments/contributions.*
 
 
+---
 
-----------
 
-<br>
-<br>
+### Testimonials
+
+A few kind words about the tutorial series...
+
+- *"Simply the best practical, pragmatic approach to get started fast and efficiently in Bonsai with Blender."*
+[Vicente Reiriz](https://www.linkedin.com/in/vicentereiriz/)  
+ 
+- *"Watching these tutorials and finding out the countless tips hidden all the way through them, you can feel and benefit from the passion of a knowledgeable architect that masters both Blender and Bonsai."*  
+[Davide Tonelli](https://www.linkedin.com/in/davide-tonelli-8b295096/)  
+ 
+- *"... you'll get a great overview of what Bonsai is already capable of. You can learn tons of insider tricks and practice by completing the delivered file"* 
+Zoomer  
+ 
+- *"Extremely helpful, it obviously took a lot of effort to put all this together. Well done. Excellent piece of work, easy to consume in small bites or large, and also easy to navigate to areas of interest."*
+[Michael Hund](https://www.linkedin.com/in/michael-hund-a80025224/)
+
+- *"videos are very easy to follow and make it simple to start getting real value from the material right away."*
+[Luis Enrique Torres Ruiz](https://www.linkedin.com/in/luis-enrique-torres-ruiz-51727816a/)
+
+- *"This is really the best resource I've come across after weeks of searching"* 
+[Doug Scoular](https://www.linkedin.com/in/dscoular/)
+
+
+Full testimonials can be found here: https://community.osarch.org/discussion/comment/26449/#Comment_26449
+
+
+---
+
+
+### Example Videos
+
+If you want to get a sense of the content, I shared a few of these videos on the [OSArch forum](https://community.osarch.org/categories/general) and Github. 
+
+- https://community.osarch.org/discussion/comment/24914/#Comment_24914
+- https://community.osarch.org/discussion/comment/24988#Comment_24988
+- https://community.osarch.org/discussion/comment/25507/#Comment_25507
+- https://community.osarch.org/discussion/comment/26275/#Comment_26275
+- https://community.osarch.org/discussion/comment/26420/#Comment_26420
+- https://github.com/IfcOpenShell/IfcOpenShell/issues/7070#issuecomment-3238134343
+- https://github.com/IfcOpenShell/IfcOpenShell/discussions/7002#discussioncomment-14024574
 
 ### Want to Contribute?
 
@@ -166,6 +204,8 @@ The attached video shows the evolution of the model throughout the tutorial seri
 ![](https://hub.openingdesign.com/OpeningDesign/Bonsai_Tutorials/raw/branch/main/_Model/Animation/final%20video.gif)
 
 
+---
+
 ### License
 
 All content (except for the encrypted videos) is released under the [Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)](https://creativecommons.org/licenses/by-sa/4.0/) license.