diff --git a/AEC Literature/A10 Foundations/A1010 Standard Foundations/2017_UBC_Foundation_Repair_Code.pdf b/AEC Literature/A10 Foundations/A1010 Standard Foundations/2017_UBC_Foundation_Repair_Code.pdf new file mode 100644 index 0000000..f373adc Binary files /dev/null and b/AEC Literature/A10 Foundations/A1010 Standard Foundations/2017_UBC_Foundation_Repair_Code.pdf differ diff --git a/BIM/IFC/OD_importIFCClassMapping.txt b/BIM/IFC/OD_importIFCClassMapping.txt index 270e0be..f9e8b1f 100644 --- a/BIM/IFC/OD_importIFCClassMapping.txt +++ b/BIM/IFC/OD_importIFCClassMapping.txt @@ -121,12 +121,12 @@ IfcSanitaryTerminalType Plumbing Fixtures IfcSensor Specialty Equipment IfcSensorType Specialty Equipment IfcSite Site -IfcSlab Generic Models +IfcSlab Floors IfcSlab BASESLAB Structural Foundations IfcSlab FLOOR Floors IfcSlab LANDING Stairs Landings IfcSlab ROOF Roofs -IfcSlabType Generic Models +IfcSlabType Floors IfcSlabType BASESLAB Structural Foundations IfcSlabType FLOOR Floors IfcSlabType LANDING Stairs Landings diff --git a/BIM/OD_Revit_Template - 2020.rte b/BIM/OD_Revit_Template - 2020.rte index e62fcf8..cac6ca5 100644 Binary files a/BIM/OD_Revit_Template - 2020.rte and b/BIM/OD_Revit_Template - 2020.rte differ diff --git a/BIM/Workflow/OD Workflows.md b/BIM/Workflow/OD Workflows.md index 3057cd8..f6ee84a 100644 --- a/BIM/Workflow/OD Workflows.md +++ b/BIM/Workflow/OD Workflows.md @@ -1,5 +1,6 @@ ### Setting Up the Chat App + - We use [Element.io](https://element.io/) as our main chat app. Each OpeningDesign project has it's own dedicated 'room'. - If you go [here](https://gitlab.com/openingdesign) you can see a list of current and past projects and their associated chat rooms. @@ -9,14 +10,17 @@ - Element has apps for Web, Android, iOS, macOS, Windows & Linux - Search and connect with ```@theoryshaw:matrix.org``` (Ryan Schultz) + ### File Management on Windows + - If you use a file syncing software like Dropbox, and plan to sync OpeningDesign files to multiple machines (tower, laptop, etc.) make sure the path where the files are synced is the same. - Examples: - Laptop: `D:\Dropbox\...` - Tower: `D:\Dropbox\...` + - download favorite text editor - example: [Atom.io](https://atom.io/) @@ -25,6 +29,7 @@ - ![](imgs/admin_atom.png) + - Install **Git** for Windows - Download from [git-scm.com/download](https://git-scm.com/download) @@ -49,6 +54,7 @@ - Ignore experimental options - Click Finish to complete the install. + - A few Windows configurations... - Set longpath on windows @@ -71,6 +77,7 @@ 5. `git config --global http.postBuffer 1048576000` - Long answer [here](https://stackoverflow.com/a/6849424/414643) + - Create accounts at... - Gitlab: go to https://gitlab.com/users/sign_up to create an account @@ -81,6 +88,7 @@ - Github: go to https://github.com/join to create an account - Then set up Personal Access Token [here](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token) + - Download and install https://tortoisegit.org/download/ - TortoiseGitPlink based on PuTTY... @@ -96,20 +104,27 @@ - Authentication and credential store - choose defaults + - Follow the steps at the following link to create your private/public GPG keys - [Windows - Creating New GPG Keys with Kleopatra](https://github.com/OpeningDesign/encryption-test/blob/master/README.md#windows---creating-new-gpg-keys-with-kleopatra) +
+ --- + ### Cloning a Repo for the First Time + *Essentionally ''cloning' a repo means you're downloading the entire project folder onto your local machine. Once it pulled down (downloaded) you don't have to clone it again.* + *After it's cloned, if there's a change on the repo you want to pull down to your local machine, follow the steps in the following section: [Pulling the latest changes down from the remote repo](#pulling-the-latest-changes-down-from-the-remote-repo)*. + 1. Copy the **HTTPS** *(not SSH)* address from either Github or Gitlab. - From Gitlab... - ![](imgs/Gitlab_https.png) @@ -119,40 +134,57 @@ - ![](imgs/clone_1.png) - The following fields should already be filed in and then hit 'okay'![](imgs/clone_2.png) +
+ --- +
+ ### Pulling the latest changes down from the remote repo + 1. Right click anywhere in the local folder and go to 'Git Sync'.. - ![](imgs/sync_1.png) - And then 'Pull' ![](imgs/sync_2.png) +
+ --- +
+ ### Pushing a change + * right click anywhere in window to bring up the following context menu. go to ***Git Commit -> "master"...***![](imgs/Git_commit.png) + * Fill in the following below, and hit **'Commit & Push'**![](imgs/commit_dialong.png) + * Make sure to hit **'Commit & Push'** instead of **'Commit'**. Because **'Commit & Push'** syncs your change locally and on the remote, whereby **'Commit'** just commits your change locally. +
+ --- +
+ ### Starting a Project + - Create a [blank project](https://gitlab.com/projects/new#blank_project) on Gitlab - [Clone the repo](#cloning-a-repo-for-the-first-time) - Copy in all the template folders located here: ```OD_Library\Project Folder Structure``` and [push](#pushing-a-change). @@ -161,14 +193,19 @@ - Tell collaborators to subscribe to Gitlab notifications. - [one way](imgs/gitlab_notifications.png) +
+ --- +
+ ### Revit Specific + - Try not to use the following, if possible... 1. Dumb text notes. Prioritize the following instead. - 1st priority: Material Tags @@ -180,48 +217,66 @@ - use Visibility/Graphic Overrides for Categories instead, or better yet, use View Templates 4. Paint a material on an object. (apply a material via a type, or to entire object) +
+ --- +
+ ### FreeCAD Specific + - Export IFC files very soon and very often, test them in [IFC++](https://ifcquery.com/) first, then in Revit. Detect issues early - Use simple extrusions as much as possible (Arch Wall/Structures/Panels or Part Extrude) - Objects exported as IFC structural elements (beams, columns) often give problems in Revit. If needed, use BuildingElement Proxies (Will come as generic models, Revit won't apply any transformation on them) - Keep list of materials clean, merge duplicates, make sure all objects have a material +
---
+ ### Creating a New Revit Family + 1. When creating a new revit family, one of the cardinal rules when making families is that the objects should be constained to reference planes. 2. There might be exceptions, but another cardinal rule is to start with a family template of the thing you're modeling... that is, use a window template for windows, door template for doors, etc. +
+ --- +
+ ### File too large to push to Github + If your file ever gets above 100mbs and you can't push to Github, try... + 1. Purge all. Run this (3) times to fully purge everything. ![](imgs/PurgeAll.png) 2. For whatever reason, if you do a 'save as' to a temporary file name, and do another 'save as' to overwrite the original file. it reduces the file size. +
+ --- + ### Markdown Editor + - We use markdown a lot. [Here's](https://yorik.uncreated.net/blog/2021-015-markdown) why. - Some of our favorite open source desktop markdown editors @@ -232,13 +287,17 @@ If your file ever gets above 100mbs and you can't push to Github, try... - [StackEdit](https://stackedit.io/app#) + --- ### Email + - [Godaddy - Workspace Email Help](https://au.godaddy.com/help/server-and-port-settings-for-workspace-email-6949) - Video: [How to Set up your GoDaddy Office 365 Email in Gmail (Full Tutorial)](https://www.youtube.com/watch?v=tHH0vVObeMw) + + --- - Incoming settings @@ -248,6 +307,7 @@ If your file ever gets above 100mbs and you can't push to Github, try... - if IMAP: `993` with SSL selected - Encryption method: `TLS` (POP/IMAP) + --- - Outgoing settings @@ -256,41 +316,51 @@ If your file ever gets above 100mbs and you can't push to Github, try... - Encryption method: `STARTTLS` or `TLS` + --- + ### Random + - connecting stackedit to gitlab: https://dev.to/maxwhite20062003/how-to-link-your-gitlab-account-to-stackedit-2pkc + ### Random Errors + - warning: LF will be replaced by CRLF. - Solution 1. `git config --system --unset core.autocrlf` 2. `git config --global core.autocrlf true` + - clean filter git crypt failed - https://github.com/AGWA/git-crypt/issues/184#issuecomment-541942913 C:\Users\ryan\.gnupg + - Git bash Error: Could not fork child process: - https://stackoverflow.com/questions/45799650/git-bash-error-could-not-fork-child-process-there-are-no-available-terminals/ - kill the 'agent' process that you last used. - might be: gpg-agent.exe + - To reset harder! - https://stackoverflow.com/a/4327720 + - Buffer error - RPC failed; HTTP 524 curl 22 The requested URL returned error: 524 fatal: the remote end hung up unexpectedly: https://confluence.atlassian.com/bitbucketserverkb/git-push-fails-fatal-the-remote-end-hung-up-unexpectedly-779171796.html - `git config --global http.postBuffer 157286400` + - [rm -f .git/index.lock](https://stackoverflow.com/questions/9282632/git-index-lock-file-exists-when-i-try-to-commit-but-cannot-delete-the-file/11466435#11466435) - [video](https://www.dropbox.com/s/msj8heiq7ryefy1/2022-02-03_10-48-13.mp4?dl=0) @@ -298,25 +368,91 @@ If your file ever gets above 100mbs and you can't push to Github, try... - `git did not exit cleanly (exit code 128)` - This error might be because there's a file with path that is too long + - assume-unchanged and skip-worktree flags - https://fallengamer.livejournal.com/93321.html + - Record audio and mic on ShareX: https://softwarerecs.stackexchange.com/questions/42767/screen-recording-tool-that-records-both-speaker-o-p-as-well-as-mic-input/74728#74728 - ```-f dshow -i audio="virtual-audio-capturer" -filter_complex amix=inputs=2:duration=longest``` + - Keycast: https://github.com/bfritscher/carnac/releases + - If Gitlab password is not working: https://stackoverflow.com/questions/47860772/gitlab-remote-http-basic-access-denied-and-fatal-authentication/51133684#51133684 + %t%pn%y-%mo-%d_%h-%mi-%s_%pn +### Setting up LFS +- git lfs install +- git lfs track "*.psd" +``` +*.rvt filter=lfs diff=lfs merge=lfs -text +*.mp4 filter=lfs diff=lfs merge=lfs -text +*.exe filter=lfs diff=lfs merge=lfs -text +*.ifc filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +``` + + +### Use BFG to migrate a repo to Git LFS + + + + +- https://support.atlassian.com/bitbucket-cloud/docs/use-bfg-to-migrate-a-repo-to-git-lfs/ + - `git clone --mirror git@bitbucket.org:/.git` + - specific example: `git clone --mirror https://hub.openingdesign.com/OpeningDesign/MP3.git` + - `java -jar bfg-x.x.x.jar --convert-to-git-lfs "*.{png,mp4}" --no-blob-protection .git` + - specific example: `java -jar C:/bfg-1.14.0.jar --convert-to-git-lfs "*.{rvt,mp4,exe,ifc}" --no-blob-protection D:/MP3.git` + + + + + +### Migrating existing repository data to LFS +- https://github.com/git-lfs/git-lfs/wiki/Tutorial#migrating-existing-repository-data-to-lfs +- https://github.com/git-lfs/git-lfs/blob/main/docs/man/git-lfs-migrate.adoc#_include_and_exclude_references + - https://github.com/git-lfs/git-lfs/issues/4769 + + + + +### Creating SSH key +- `ssh-keygen - t rsa` +- pick default location, or change path +- *(not sure this step is necessary)* Save key fingerprint, and randomart image, by copying and pasting them somewhere for future reference if you need them. +- It creates (2) files in this directory + - One is your private key. Don't share this with anyone. + - example: `id_rsa` + - And the other is your public key. This key you can share with anyone. + - example: `id_rsa.pub` +- `ssh-add` + - If error `Could not open a connection to your authentication agent.` + - Windows `eval $(ssh-agent)` + + + + + + \ No newline at end of file diff --git a/CA/OD_Submittal Stamp.pdf b/CA/OD_Submittal Stamp.pdf index bc31678..a685153 100644 Binary files a/CA/OD_Submittal Stamp.pdf and b/CA/OD_Submittal Stamp.pdf differ diff --git a/Checklists and Seed Docs/Checklist - New Prospective Job.md b/Checklists and Seed Docs/Checklist - New Prospective Job.md index ca2af8d..166b806 100644 --- a/Checklists and Seed Docs/Checklist - New Prospective Job.md +++ b/Checklists and Seed Docs/Checklist - New Prospective Job.md @@ -1,5 +1,7 @@ -- Title search - - any encumbrances on the title? +- Landlord? + + Title search + - any encumbrances on the title? - SF over overall building - SF of scope - Neighboring tenants @@ -14,11 +16,11 @@ - Lighting - Finishes - Structure - - Change of occupancy? Change of loads? Existing structure to accommodate? - - Determine structure to determine construction type + - Change of occupancy? Change of loads? Existing structure to accommodate? + - Determine structure to determine construction type - Fire separation - - Check doors - - Stairs + - Check doors + - Stairs - HVAC - locations of main trunks and equipment - suggested locations of proposed equipment @@ -39,23 +41,22 @@ - Allocated budget - Schedule - Drawings - - Permit set - - Reflected ceiling - - Finish plan - - MEP? + - Permit set + - Reflected ceiling + - Finish plan + - MEP? - Existing CAD files - What are the neighboring tenants - - possibility measure or do reconnaissance on their suite to find any conflicts with what's planned - - + - possibility measure or do reconnaissance on their suite to find any conflicts with what's planned ### Restaurants - - - Main spaces + - Entry + - Kitchen + - Prep - dedicated food prep sink - handsink @@ -71,41 +72,52 @@ - Type II hood - handsink - hoods - + - Dishwashing + - Dish washing - dishwasher or 3 compartment sink - Type II Hood if heating - no hood, for smaller chemical DW - hand sink + - storage + - dry - refrigeration/freezer - mop sink, required - garbage strategy + - Seating + - seating types + - Register + - check out - displays - sneeze guards - refrigerated displays - Signage - Condiment area + - Bathrooms + - dishwasher or 3 compartment sink - taps - refrigeration lines + - Restrooms + - finishes - baby changing - Employee use - If public, faucet non-hand operated + - offices + - Equipment specs - -