martin/ObsidianVaults
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Martin Švrčina 2025-07-25 13:14:23 +02:00
commit 0fd3aa6a8a
1 changed files with 94 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
Mausritter - First Campaign/.obsidian/workspace.json vendored
View File

@ -4,73 +4,52 @@
"type": "split",
"children": [
{
"id": "b333904ec50e004a",
"id": "344c0034366991e2",
"type": "tabs",
"children": [
{
"id": "094e92a5832d9075",
"id": "2ca7ef4fa79fc38e",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
<<<<<<< HEAD
"file": "Kampaň/Kapitola 1.md",
=======
"file": "Mapa/Oblasti/Farma.md",
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
"mode": "source",
"source": false
},
"icon": "lucide-file",
<<<<<<< HEAD
"title": "Kapitola 1"
=======
"title": "Farma"
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
}
}
]
},
{
"id": "6afaf6cfa03c9ed6",
"id": "2819149a4a06e401",
"type": "tabs",
"children": [
{
"id": "2fd683a7366f9119",
"id": "2694f1d2b1f5ca79",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "_meta/templates/Faction template.md",
"file": "Mapa/Přehled.md",
"mode": "preview",
"source": false
},
"icon": "lucide-file",
"title": "Faction template"
}
},
{
"id": "b71f94d9211c6034",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Mapa/Oblasti/Domovská Vesnice.md",
"mode": "preview",
"source": false
},
"icon": "lucide-file",
"title": "Domovská Vesnice"
}
},
{
"id": "507605de4d9a5fa9",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "NPCs/Rasy/Myši.md",
"mode": "preview",
"source": false
},
"icon": "lucide-file",
"title": "Myši"
"title": "Přehled"
}
}
],
"currentTab": 2
]
}
],
"direction": "vertical"
@ -127,7 +106,7 @@
}
],
"direction": "horizontal",
"width": 300
"width": 200
},
"right": {
"id": "0df565fac0f24c78",
@ -143,7 +122,15 @@
"state": {
"type": "backlink",
"state": {
<<<<<<< HEAD
"file": "Kampaň/Kapitola 1.md",
=======
<<<<<<< HEAD
"file": "Lokace/Přehled.md",
=======
"file": "_meta/templates/Race template.md",
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@ -153,7 +140,15 @@
"unlinkedCollapsed": true
},
"icon": "links-coming-in",
<<<<<<< HEAD
"title": "Backlinks for Kapitola 1"
=======
<<<<<<< HEAD
"title": "Backlinks for Přehled"
=======
"title": "Backlinks for Race template"
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
}
},
{
@ -162,12 +157,28 @@
"state": {
"type": "outgoing-link",
"state": {
<<<<<<< HEAD
"file": "Kampaň/Kapitola 1.md",
=======
<<<<<<< HEAD
"file": "Lokace/Přehled.md",
=======
"file": "_meta/templates/Race template.md",
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
"linksCollapsed": false,
"unlinkedCollapsed": true
},
"icon": "links-going-out",
<<<<<<< HEAD
"title": "Outgoing links from Kapitola 1"
=======
<<<<<<< HEAD
"title": "Outgoing links from Přehled"
=======
"title": "Outgoing links from Race template"
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
}
},
{
@ -191,13 +202,28 @@
"state": {
"type": "outline",
"state": {
<<<<<<< HEAD
"file": "Kampaň/Kapitola 1.md",
=======
<<<<<<< HEAD
"file": "Lokace/Přehled.md",
=======
"file": "_meta/templates/Race template.md",
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
"followCursor": false,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-list",
<<<<<<< HEAD
"title": "Outline of Kapitola 1"
=======
<<<<<<< HEAD
"title": "Outline of Přehled"
=======
"title": "Outline of Race template"
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
}
},
{
@ -208,14 +234,15 @@
"state": {},
"icon": "dices",
"title": "Dice Tray"
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
}
}
],
"currentTab": 4
]
}
],
"direction": "horizontal",
"width": 341.5
"width": 300,
"collapsed": true
},
"left-ribbon": {
"hiddenItems": {
@ -227,6 +254,12 @@
"command-palette:Open command palette": false
}
},
<<<<<<< HEAD
"active": "2ca7ef4fa79fc38e",
"lastOpenFiles": [
"_meta/templates/Faction template.md",
"_meta/templates/Race template.md",
=======
"active": "094e92a5832d9075",
"lastOpenFiles": [
"Kampaň/Intro.md",
@ -238,7 +271,9 @@
"_meta/templates/Faction template.md",
"Lore",
"_meta/templates/Location template.md",
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
"_meta/templates/NPC template.md",
<<<<<<< HEAD
"Mapa/POIs",
"NPCs/Starosta.md",
"NPCs/Rasy",
@ -247,15 +282,28 @@
"NPCs/Dřevorubcova žena.md",
"Untitledasdasd.md",
"_meta",
=======
"_meta/templates/Location template.md",
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
"_meta/templates",
"Mapa/Dungeony",
"NPCs/Frakce",
"Mapa/Oblasti/Farma.md",
"_meta",
"NPCs/Rasy/Myši.md",
"NPCs/Rasy",
"NPCs/Farmář.md",
"Lokace/Přehled.md",
"NPCs",
"Mapa/Oblasti/Pařez.md",
"Mapa/Přehled.md",
"Mapa/Oblasti/Farma.md",
"Mapa/Oblasti/Krtčí nora.md",
<<<<<<< HEAD
"Welcome.md"
=======
"Mapa/Oblasti/Domovská Vesnice.md",
"Mapa/Oblasti/Pařez.md",
"NPCs/Dřevorubcova žena.md",
"NPCs/Starosta.md",
"Mapa/Oblasti",
"NPCs",
"Welcome.md",
"Mapa"
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
]
}