diff --git a/.obsidian/plugins/obsidian-git/main.js b/.obsidian/plugins/obsidian-git/main.js index 7debbee0..4c577c13 100644 --- a/.obsidian/plugins/obsidian-git/main.js +++ b/.obsidian/plugins/obsidian-git/main.js @@ -31065,6 +31065,7 @@ var IsomorphicGit = class extends GitManager { "110": "DA", // Technically, two files: first one is deleted "D " and second one is untracked "??" "111": " ", + "113": "MM", "120": "DA", // Same as "110" "121": " M", @@ -32181,7 +32182,7 @@ var ObsidianGitSettingsTab = class extends import_obsidian8.PluginSettingTab { }) ); new import_obsidian8.Setting(containerEl).setName("Commit message on auto backup/commit").setDesc( - "Available placeholders: {{date}} (see below), {{hostname}} (see below) and {{numFiles}} (number of changed files in the commit)" + "Available placeholders: {{date}} (see below), {{hostname}} (see below), {{numFiles}} (number of changed files in the commit) and {{files}} (changed files in commit message)" ).addText( (text2) => text2.setPlaceholder("vault backup: {{date}}").setValue(plugin.settings.autoCommitMessage).onChange((value) => { plugin.settings.autoCommitMessage = value; @@ -32191,7 +32192,7 @@ var ObsidianGitSettingsTab = class extends import_obsidian8.PluginSettingTab { containerEl.createEl("br"); containerEl.createEl("h3", { text: "Commit message" }); new import_obsidian8.Setting(containerEl).setName("Commit message on manual backup/commit").setDesc( - "Available placeholders: {{date}} (see below), {{hostname}} (see below) and {{numFiles}} (number of changed files in the commit)" + "Available placeholders: {{date}} (see below), {{hostname}} (see below), {{numFiles}} (number of changed files in the commit) and {{files}} (changed files in commit message)" ).addText( (text2) => text2.setPlaceholder("vault backup: {{date}}").setValue( plugin.settings.commitMessage ? plugin.settings.commitMessage : "" @@ -43127,10 +43128,6 @@ var ObsidianGit = class extends import_obsidian30.Plugin { committedFiles = await this.gitManager.commit(cmtMessage); } else { committedFiles = await this.gitManager.commitAll({ - // A type error occurs here because `this.settings.autoCommitMessage` is possibly undefined. - // However, since `this.settings.autoCommitMessage` is always set to string in `this.migrateSettings`, - // `undefined` is never passed here. Therefore, temporarily ignore this error. - // @ts-ignore message: cmtMessage, status: status2, unstagedFiles diff --git a/.obsidian/plugins/obsidian-git/manifest.json b/.obsidian/plugins/obsidian-git/manifest.json index a3162b5a..36569773 100644 --- a/.obsidian/plugins/obsidian-git/manifest.json +++ b/.obsidian/plugins/obsidian-git/manifest.json @@ -5,5 +5,5 @@ "isDesktopOnly": false, "fundingUrl": "https://ko-fi.com/vinzent", "js": "main.js", - "version": "2.20.3" + "version": "2.20.4" } diff --git a/.obsidian/plugins/obsidian-hider/data.json b/.obsidian/plugins/obsidian-hider/data.json index 54f15af6..6d15a86b 100644 --- a/.obsidian/plugins/obsidian-hider/data.json +++ b/.obsidian/plugins/obsidian-hider/data.json @@ -1,5 +1,5 @@ { - "hideRibbon": false, + "hideRibbon": true, "hideStatus": false, "hideTabs": true, "hideScroll": false, diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 82c7280e..1b602d48 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -6,7 +6,6 @@ { "id": "1005844132e798f5", "type": "tabs", - "dimension": 40.99547511312217, "children": [ { "id": "1a81d9f000627cca", @@ -14,34 +13,43 @@ "state": { "type": "markdown", "state": { - "file": "BBG4E/HW12.md", + "file": "46-1Corinthians/1Co.11.23-28.md", "mode": "source", "backlinks": false, "source": true } - }, - "group": "98d95b26b4414933" - } - ] - }, - { - "id": "f0bc3f93d8470d2d", - "type": "tabs", - "dimension": 59.00452488687783, - "children": [ + } + }, { - "id": "e4c58faa39706a81", + "id": "41b3f794595f0611", "type": "leaf", "state": { "type": "markdown", "state": { - "file": "BBG4E/HW12.md", - "mode": "preview", - "backlinks": false, + "file": "46-1Corinthians/1Co.11.23-28.md", + "mode": "source", "source": true } - }, - "group": "98d95b26b4414933" + } + } + ], + "currentTab": 1 + }, + { + "id": "3135fa663d498e8c", + "type": "tabs", + "children": [ + { + "id": "0d94ab6b455d7518", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "46-1Corinthians/1Co.11.23-28.md", + "mode": "preview", + "source": true + } + } } ] } @@ -101,7 +109,8 @@ } ], "direction": "horizontal", - "width": 267 + "width": 267, + "collapsed": true }, "right": { "id": "1464b72f66019d33", @@ -117,7 +126,7 @@ "state": { "type": "outline", "state": { - "file": "BBG4E/HW12.md" + "file": "46-1Corinthians/1Co.11.23-28.md" } } }, @@ -138,7 +147,7 @@ "state": { "type": "backlink", "state": { - "file": "BBG4E/HW12.md", + "file": "46-1Corinthians/1Co.11.23-28.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -155,7 +164,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "BBG4E/HW12.md", + "file": "46-1Corinthians/1Co.11.23-28.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -178,8 +187,12 @@ "workspaces:Manage workspace layouts": false } }, - "active": "1a81d9f000627cca", + "active": "41b3f794595f0611", "lastOpenFiles": [ + "64-3John/3John-Interlinear.md", + "46-1Corinthians/1Co.11.23-28.md", + "46-1Corinthians/1Co.12.3-14.md", + "BBG4E/HW12.md", "BBG4E/HW11.md", "BBG4E/HW7.md", "BBG4E/HW6.md", @@ -202,10 +215,6 @@ "BBG4E/HW2-Key.md", "BBG4E/HW1-Key.md", "BBG4E/HW3.md", - "BBG4E/HW1.md", - "BBG4E/HW11-PreachingNote.md", - "BBG4E/HWy.md", - "BBG4E/HWx.md", "BBG4E/BG4E 規劃.canvas", "62-1John/1Jo.4.7-12.pdf", "images/Pasted image 20230403142914.png", diff --git a/46-1Corinthians/1Co.11.23-28.md b/46-1Corinthians/1Co.11.23-28.md new file mode 100644 index 00000000..55ef8fa5 --- /dev/null +++ b/46-1Corinthians/1Co.11.23-28.md @@ -0,0 +1,29 @@ +- 11:23a (ἘγὼἐγώIP-1NS)S γὰργάρforCONJ (παρέλαβονπαραλαμβάνωreceivedV-AAI-1S)P (ἀπὸἀπόfromPREP τοῦtheT-GSM Κυρίου,κύριοςLordN-GSM)A (11:23b)C + - 11:23b { (ὅςthat whichR-ASN)C1 (καὶκαίalsoCONJ)A (παρέδωκαπαραδίδωμιI deliveredV-AAI-1S)P (ὑμῖν,σύto youP-2DP)C2 } + - ———————— + - 11:23c ὅτιὅτιthatCONJ (theT-NSM ΚύριοςκύριοςLordN-NSM =ἸησοῦςἸησοῦςJesusN-NSM-P)S (ἐνἐνinPREP τῇtheT-DSF νυκτὶνύξnightN-DSF°¹)A ⸉⸊ (ἔλαβενλαμβάνωtookV-AAI-3S)P (ἄρτονἄρτοςbreadN-ASM)C + - 11:23d ⸉ {ᾗ°¹⮥ὅςin whichR-DSF (παρεδίδετοπαραδίδωμιHe was betrayedV-IPI-3S)P }⸊ + - 11:24a καὶκαίandCONJ (εὐχαριστήσαςεὐχαριστέωhaving given thanksV-AAP-NSM)A (ἔκλασενκλάωHe broke [it]V-AAI-3S)P + - 11:24b καὶκαίandCONJ (εἶπεν·εἶπονsaidV-AAI-3S)P + - ⋯⋯⋯⋯⋯⋯⋯ + - 11:24c (ΤοῦτόοὗτοςThisD-NSN)S (μούἐγώof MeP-1GS)⦇ (ἐστινεἰμίisV-PAI-3S)P ⦈(τὸtheT-NSN σῶμασῶμαbodyN-NSN =τὸwhich [is]T-NSN ὑπὲρὑπέρforPREP ὑμῶν·σύyouP-2GP)C + - 11:24d (τοῦτοοὗτοςthisD-ASN)C (ποιεῖτεποιέωdoV-PAI⁞PAM-2P)P (εἰςεἰςinPREP τὴν-T-ASF ἐμὴνἐμόςof MeS-1SASF ἀνάμνησιν.ἀνάμνησιςremembranceN-ASF)A + - 11:25a ὡσαύτωςὡσαύτωςLikewiseADV (καὶκαίalsoCONJ)A ...**ἔλαβεν**... (τὸtheT-ASN ποτήριονποτήριονcupN-ASN)C (μετὰμετάafterPREP τὸ-T-ASN δειπνῆσαιδειπνέωhaving suppedV-AAN)A (λέγων·λέγωsayingV-PAP-NSM)A + - ⋯⋯⋯⋯⋯⋯⋯ + - 11:25b (ΤοῦτοοὗτοςThisD-NSN τὸ-T-NSN ποτήριονποτήριονcupN-NSN)S (theT-NSF καινὴκαινόςnewA-NSF διαθήκηδιαθήκηcovenantN-NSF)C (ἐστὶνεἰμίisV-PAI-3S)P (ἐνἐνinPREP τῷ-T-DSN ἐμῷἐμόςMyS-1SDSN αἵματι·αἷμαbloodN-DSN)A + - 11:25d (τοῦτοοὗτοςthisD-ASN)C (ποιεῖτε,ποιέωdoV-PAI⁞PAM-2P)P ⸉⸊ (εἰςεἰςinPREP τὴν-T-ASF ἐμὴνἐμόςof MeS-1SASF ἀνάμνησιν.ἀνάμνησιςremembranceN-ASF)A + - 11:25e ⸉ { (ὁσάκιςὁσάκιςas often asCONJ ἐὰνἐάνifPRT)A (πίνητε,πίνωyou might drink [it]V-PAS-2P)P } ⸊ + - ———————— +- 11:26a ⸉γὰργάρforCONJ⸊ + - 11:26b (ὁσάκιςὁσάκιςAs often asCONJ ⸉⸊ ἐὰνἐάνifPRT)A (ἐσθίητεἐσθίωyou may eatV-PAS-2P)P (τὸνtheT-ASM ἄρτονἄρτοςbreadN-ASM τοῦτονοὗτοςthisD-ASM)C + - 11:26b καὶκαίandCONJ (τὸtheT-ASN ποτήριονποτήριονcupN-ASN)C (πίνητε,πίνωmay drinkV-PAS-2P)P +- 11:26c (τὸνtheT-ASM θάνατονθάνατοςdeathN-ASM τοῦof theT-GSM ΚυρίουκύριοςLordN-GSM)C (καταγγέλλετεκαταγγέλλωyou proclaimV-PAI-2P)P { ἄχριἄχριuntilPREP οὗὅςthatR-GSM (ἔλθῃ.¶ἔρχομαιHe should comeV-AAS-3S)P }A +- ═════════════ +- 11:27a ὭστεὥστεThereforeCONJ + - 11:27b (ὃςὅςwhoeverR-NSM ἂνἄν-PRT)S (ἐσθίῃἐσθίωshould eatV-PAS-3S)P (τὸνtheT-ASM ἄρτονἄρτοςbreadN-ASM)C + - 11:27c orCONJ (πίνῃπίνωshould drinkV-PAS-3S)P (τὸtheT-ASN ποτήριονποτήριονcupN-ASN τοῦof theT-GSM ΚυρίουκύριοςLordN-GSM)C (ἀναξίως,ἀναξίωςunworthilyADV)A +- 11:27d (ἔνοχοςἔνοχοςguiltyA-NSM)⦇ (ἔσταιεἰμίwill beV-FDI-3S)P ⦈(τοῦof theT-GSN σώματοςσῶμαbodyN-GSN καὶκαίandCONJ τοῦof theT-GSN αἵματοςαἷμαbloodN-GSN τοῦof theT-GSM Κυρίου.κύριοςLordN-GSM)C +- ⋯⋯⋯⋯⋯⋯⋯ +- 11:28a (δοκιμαζέτωδοκιμάζωLet examineV-PAM-3S)P δὲδέhoweverCONJ (ἄνθρωποςἄνθρωποςa manN-NSM)S (ἑαυτόνἑαυτοῦhimselfF-3ASM)C +- 11:28b καὶκαίandCONJ (οὕτωςοὕτω, οὕτωςin this mannerADV )A (ἐκἐκofPREP τοῦtheT-GSM ἄρτουἄρτοςbreadN-GSM)A (ἐσθιέτωἐσθίωlet him eatV-PAM-3S)P +- 11:28c καὶκαίandCONJ (ἐκἐκofPREP τοῦtheT-GSN ποτηρίουποτήριονcupN-GSN)A (πινέτω·πίνωlet him drinkV-PAM-3S)P \ No newline at end of file