diff --git a/Resources/biology/growing.md b/Resources/biology/growing.md index a1d98a0..4b1897e 100644 --- a/Resources/biology/growing.md +++ b/Resources/biology/growing.md @@ -1,5 +1,7 @@ # Growing Plants + ## Creating seedlings in water + ### Tipps - Easy on the fertilizer it seems like root rot is very likely to happen - Change the water sometime \ No newline at end of file diff --git a/Resources/biology/growing/mint.md b/Resources/biology/growing/mint.md index ae2120c..c09498d 100644 --- a/Resources/biology/growing/mint.md +++ b/Resources/biology/growing/mint.md @@ -1,24 +1 @@ -# Growing Mint - -## This is a new node - -### This is my new test - -| foo | bar | test | -| ---- | --- | ----- | -| baz | bim | asda | -| this | is | asdas | -| not | 2 | asd | - -### This is another test for me - -- [ ] This is a checklist -- [ ] This is a checklist -- [ ] This is a checklist -- [ ] This is a checklist -- [ ] For some items -- [x] List Item -- [x] List Item -- [x] This is some shit - -asdasdaasd +# Growing Mint \ No newline at end of file diff --git a/Resources/electricity/assets/Drawing 2022-03-26 14.04.42.excalidraw.md b/Resources/electricity/assets/Drawing 2022-03-26 14.04.42.excalidraw.md deleted file mode 100644 index eef80b3..0000000 --- a/Resources/electricity/assets/Drawing 2022-03-26 14.04.42.excalidraw.md +++ /dev/null @@ -1,451 +0,0 @@ ---- - -excalidraw-plugin: parsed -tags: [excalidraw] - ---- -==⚠ Switch to EXCALIDRAW VIEW in the MORE OPTIONS menu of this document. ⚠== - - -# Text Elements -%% -# Drawing -```json -{ - "type": "excalidraw", - "version": 2, - "source": "https://excalidraw.com", - "elements": [ - { - "type": "freedraw", - "version": 47, - "versionNonce": 1422800857, - "isDeleted": false, - "id": "BF0BQbwRmcSkb08JEzLpj", - "fillStyle": "hachure", - "strokeWidth": 1, - "strokeStyle": "solid", - "roughness": 1, - "opacity": 100, - "angle": 0, - "x": -237.83200073242188, - "y": -191.19791412353516, - "strokeColor": "#000000", - "backgroundColor": "transparent", - "width": 311.78057861328125, - "height": 260.70635986328125, - "seed": 261287865, - "groupIds": [], - "strokeSharpness": "round", - "boundElements": [], - "updated": 1648385675508, - "link": null, - "points": [ - [ - 0, - 0 - ], - [ - -0.15301513671875, - 1.110015869140625 - ], - [ - 0.693359375, - 2.880859375 - ], - [ - 2.8125, - 6.20440673828125 - ], - [ - 6.142578125, - 15.93096923828125 - ], - [ - 5.537109375, - 33.512359619140625 - ], - [ - 3.10870361328125, - 50.64453125 - ], - [ - 0.12371826171875, - 75.166015625 - ], - [ - -1.171875, - 93.39190673828125 - ], - [ - -2.39581298828125, - 121.337890625 - ], - [ - -2.71484375, - 140.17901611328125 - ], - [ - -3.017578125, - 156.07421875 - ], - [ - -4.228515625, - 172.68228149414062 - ], - [ - -4.833984375, - 187.63018798828125 - ], - [ - -5.439453125, - 199.72979736328125 - ], - [ - -5.439453125, - 217.76040649414062 - ], - [ - -5.439453125, - 229.150390625 - ], - [ - -5.13671875, - 237.45440673828125 - ], - [ - -4.53125, - 243.3853759765625 - ], - [ - -3.623046875, - 248.369140625 - ], - [ - -2.412109375, - 252.1646728515625 - ], - [ - -0.29296875, - 256.1978759765625 - ], - [ - 2.12890625, - 258.095703125 - ], - [ - 6.669921875, - 259.99346923828125 - ], - [ - 13.93231201171875, - 260.70635986328125 - ], - [ - 24.22528076171875, - 260.70635986328125 - ], - [ - 48.62957763671875, - 258.5513916015625 - ], - [ - 84.1015625, - 254.3521728515625 - ], - [ - 129.15692138671875, - 246.2109375 - ], - [ - 186.57550048828125, - 231.71548461914062 - ], - [ - 222.080078125, - 220.13671875 - ], - [ - 257.03448486328125, - 208.72720336914062 - ], - [ - 270.99932861328125, - 204.68096923828125 - ], - [ - 280.38409423828125, - 202.0703125 - ], - [ - 287.04425048828125, - 200.41015625 - ], - [ - 291.58526611328125, - 199.45962524414062 - ], - [ - 294.91534423828125, - 198.98760986328125 - ], - [ - 297.63665771484375, - 198.75 - ], - [ - 300.66400146484375, - 198.75 - ], - [ - 302.17767333984375, - 198.75 - ], - [ - 303.38861083984375, - 199.22525024414062 - ], - [ - 304.59954833984375, - 199.697265625 - ], - [ - 305.16595458984375, - 199.912109375 - ], - [ - 306.04815673828125, - 200.60220336914062 - ], - [ - 306.34112548828125, - 200.83331298828125 - ], - [ - 306.34112548828125, - 200.83331298828125 - ] - ], - "lastCommittedPoint": null, - "simulatePressure": true, - "pressures": [] - }, - { - "type": "freedraw", - "version": 42, - "versionNonce": 391061049, - "isDeleted": false, - "id": "lCRjgii_ng0T6UIr_uGwo", - "fillStyle": "hachure", - "strokeWidth": 1, - "strokeStyle": "solid", - "roughness": 1, - "opacity": 100, - "angle": 0, - "x": -237.63345336914062, - "y": -193.68814849853516, - "strokeColor": "#000000", - "backgroundColor": "transparent", - "width": 369.580078125, - "height": 185.52081298828125, - "seed": 1345621559, - "groupIds": [], - "strokeSharpness": "round", - "boundElements": [], - "updated": 1648385677202, - "link": null, - "points": [ - [ - 0, - 0 - ], - [ - 3.701171875, - 0.42315673828125 - ], - [ - 17.64324951171875, - 2.5 - ], - [ - 75.7552490234375, - 4.10479736328125 - ], - [ - 142.626953125, - 2.373046875 - ], - [ - 213.10546875, - 1.04815673828125 - ], - [ - 256.4583740234375, - 0.6640625 - ], - [ - 291.23699951171875, - 1.276031494140625 - ], - [ - 314.9251708984375, - 2.360015869140625 - ], - [ - 336.4420166015625, - 3.785797119140625 - ], - [ - 347.9427490234375, - 4.26104736328125 - ], - [ - 356.4193115234375, - 4.733062744140625 - ], - [ - 361.8685302734375, - 4.733062744140625 - ], - [ - 365.1986083984375, - 4.733062744140625 - ], - [ - 367.9232177734375, - 4.733062744140625 - ], - [ - 368.8216552734375, - 4.733062744140625 - ], - [ - 369.326171875, - 4.733062744140625 - ], - [ - 369.580078125, - 4.733062744140625 - ], - [ - 369.580078125, - 5.17578125 - ], - [ - 368.759765625, - 6.461578369140625 - ], - [ - 365.126953125, - 11.20440673828125 - ], - [ - 359.677734375, - 21.64385986328125 - ], - [ - 351.8099365234375, - 44.658203125 - ], - [ - 347.3697509765625, - 65.80401611328125 - ], - [ - 344.189453125, - 83.9453125 - ], - [ - 341.46484375, - 100.33203125 - ], - [ - 339.0396728515625, - 116.95635986328125 - ], - [ - 336.9205322265625, - 135.224609375 - ], - [ - 335.7095947265625, - 147.32421875 - ], - [ - 335.1041259765625, - 159.42706298828125 - ], - [ - 334.8013916015625, - 169.15362548828125 - ], - [ - 334.8013916015625, - 175.55987548828125 - ], - [ - 334.8013916015625, - 178.88018798828125 - ], - [ - 334.8013916015625, - 181.96612548828125 - ], - [ - 334.8013916015625, - 183.15103149414062 - ], - [ - 334.8013916015625, - 184.31640625 - ], - [ - 334.8013916015625, - 184.48565673828125 - ], - [ - 334.8013916015625, - 184.83071899414062 - ], - [ - 334.8013916015625, - 185.17578125 - ], - [ - 334.8013916015625, - 185.52081298828125 - ], - [ - 334.8013916015625, - 185.52081298828125 - ] - ], - "lastCommittedPoint": null, - "simulatePressure": true, - "pressures": [] - } - ], - "appState": { - "theme": "light", - "viewBackgroundColor": "#ffffff", - "currentItemStrokeColor": "#000000", - "currentItemBackgroundColor": "transparent", - "currentItemFillStyle": "hachure", - "currentItemStrokeWidth": 1, - "currentItemStrokeStyle": "solid", - "currentItemRoughness": 1, - "currentItemOpacity": 100, - "currentItemFontFamily": 1, - "currentItemFontSize": 20, - "currentItemTextAlign": "left", - "currentItemStrokeSharpness": "sharp", - "currentItemStartArrowhead": null, - "currentItemEndArrowhead": "arrow", - "currentItemLinearStrokeSharpness": "round", - "gridSize": null, - "colorPalette": {} - }, - "files": {} -} -``` -%% \ No newline at end of file diff --git a/Resources/electricity/passive-components/filters.md b/Resources/electricity/passive-components/filters.md index 1fd260d..ef5c782 100644 --- a/Resources/electricity/passive-components/filters.md +++ b/Resources/electricity/passive-components/filters.md @@ -58,7 +58,4 @@ Now lets calculate the cutoff frequency when we place three of those filters in ![[formulas#Cutoff Frequency for multiple Low Pass Filters]] $f_{(-3db)} = 530.51 \sqrt{2^{(\frac{1}{3})}-1}$ -$\displaystyle f_{(-3db)} \approx 270.467010633$ - - -![[Drawing 2022-03-26 14.04.42.excalidraw]] \ No newline at end of file +$\displaystyle f_{(-3db)} \approx 270.467010633$ \ No newline at end of file diff --git a/Resources/history/international/assets/Geneva_Conventions_Protocol_II_Signatories.svg b/Resources/history/assets/Geneva_Conventions_Protocol_II_Signatories.svg similarity index 100% rename from Resources/history/international/assets/Geneva_Conventions_Protocol_II_Signatories.svg rename to Resources/history/assets/Geneva_Conventions_Protocol_II_Signatories.svg diff --git a/Resources/history/assets/Republic_of_Ireland.svg b/Resources/history/assets/Republic_of_Ireland.svg new file mode 100644 index 0000000..bd8cd9c --- /dev/null +++ b/Resources/history/assets/Republic_of_Ireland.svg @@ -0,0 +1,1164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Resources/history/international/geneva-conventions.md b/Resources/history/international/geneva-conventions.md index bd4210d..65fdfb4 100644 --- a/Resources/history/international/geneva-conventions.md +++ b/Resources/history/international/geneva-conventions.md @@ -18,10 +18,10 @@ They where several improvements made to the geneva conventions over the years: **1977:** Protocols 1/2, Protecting of Victims of international/non-international armed conflict **2005:** Protocol 3, New Emblem for medical services -![[Geneva_Conventions_Protocol_II_Signatories.svg]] +![](../assets/Geneva_Conventions_Protocol_II_Signatories.svg) A map showing the current status of Protocol 2 by country, as of July 2020 -Green:  State parties (169) -LightGreen:  State signatories (3) +Green: State parties (169) +Light Green: State signatories (3) # Content @@ -37,6 +37,6 @@ The geneva conventions contain a list of "grave breaches" which also provide a d # Enforcement -Nations who are party to these treaties must enact and enforce legislation penalizing any of these crimes. Those parties must also search for persons that commited or ordered the comitting of crimes under the geneva conventions regardless of the nationality of those persons. +Nations who are party to these treaties must enact and enforce legislation penalizing any of these crimes. Those parties must also search for persons that committed or ordered the committing of crimes under the geneva conventions regardless of the nationality of those persons. -[^1]: https://www.icrc.org/en/publication/0361-memory-solferino \ No newline at end of file +[^1]: https://www.icrc.org/en/publication/0361-memory-solferino diff --git a/Resources/history/ireland/northern-ireland.md b/Resources/history/ireland/northern-ireland.md new file mode 100644 index 0000000..421ea6d --- /dev/null +++ b/Resources/history/ireland/northern-ireland.md @@ -0,0 +1,31 @@ +# Northern Ireland + +Around 420 BC the Bishop Saint Patric converted most of the Pagan Ireland to Catholicism. + +In 1604 King Henry VIII conquered the entirety of Ireland. + +Because Ireland was still mostly Catholics who now lived under the protestant rule of England there were frequent rebellions happening. + +Due to this England decided to relocate catholic farmers to Ireland. This did only really work in Northern Ireland where small presbyterian counties were formed. +Presbyterianism has its roots in Protestantism. + +Around 1800 the British conquered the entirety of Ireland and united it with England, forming the United Kingdom. + +During the great famine of 1840 millions of people died and millions emigrated. + +Ireland was split into northern and southern Ireland in 1920. +Southern Ireland became the Irish Free State, or what we know as Ireland today. + +Northern Ireland is part of the United Kingdom. + +During 1966 the conflicts in the North between Pro-British Protestants and Pro-Irish Catholics escalated into what we now call the Troubles. This period lasted until the 1990, in 1998 both sides negotiated the "Good Friday Agreement". + +Ireland joined the EU together with England and Denmark in 1997. + +During the Brexit in 2016 Northern Ireland and Scotland voted no with a slight majority. + +This caused the unification talks between Ireland and Northern Ireland to gain traction again. + +![](../assets/Republic_of_Ireland.svg) + +The protestants want to be part of the United Kingdom and the Catholics want to be independent. diff --git a/Resources/music/theory.md b/Resources/music/theory.md new file mode 100644 index 0000000..52d164f --- /dev/null +++ b/Resources/music/theory.md @@ -0,0 +1,14 @@ +# Music Theory + +# Notes +Every move up one fret of the guitar represents a halfstep. So moving frets means two halfsteps, or a whole step. + +## Octaves +Double the frequency = One Octave higher +Half the frequency = One Octave lower + + +# Scales +Scales are patterns of intervals. + + diff --git a/business-as-black-box.png b/business-as-black-box.png deleted file mode 100644 index 2d9020f..0000000 Binary files a/business-as-black-box.png and /dev/null differ