vault backup: 2025-08-07 14:45:39
This commit is contained in:
fzzinchemical
6
.obsidian/graph.json
vendored
6
.obsidian/graph.json
vendored
@@ -3,8 +3,8 @@
|
|||||||
"search": "",
|
"search": "",
|
||||||
"showTags": true,
|
"showTags": true,
|
||||||
"showAttachments": false,
|
"showAttachments": false,
|
||||||
"hideUnresolved": true,
|
"hideUnresolved": false,
|
||||||
"showOrphans": false,
|
"showOrphans": true,
|
||||||
"collapse-color-groups": false,
|
"collapse-color-groups": false,
|
||||||
"colorGroups": [
|
"colorGroups": [
|
||||||
{
|
{
|
||||||
@@ -25,6 +25,6 @@
|
|||||||
"repelStrength": 10,
|
"repelStrength": 10,
|
||||||
"linkStrength": 1,
|
"linkStrength": 1,
|
||||||
"linkDistance": 250,
|
"linkDistance": 250,
|
||||||
"scale": 0.6283893116394689,
|
"scale": 0.9425839674592027,
|
||||||
"close": true
|
"close": true
|
||||||
}
|
}
|
||||||
170
.obsidian/workspace.json
vendored
170
.obsidian/workspace.json
vendored
@@ -1,49 +1,56 @@
|
|||||||
{
|
{
|
||||||
"main": {
|
"main": {
|
||||||
"id": "cfa40fab749806fc",
|
"id": "1cd20d37e5c11887",
|
||||||
"type": "split",
|
"type": "split",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "ba40b2b7af1fccbf",
|
"id": "f7005ae723882cdc",
|
||||||
"type": "tabs",
|
"type": "tabs",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "0b3e25477c9392f1",
|
"id": "b6fab4f23d82def1",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
<<<<<<< HEAD
|
"file": "Semester 6/Veranstaltungsplan.md",
|
||||||
"file": "conflict-files-obsidian-git.md",
|
|
||||||
=======
|
|
||||||
"file": "Semester 6/SWTEST/Zusammenfassungen/CTFL-Kapitel 4-2.md",
|
|
||||||
>>>>>>> 07e628aaa4f600dff70a622adda75bedef2bbe8a
|
|
||||||
"mode": "source",
|
"mode": "source",
|
||||||
"source": false
|
"source": false
|
||||||
},
|
},
|
||||||
"icon": "lucide-file",
|
"icon": "lucide-file",
|
||||||
<<<<<<< HEAD
|
"title": "Veranstaltungsplan"
|
||||||
"title": "conflict-files-obsidian-git"
|
}
|
||||||
=======
|
},
|
||||||
"title": "CTFL-Kapitel 4-2"
|
{
|
||||||
>>>>>>> 07e628aaa4f600dff70a622adda75bedef2bbe8a
|
"id": "5b809918537b4da5",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Semester 6/List of Shame.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": false
|
||||||
|
},
|
||||||
|
"icon": "lucide-file",
|
||||||
|
"title": "List of Shame"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"currentTab": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"direction": "vertical"
|
"direction": "vertical"
|
||||||
},
|
},
|
||||||
"left": {
|
"left": {
|
||||||
"id": "3c56d3282d71c074",
|
"id": "3cffa562cdbe5b3e",
|
||||||
"type": "split",
|
"type": "split",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "57b49b560ebd78e0",
|
"id": "505477d86e414c01",
|
||||||
"type": "tabs",
|
"type": "tabs",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "96a9898c63ef5dbc",
|
"id": "ac74099c142362fb",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "file-explorer",
|
"type": "file-explorer",
|
||||||
@@ -56,12 +63,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "4a251030d41b62a8",
|
"id": "434062f44ab1ae28",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "search",
|
"type": "search",
|
||||||
"state": {
|
"state": {
|
||||||
"query": "",
|
"query": "tag:#Adventure",
|
||||||
"matchingCase": false,
|
"matchingCase": false,
|
||||||
"explainSearch": false,
|
"explainSearch": false,
|
||||||
"collapseAll": false,
|
"collapseAll": false,
|
||||||
@@ -73,7 +80,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "b78d4c43d44ad798",
|
"id": "ec76ad177fe7e638",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "bookmarks",
|
"type": "bookmarks",
|
||||||
@@ -82,27 +89,28 @@
|
|||||||
"title": "Bookmarks"
|
"title": "Bookmarks"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"currentTab": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"direction": "horizontal",
|
"direction": "horizontal",
|
||||||
"width": 300
|
"width": 300
|
||||||
},
|
},
|
||||||
"right": {
|
"right": {
|
||||||
"id": "451a3e3d14f303d9",
|
"id": "f5683ee3c826ec47",
|
||||||
"type": "split",
|
"type": "split",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "399fe44f077f7533",
|
"id": "428547dda2106e92",
|
||||||
"type": "tabs",
|
"type": "tabs",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "232e86b5f5307ac0",
|
"id": "38374720ccf1e825",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "backlink",
|
"type": "backlink",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Semester 3/BESYST/04_Blatt_Loesung.pdf",
|
"file": "Semester 6/Veranstaltungsplan.md",
|
||||||
"collapseAll": false,
|
"collapseAll": false,
|
||||||
"extraContext": false,
|
"extraContext": false,
|
||||||
"sortOrder": "alphabetical",
|
"sortOrder": "alphabetical",
|
||||||
@@ -112,60 +120,55 @@
|
|||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
},
|
},
|
||||||
"icon": "links-coming-in",
|
"icon": "links-coming-in",
|
||||||
"title": "Backlinks for 04_Blatt_Loesung"
|
"title": "Backlinks for Veranstaltungsplan"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "7fc836fafe5a42df",
|
"id": "4b26a4dd0f5ccf1c",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "outgoing-link",
|
"type": "outgoing-link",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Semester 3/BESYST/04_Blatt_Loesung.pdf",
|
"file": "Semester 6/Veranstaltungsplan.md",
|
||||||
"linksCollapsed": false,
|
"linksCollapsed": false,
|
||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
},
|
},
|
||||||
"icon": "links-going-out",
|
"icon": "links-going-out",
|
||||||
"title": "Outgoing links from 04_Blatt_Loesung"
|
"title": "Outgoing links from Veranstaltungsplan"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "666dcf961b7a7da7",
|
"id": "c4ab4a4efe76b78e",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "tag",
|
"type": "tag",
|
||||||
"state": {
|
"state": {
|
||||||
"sortOrder": "frequency",
|
"sortOrder": "frequency",
|
||||||
"useHierarchy": true
|
"useHierarchy": true,
|
||||||
|
"showSearch": false,
|
||||||
|
"searchQuery": ""
|
||||||
},
|
},
|
||||||
"icon": "lucide-tags",
|
"icon": "lucide-tags",
|
||||||
"title": "Tags"
|
"title": "Tags"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "3adeb29b282b86e7",
|
"id": "26aa0fa75df01224",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "outline",
|
"type": "outline",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Semester 3/BESYST/04_Blatt_Loesung.pdf"
|
"file": "Semester 6/Veranstaltungsplan.md",
|
||||||
|
"followCursor": false,
|
||||||
|
"showSearch": false,
|
||||||
|
"searchQuery": ""
|
||||||
},
|
},
|
||||||
"icon": "lucide-list",
|
"icon": "lucide-list",
|
||||||
"title": "Outline of 04_Blatt_Loesung"
|
"title": "Outline of Veranstaltungsplan"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "c9d12616a7360a97",
|
"id": "c0ecf336c34944a7",
|
||||||
"type": "leaf",
|
|
||||||
"state": {
|
|
||||||
"type": "todo",
|
|
||||||
"state": {},
|
|
||||||
"icon": "lucide-file",
|
|
||||||
"title": "Plugin no longer active"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "2fe02d11331af471",
|
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "todo",
|
"type": "todo",
|
||||||
@@ -175,7 +178,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"currentTab": 5
|
"currentTab": 4
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"direction": "horizontal",
|
"direction": "horizontal",
|
||||||
@@ -193,79 +196,12 @@
|
|||||||
"workspaces:Manage workspace layouts": false
|
"workspaces:Manage workspace layouts": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"active": "0b3e25477c9392f1",
|
"active": "5b809918537b4da5",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
<<<<<<< HEAD
|
"Semester 6/List of Shame.md",
|
||||||
"conflict-files-obsidian-git.md",
|
"Semester 6/Veranstaltungsplan.md",
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 2.md",
|
|
||||||
"Semester 6/COMARCH/Klausurvorbereitungs Spreadsheed.md",
|
|
||||||
"Semester 6/SWTEST/Klausurrelevantes Milan.md",
|
"Semester 6/SWTEST/Klausurrelevantes Milan.md",
|
||||||
"Semester 6/COMARCH/Beispiele Klausurfragen.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Fragenkatalog.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708193937.png",
|
|
||||||
"Semester 6/COMARCH/Pasted image 20250709205101.png",
|
|
||||||
"Semester 6/COMARCH/Pasted image 20250709205049.png",
|
|
||||||
"Semester 6/SWTEST/CTFL-Kapitel 6.md",
|
|
||||||
"Semester 6/SWTEST/Klausurvorbereitung.md",
|
"Semester 6/SWTEST/Klausurvorbereitung.md",
|
||||||
"Semester 4/ITSARCH/Klausurvorbereitung ITSARCH.md",
|
"Semester 6/SWTEST/Letzte Vorlesung.md"
|
||||||
"Semester 4/ITSARCH/Pasted image 20240704185247.png",
|
|
||||||
"Semester 4/ITSARCH/Pasted image 20240704185748.png",
|
|
||||||
"Semester 4/ITSARCH/Pasted image 20240704190109.png",
|
|
||||||
"Semester 4/ITSARCH/Pasted image 20240709173104.png",
|
|
||||||
"Semester 4/ITSARCH/Pasted image 20240709174509.png",
|
|
||||||
"Semester 4/ITSARCH/ITSARCH Vorlesung.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 1.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 5.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 4.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 3a.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 3.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708193917.png",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 9.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Pasted image 20250708185932.png",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung Kompakt.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/COMARCH.7z",
|
|
||||||
"Semester 6/ITSARCH/Klausurvorbereitung.md",
|
|
||||||
"Semester 6/SWTEST/Liste Exams.md",
|
|
||||||
"Semester 6/SWTEST/CTFL-Kapitel 5.md",
|
|
||||||
"Semester 6/SWTEST/CTFL-Kapitel 4-2.md",
|
|
||||||
"Semester 6/SWTEST/CTFL-Kapitel 4-1.md",
|
|
||||||
"Semester 6/SWTEST/CTFL-Kapitel 3.md",
|
|
||||||
"Semester 6/SWTEST/CTFL-Kapitel 2.md",
|
|
||||||
"Semester 6/SWTEST/CTFL-Kapitel 0.md",
|
|
||||||
"Semester 6/SWTEST/CTFL-Kapitel 1.md",
|
|
||||||
"Semester 6/ITSARCH/Labore/060-portscans.pdf",
|
|
||||||
"Semester 6/ITSARCH/Labore/Abbildungen",
|
|
||||||
"Semester 6/COMARCH/Vorlesung",
|
|
||||||
"Semester 6/SWTEST",
|
|
||||||
"Semester 5/BWL",
|
|
||||||
"Semester 6/ITSARCH/Skript_Notizen",
|
|
||||||
"Semester 6/COMARCH",
|
|
||||||
"Semester 5",
|
|
||||||
"Semester 3/BESYST/04_Blatt_Loesung.pdf"
|
|
||||||
=======
|
|
||||||
"Semester 6/SWTEST/Letzte Vorlesung.md",
|
|
||||||
"Semester 6/SWTEST/Zusammenfassungen/CTFL-Kapitel 0.md",
|
|
||||||
"Semester 4/MICONT/Probeklausur 2025.md",
|
|
||||||
"Semester 6/SWTEST/Zusammenfassungen",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 4.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 3a.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 3.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 1.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 2.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung Kompakt.md",
|
|
||||||
"Dayplanner/2024-01-27.md",
|
|
||||||
"Dayplanner/2024-01-25.md",
|
|
||||||
"Dayplanner",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 11.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 10.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 9.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 8b.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 8a.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 7.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 6.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung/Vorlesung 5.md",
|
|
||||||
"Semester 6/COMARCH/Zusammenfassung",
|
|
||||||
"Semester 6/COMARCH"
|
|
||||||
>>>>>>> 07e628aaa4f600dff70a622adda75bedef2bbe8a
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
40
Semester 6/List of Shame.md
Normal file
40
Semester 6/List of Shame.md
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
- [ ] Subnautica Below Zero #Open_World_Survival_Craft #Survival #Underwater
|
||||||
|
- [ ] Hotline Miami #Violent #Indie #Gore #Action #Great_Soundtrack
|
||||||
|
- [ ] Metaphor (unfinished) #RPG #JRPG #Turn_Based_Combat #Anime #3D
|
||||||
|
- [ ] Bioshock 1 #FPS #Story_Rich #Atmospheric #Horror #Action
|
||||||
|
- [ ] Bioshock 2 #FPS #Singleplayer #Story_Rich #Horror #Action
|
||||||
|
- [ ] Wolfenstein: The New Order #FPS #Action #Shooter #Alternate_History #Gore
|
||||||
|
- [ ] Wolfenstein: The Old Blood #FPS #Action #World_War_II #Alternate_History
|
||||||
|
- [ ] Doom 64 #Action #FPS #Classic #1990s #Retro #Gore
|
||||||
|
- [ ] Doom 1 #Action #FPS #Classic #Great_Soundtrack
|
||||||
|
- [ ] Doom 2 #Action #FPS #Classic #Great_Soundtrack
|
||||||
|
- [ ] The Witcher #RPG #Fantasy #Story_Rich #Mature #Singleplayer
|
||||||
|
- [ ] The Witcher 2 #RPG #Fantasy #Story_Rich #Mature #Singleplayer
|
||||||
|
- [ ] The Witcher 3 #Open_World #RPG #Story_Rich #Atmospheric
|
||||||
|
- [ ] Dave the Diver #Pixel_Graphics #Casual #Managment #Adventure
|
||||||
|
- [ ] Serial Cleaner #Stealth #Action #Indie #2D #Gore #Blood
|
||||||
|
- [ ] Portal Revolution #Puzzle #Singleplayer #Mod #First_Person #Action
|
||||||
|
- [ ] Don't Starve #Survival #Open_World_Survival_Craft #Crafting #2D
|
||||||
|
- [ ] Prey #Sci_fi #Immersive_Sim #Space #Singleplayer
|
||||||
|
- [ ] System Shock #Action #Immersive_Sim #Cyberpunk #Adventure
|
||||||
|
- [ ] Celeste #Precision_Platformer #Difficult #Pixel_Graphics #2D
|
||||||
|
- [ ] Black Mesa #FPS #Remake #Action #Sci_fi #First_Person
|
||||||
|
- [ ] Borderlands #FPS #Co-op #Shooter #First_Person #Loot
|
||||||
|
- [ ] Borderlands the pre sequel
|
||||||
|
- [ ] NFS Heat #Racing #Multiplayer #Open_World #Driving #PvP
|
||||||
|
- [ ] NFS Unbound #Racing #Multiplayer #Open_World #Driving #Music
|
||||||
|
- [ ] BPM #FPS #Rythm #Roguelike #Action #Indie
|
||||||
|
- [x] Blasphemous #Metroidvania #Souls-like #Pixel_Graphics #Gore
|
||||||
|
- [ ] Blasphemous 2 #Combat #Fantasy #Metroidvania #Souls-like #2D
|
||||||
|
- [ ] Elden Ring #Souls-like #Open_World #Dark_Fantasy #RPG
|
||||||
|
- [ ] Bully #Open_World #Action #Adventure #Third_Person
|
||||||
|
- [ ] Crysis I #Action #FPS #Shooter #Sci_fi #Stealth #Aliens
|
||||||
|
- [ ] Crysis II #Action #FPS #Shooter #Sandbox #First_Person
|
||||||
|
- [ ] Crysis III #Action #FPS #Shooter #Aliens #Sci_fi #Sandbox
|
||||||
|
- [ ] Kingdom Come Deliverance #Medieval #RPG #Open_World #Singleplayer
|
||||||
|
- [ ] The Last of us Part 1 #Story_Rich #Post-apocalyptic #Zombies #Shooter
|
||||||
|
- [ ] Shadow of Mordor #Open_World #Action #Fantasy #Adventure #RPG
|
||||||
|
- [ ] Shadow of War #Open_World #Action #RPG #Singleplayer #Violent
|
||||||
|
- [ ] Monster Hunter Rise #Action #Online_Co-op #Character_Customization
|
||||||
|
- [ ] Thief #Stealth #Action #First_Person #Adventure #Dark
|
||||||
|
- [ ] Metal Gear Solid V: The Phantom Pain #Stealth #Open_World #Action #Story_Rich #Dark
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
# Conflicts
|
|
||||||
Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
|
|
||||||
(This file will automatically be deleted before commit)
|
|
||||||
[[#Additional Instructions]] available below file list
|
|
||||||
|
|
||||||
- Not a file: .obsidian/workspace.json
|
|
||||||
|
|
||||||
# Additional Instructions
|
|
||||||
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
|
|
||||||
|
|
||||||
```diff
|
|
||||||
<<<<<<< HEAD
|
|
||||||
File changes in local repository
|
|
||||||
=======
|
|
||||||
File changes in remote repository
|
|
||||||
>>>>>>> origin/main
|
|
||||||
```
|
|
||||||
Reference in New Issue
Block a user