Merge pull request #1 from Booklordofthedings/main

Merge main branch into master branch
This commit is contained in:
Jannis vH 2021-12-06 21:20:59 +01:00 committed by GitHub
commit 3f3fb25f2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 135 additions and 97 deletions

View File

@ -1,4 +1,5 @@
**Reasons for making this change:**
<!-- Include your relationship to the project and what you expect to get from this change. -->
_TODO_

View File

@ -1,22 +1,3 @@
# Built application files
*.apk
*.aar
*.ap_
*.aab
# Files for the ART/Dalvik VM
*.dex
# Java class files
*.class
# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/
# Gradle files
.gradle/
build/
@ -24,66 +5,26 @@ build/
# Local configuration file (sdk path, etc)
local.properties
# Proguard folder generated by Eclipse
proguard/
# Log Files
# Log/OS Files
*.log
# Android Studio Navigation editor temp files
.navigation/
# Android Studio captures folder
# Android Studio generated files and folders
captures/
.externalNativeBuild/
.cxx/
*.apk
output.json
# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
.idea/jarRepositories.xml
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml
.idea/
# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
#*.keystore
# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.cxx/
*.jks
*.keystore
# Google Services (e.g. APIs or Firebase)
# google-services.json
# Freeline
freeline.py
freeline/
freeline_project_description.json
# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
# Version control
vcs.xml
# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/
google-services.json
# Android Profiling
*.hprof

11
Global/AL.gitignore Normal file
View File

@ -0,0 +1,11 @@
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
# Local History for Visual Studio Code
.history/
*.app
.snapshots/*

View File

@ -0,0 +1,2 @@
# Syncthing caches
.stversions

View File

@ -13,3 +13,6 @@
# Dependency directories (remove the comment below to include it)
# vendor/
# Go workspace file
go.work

View File

@ -1,2 +1,7 @@
# Idris 2
*.ttc
*.ttm
# Idris 1
*.ibc
*.o

View File

@ -21,3 +21,4 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

View File

@ -1,5 +1,5 @@
# For PCBs designed using KiCad: http://www.kicad-pcb.org/
# Format documentation: http://kicad-pcb.org/help/file-formats/
# For PCBs designed using KiCad: https://www.kicad.org/
# Format documentation: https://kicad.org/help/file-formats/
# Temporary files
*.000

View File

@ -54,6 +54,9 @@ web_modules/
# Optional eslint cache
.eslintcache
# Optional stylelint cache
.stylelintcache
# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
@ -70,9 +73,10 @@ web_modules/
.yarn-integrity
# dotenv environment variables file
.env
.env.test
.env.production
.env.development.local
.env.test.local
.env.production.local
.env.local
# parcel-bundler cache (https://parceljs.org/)
.cache
@ -95,6 +99,10 @@ dist
# vuepress build output
.vuepress/dist
# vuepress v2.x temp and cache directory
.temp
.cache
# Serverless directories
.serverless/

View File

@ -136,3 +136,10 @@ dmypy.json
# Cython debug symbols
cython_debug/
# PyCharm
# JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

View File

@ -4,6 +4,7 @@
# Session Data files
.RData
.RDataTmp
# User-specific files
.Ruserdata

View File

@ -141,7 +141,7 @@ Heres how we suggest you go about proposing a change to this project:
1. [Fork this project][fork] to your account.
2. [Create a branch][branch] for the change you intend to make.
3. Make your changes to your fork.
4. [Send a pull request][pr] from your forks branch to our `master` branch.
4. [Send a pull request][pr] from your forks branch to our `main` branch.
Using the web-based interface to make changes is fine too, and will help you
by automatically forking the project and prompting to send a pull request too.

View File

@ -27,7 +27,7 @@ config/master.key
# dotenv, dotenv-rails
# TODO Comment out these rules if environment variables can be committed
.env
.env.*
.env*.local
## Environment normalization:
/.bundle

View File

@ -111,6 +111,9 @@ acs-*.bib
*.glsdefs
*.lzo
*.lzs
*.slg
*.slo
*.sls
# uncomment this for glossaries-extra (will ignore makeindex's style files!)
# *.ist

View File

@ -14,6 +14,9 @@
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/
# Recordings can get excessive in size
/[Rr]ecordings/
# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta
@ -59,6 +62,7 @@ sysinfo.txt
*.apk
*.aab
*.unitypackage
*.app
# Crashlytics generated file
crashlytics-build.properties

View File

@ -206,9 +206,6 @@ PublishScripts/
*.nuget.props
*.nuget.targets
# Nuget personal access tokens and Credentials
# nuget.config
# Microsoft Azure Build Output
csx/
*.build.csdef
@ -297,6 +294,17 @@ node_modules/
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
*.vbp
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
*.dsw
*.dsp
# Visual Studio 6 technical files
*.ncb
*.aps
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
@ -384,5 +392,4 @@ FodyWeavers.xsd
*.msp
# JetBrains Rider
.idea/
*.sln.iml

View File

@ -1,23 +1,48 @@
# ignore everything in the root except the "wp-content" directory.
!wp-content/
# Wordpress - ignore core, configuration, examples, uploads and logs.
# https://github.com/github/gitignore/blob/master/WordPress.gitignore
# ignore everything in the "wp-content" directory, except:
# "mu-plugins", "plugins", "themes" directory
wp-content/*
!wp-content/mu-plugins/
!wp-content/plugins/
!wp-content/themes/
# Core
#
# Note: if you want to stage/commit WP core files
# you can delete this whole section/until Configuration.
/wp-admin/
/wp-content/index.php
/wp-content/languages
/wp-content/plugins/index.php
/wp-content/themes/index.php
/wp-includes/
/index.php
/license.txt
/readme.html
/wp-*.php
/xmlrpc.php
# ignore these plugins
wp-content/plugins/hello.php
# Configuration
wp-config.php
# ignore specific themes
wp-content/themes/twenty*/
# Example themes
/wp-content/themes/twenty*/
# ignore node dependency directories
node_modules/
# Example plugin
/wp-content/plugins/hello.php
# ignore log files and databases
# Uploads
/wp-content/uploads/
# Log files
*.log
*.sql
*.sqlite
# htaccess
/.htaccess
# All plugins
#
# Note: If you wish to whitelist plugins,
# uncomment the next line
#/wp-content/plugins
# All themes
#
# Note: If you wish to whitelist themes,
# uncomment the next line
#/wp-content/themes

View File

@ -6,3 +6,6 @@
hugo.exe
hugo.darwin
hugo.linux
# Temporary lock file while building
/.hugo_build.lock

View File

@ -0,0 +1,16 @@
# gitignore template for LensStudio
# website: https://lensstudio.snapchat.com/
# macOS/IDE #
.DS_Store
.idea
# js #
node_modules
yarn.lock
# Python #
__pycache__/
*.py[cod]
*$py.class
[Bb]ackup*