From 37fedf25b1f806c3ba5d3a3820c8c04fc528b845 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 25 Jun 2020 00:49:58 +0200 Subject: [PATCH 1/2] added touchy tickets as a project --- .htaccess | 2 +- res/projects/tt.png | Bin 0 -> 8478 bytes scripts/projects.js | 19 ++++++++++++++----- 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 res/projects/tt.png diff --git a/.htaccess b/.htaccess index c85c396..9d399ad 100644 --- a/.htaccess +++ b/.htaccess @@ -19,7 +19,7 @@ RewriteRule ^minecraft-stuff/?$ "https://ellpeck.de/projects" [R=301,L] RewriteRule ^yt/?$ "https://www.youtube.com/c/ellpeck" [R=301,L] RewriteRule ^wishlist/?$ "https://www.amazon.de/hz/wishlist/ls/LZO9Y2Z3VJ5Q?&sort=default" [R=301,L] RewriteRule ^commissions/?$ "https://ellpeck.de/#commissions" [NE,R=301,L] -RewriteRule ^fftranslate/?$ "https://poeditor.com/join/project/ElzC23ecB6" [NE,R=301,L] +RewriteRule ^fftranslate/?$ "https://poeditor.com/join/project/ElzC23ecB6" [R=301,L] ErrorDocument 404 /404.html diff --git a/res/projects/tt.png b/res/projects/tt.png new file mode 100644 index 0000000000000000000000000000000000000000..3accb3055850245d9f7de76fe332151f5e338d75 GIT binary patch literal 8478 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 E11AlD<^TWy literal 0 HcmV?d00001 diff --git a/scripts/projects.js b/scripts/projects.js index 4af9303..0f5c335 100644 --- a/scripts/projects.js +++ b/scripts/projects.js @@ -1,11 +1,11 @@ const projects = [{ - name: "Foe Frenzy", - desc: "Foe Frenzy is a fast-paced fighting game where you battle up to three of your friends with random, short-lasting items in an attempt to be the last survivor.", + name: 'Touchy Tickets', + desc: "Touchy Tickets is a fun idle game for Android that has you selling tickets with various theme park attractions. It'll probably be released for iOS at some point, too.", links: { - "Check it out": "/foefrenzy" + 'Google Play': "https://play.google.com/store/apps/details?id=de.ellpeck.touchytickets" }, - status: "Released", - icon: "ff" + status: "In development", + icon: 'tt' }, { name: 'Actually Additions', @@ -44,6 +44,15 @@ const projects = [{ }, status: "Side project", icon: "mlem" + }, + { + name: "Foe Frenzy", + desc: "Foe Frenzy is a fast-paced fighting game where you battle up to three of your friends with random, short-lasting items in an attempt to be the last survivor.", + links: { + "Check it out": "/foefrenzy" + }, + status: "Released", + icon: "ff" } ]; From cdea4beaae2afa58face872fc5d80b5bce353ded Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jul 2020 12:22:31 +0000 Subject: [PATCH 2/2] Bump lodash from 4.17.15 to 4.17.19 in /node Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19) Signed-off-by: dependabot[bot] --- node/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/node/package-lock.json b/node/package-lock.json index 6ecf992..b412047 100644 --- a/node/package-lock.json +++ b/node/package-lock.json @@ -482,9 +482,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, "lodash.sortby": { "version": "4.7.0",