From c8ea26ecbb1cc4bf22a578660193e669e406197c Mon Sep 17 00:00:00 2001
From: Kurt <kurt_momberg@yahoo.com>
Date: Fri, 14 May 2021 22:58:01 -0400
Subject: [PATCH 1/6] Fix typo in revert description card
---
resources/cards.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/cards.json b/resources/cards.json
index 79b51ca..631a7e5 100644
--- a/resources/cards.json
+++ b/resources/cards.json
@@ -107,7 +107,7 @@
{
"id": "revert",
"command": "git revert [commit]",
- "description": "Make a new commit that reverts the changes of the speicified commit."
+ "description": "Make a new commit that reverts the changes of the specified commit."
},
{
"id": "bisect-start",
From 0ea34e6bd9072873bccba629dadf1e454a8c4c06 Mon Sep 17 00:00:00 2001
From: Elatronion <ezra@duck.com>
Date: Wed, 16 Feb 2022 21:38:05 -0500
Subject: [PATCH 2/6] fix typo in bisect level Yellow brick road
`"bisect good card"` has been changed to `"bisect good" card` to be more accurate and consistent with `"bisect start" card` and `"bisect bad" card`.
---
levels/bisect/bisect | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/levels/bisect/bisect b/levels/bisect/bisect
index 0b66edb..cf7bf6a 100644
--- a/levels/bisect/bisect
+++ b/levels/bisect/bisect
@@ -9,7 +9,7 @@ Oh no! You have lost your key at some point during the day!
Sure, you could look at every single commit in an attempt to find it - but there's a better way: your time machine has a built-in way to find the point in time where things went wrong quickly!
-First, play the "bisect start" card. Then, go to a commit where you don't have the key, and play the "bisect bad" card. Likewise, go to a commit early on where you have the key *in your pocket*, and play the "bisect good card".
+First, play the "bisect start" card. Then, go to a commit where you don't have the key, and play the "bisect bad" card. Likewise, go to a commit early on where you have the key *in your pocket*, and play the "bisect good" card.
After you've found the last good commit, reset the main branch to it. What happened to the key after you lost it?
From d67e5056ea75de47683b4f873b0b37601918e658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Piccioni?= <german.n.piccioni@gmail.com>
Date: Mon, 20 Jun 2022 01:33:30 +0200
Subject: [PATCH 3/6] Added in the description the location of the repo to
clone.
---
levels/workflows/pr | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/levels/workflows/pr b/levels/workflows/pr
index 1c72510..2496c1f 100644
--- a/levels/workflows/pr
+++ b/levels/workflows/pr
@@ -3,7 +3,8 @@ cards = clone commit-auto reset-hard checkout file-new branch
[description]
-Your friend has a problem! Clone the repo, create a branch called "solution", and fix the problem in this branch. When you're ready, make a "Pull Request" by using `git tag pr`.
+Your friend has a problem! Clone the repo located in `../friend`, create a branch called "solution", and fix the problem in this branch. When you're ready, make a "Pull Request" by using `git tag pr`.
+
[setup]
From 73966b27bb889bde342c9e8dafe0e266e231a943 Mon Sep 17 00:00:00 2001
From: Niklas <derNiklaas@users.noreply.github.com>
Date: Tue, 18 Apr 2023 16:18:09 +0200
Subject: [PATCH 4/6] Fixed Logos for organizations that fund the project
---
README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0f7ee77..67ed26f 100644
--- a/README.md
+++ b/README.md
@@ -88,8 +88,10 @@ To build your own binaries, you'll need Godot's [export templates](https://docs.
We have a [Code of Conduct](CODE_OF_CONDUCT.md) in place that applies to all project contributions, including issues and pull requests.
## Funded by
+https://www.dipf.de/en/images/BMBF_4C_M_e.jpg/@@download/image/BMBF_4C_M_e.jpg
+https://raw.githubusercontent.com/prototypefund/ptf-ci/main/logos/PrototypeFund-Icon.svg
-<a href="https://www.bmbf.de/en/"><img src="https://timelens.io/assets/images/bmbf.svg" alt="Logo of the German Ministry for Education and Research" height="100px"></a> <a href="https://prototypefund.de/en/"><img src="https://timelens.io/assets/images/prototypefund.svg" alt="Logo of the Prototype Fund" height="100px"></a> <a href="https://okfn.de/en/"><img src="https://timelens.io/assets/images/okfde.svg" alt="Logo of the Open Knowledge Foundation Germany" height="100px"></a>
+<a href="https://www.bmbf.de/en/"><img src="https://www.dipf.de/en/images/BMBF_4C_M_e.jpg/@@download/image/BMBF_4C_M_e.jpg" alt="Logo of the German Ministry for Education and Research" height="100px"></a> <a href="https://prototypefund.de/en/"><img src="https://raw.githubusercontent.com/prototypefund/ptf-ci/main/logos/PrototypeFund-Icon.svg" alt="Logo of the Prototype Fund" height="100px"></a> <a href="https://okfn.de/en/"><img src="https://upload.wikimedia.org/wikipedia/commons/4/4d/Open_Knowledge_Foundation_Deutschland_Logo.svg" alt="Logo of the Open Knowledge Foundation Germany" height="100px"></a>
## Thanks
From 70c0d5576f153dbd1b3039c9713f3a54b896bd58 Mon Sep 17 00:00:00 2001
From: Niklas <derNiklaas@users.noreply.github.com>
Date: Tue, 18 Apr 2023 16:19:51 +0200
Subject: [PATCH 5/6] Removed lines left over from pasting the images
---
README.md | 2 --
1 file changed, 2 deletions(-)
diff --git a/README.md b/README.md
index 67ed26f..1abba11 100644
--- a/README.md
+++ b/README.md
@@ -88,8 +88,6 @@ To build your own binaries, you'll need Godot's [export templates](https://docs.
We have a [Code of Conduct](CODE_OF_CONDUCT.md) in place that applies to all project contributions, including issues and pull requests.
## Funded by
-https://www.dipf.de/en/images/BMBF_4C_M_e.jpg/@@download/image/BMBF_4C_M_e.jpg
-https://raw.githubusercontent.com/prototypefund/ptf-ci/main/logos/PrototypeFund-Icon.svg
<a href="https://www.bmbf.de/en/"><img src="https://www.dipf.de/en/images/BMBF_4C_M_e.jpg/@@download/image/BMBF_4C_M_e.jpg" alt="Logo of the German Ministry for Education and Research" height="100px"></a> <a href="https://prototypefund.de/en/"><img src="https://raw.githubusercontent.com/prototypefund/ptf-ci/main/logos/PrototypeFund-Icon.svg" alt="Logo of the Prototype Fund" height="100px"></a> <a href="https://okfn.de/en/"><img src="https://upload.wikimedia.org/wikipedia/commons/4/4d/Open_Knowledge_Foundation_Deutschland_Logo.svg" alt="Logo of the Open Knowledge Foundation Germany" height="100px"></a>
From 8e9617af93f0d22b5d1c969bc072f06058da4475 Mon Sep 17 00:00:00 2001
From: Jason Yundt <jason@jasonyundt.email>
Date: Thu, 11 May 2023 07:49:51 -0400
Subject: [PATCH 6/6] Clarify Godot requirements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
At the moment, the most recent commit to the main branch was created
before Godot 4 was released [1] [2]. When that commit was created, it
was accurate to tell users to download the latest version of Godot
because the latest version of Godot was a version of Godot 3. Now, that
statement is no longer accurate because the latest version of Godot is
a version of Godot 4, and Oh My Git! hasn’t been ported to Godot 4 yet.
It’s possible that we can just import Oh My Git! into Godot 4 and have
it work fine, but that would require significant testing that I’m not
going to do at the moment.
[1]: 853b8e2 (Merge pull request #144 from n4mr3g/patch-1, 2022-07-19)
[2]: <https://godotengine.org/article/godot-4-0-sets-sail/>
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0f7ee77..3215484 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ If you have ideas for new features, we'd be excited to hear them! Also in that c
Wanna build your own level? Great! Here's how to do it:
-1. Download the latest version of the [Godot game engine](https://godotengine.org).
+1. Download the latest version of the [Godot **3** game engine](https://godotengine.org/download/3.x). Godot 4 is not supported yet.
1. Clone this repository.
1. Run the game – the easiest way to do so is to run `godot scenes/main.tscn` from the project directory.
1. Get a bit familiar with the levels which are currently there.