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

Compare commits

base: martin:9f87bde07d8fd5605e49883cc2c351008b738dc7
Branches Tags
martin:main
..
compare: martin:0fd3aa6a8ad606b787b70d40f1923dc7ed10ac6e
Branches Tags
martin:main

No commits in common. "9f87bde07d8fd5605e49883cc2c351008b738dc7" and "0fd3aa6a8ad606b787b70d40f1923dc7ed10ac6e" have entirely different histories.
9f87bde07d ... 0fd3aa6a8a

1 changed files with 97 additions and 5 deletions
Show Stats Expand all files Collapse all files

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

@ -13,12 +13,20 @@
"state": {
"type": "markdown",
"state": {
"file": "Mapa/Přehled.md",
<<<<<<< HEAD
"file": "Kampaň/Kapitola 1.md",
=======
"file": "Mapa/Oblasti/Farma.md",
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "Přehled"
<<<<<<< HEAD
"title": "Kapitola 1"
=======
"title": "Farma"
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
}
}
]
@ -114,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",
@ -124,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
}
},
{
@ -133,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
}
},
{
@ -162,13 +202,39 @@
"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
}
},
{
"id": "146b1289ce778b66",
"type": "leaf",
"state": {
"type": "DICE_ROLLER_VIEW",
"state": {},
"icon": "dices",
"title": "Dice Tray"
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
}
}
]
@ -188,23 +254,48 @@
"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",
"Kampaň/Kapitola 1.md",
"Mapa/Přehled.md",
"Kampaň",
"Mapa/Oblasti/Farma.md",
"_meta/templates/Faction template.md",
"_meta/templates/Race template.md",
"_meta/templates/NPC template.md",
"NPCs/Rasy/Myši.md",
"_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",
"NPCs/Stat Bloky",
"Mapa/Oblasti/Domovská Vesnice.md",
"NPCs/Dřevorubcova žena.md",
"Untitledasdasd.md",
"_meta",
=======
"_meta/templates/Location template.md",
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
"_meta/templates",
"_meta",
"NPCs/Rasy/Myši.md",
"NPCs/Rasy",
"NPCs/Farmář.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",
@ -213,5 +304,6 @@
"NPCs",
"Welcome.md",
"Mapa"
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
]
}