diff --git a/main/.htaccess b/main/.htaccess index 66f6c52..46bc751 100644 --- a/main/.htaccess +++ b/main/.htaccess @@ -18,21 +18,18 @@ RewriteRule ^press(/.*)?$ "https://press.ellpeck.de$1" [R=301,L] RewriteRule ^tinylife/?$ "https://tinylifegame.com" [R=301,L] RewriteRule ^foefrenzy/?$ "https://store.steampowered.com/app/1194170/" [R=301,L] -# anchor redirects (need NE = no escaping for the hash symbol) -RewriteRule ^projects/?$ "https://ellpeck.de/#projects" [NE,R=301,L] -RewriteRule ^privacy/?$ "https://ellpeck.de/#privacy" [NE,R=301,L] -RewriteRule ^impressum/?$ "https://ellpeck.de/#impressum" [NE,R=301,L] -RewriteRule ^blog/?$ "https://ellpeck.de/#blog" [NE,R=301,L] +# anchor redirects +RewriteRule ^projects/?$ "https://ellpeck.de/#projects" [R=301,L,NE] +RewriteRule ^blog/?$ "https://ellpeck.de/#blog" [R=301,L,NE] # actually additions redirects RewriteRule ^actaddchangelog/?$ "https://github.com/Ellpeck/ActuallyAdditions/blob/main/update/changelog.md" [R=301,L] -RewriteRule ^actadddownload/?$ "https://minecraft.curseforge.com/projects/actually-additions/files" [R=301,L] -RewriteRule ^actaddlicense/?$ "https://github.com/Ellpeck/ActuallyAdditions/blob/main/LICENSE.md" [R=301,L] -RewriteRule ^actadd/?$ "https://minecraft.curseforge.com/projects/actually-additions" [R=301,L] +RewriteRule ^actadddownload/?$ "https://www.curseforge.com/minecraft/mc-mods/actually-additions/files" [R=301,L] +RewriteRule ^actaddlicense/?$ "https://github.com/Ellpeck/ActuallyAdditions/blob/main/LICENSE" [R=301,L] +RewriteRule ^actadd/?$ "https://www.curseforge.com/minecraft/mc-mods/actually-additions" [R=301,L] # other permanent redirects RewriteRule ^discord/?$ "https://discord.gg/Uy2ZM9X" [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 ^fftranslate/?$ "https://poeditor.com/join/project/ElzC23ecB6" [R=301,L] -RewriteRule ^reedsy/?$ "https://blog.reedsy.com/creative-writing-prompts/author/ell-peck/" [R=301,L] \ No newline at end of file +RewriteRule ^wishlist/?$ "https://www.amazon.de/hz/wishlist/ls/LZO9Y2Z3VJ5Q?&sort=default" [R=301,L,NE] +RewriteRule ^reedsy/?$ "https://blog.reedsy.com/creative-writing-prompts/author/ell-peck/" [R=301,L] +RewriteRule ^sims4gallery/?$ "https://www.ea.com/games/the-sims/the-sims-4/pc/gallery/browse?category=all&searchtype=ea_origin_id&time=all&searchquery=Ellpeck&maxis=false" [R=301,L,NE] \ No newline at end of file diff --git a/main/404.html b/main/404.html index c94c2cc..6f4f5f7 100644 --- a/main/404.html +++ b/main/404.html @@ -48,7 +48,7 @@
-

Four Oh Four

+

๐Ÿ’” Four Oh Four

There's nothing here, I'm sorry.

diff --git a/main/Gemfile b/main/Gemfile index 7f99339..4989be4 100644 --- a/main/Gemfile +++ b/main/Gemfile @@ -4,4 +4,5 @@ source "https://rubygems.org" git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } -gem "jekyll" \ No newline at end of file +gem "jekyll" +gem "webrick" diff --git a/main/Gemfile.lock b/main/Gemfile.lock index 36f9ab7..e6c1fc8 100644 --- a/main/Gemfile.lock +++ b/main/Gemfile.lock @@ -3,7 +3,6 @@ GEM specs: addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - coderay (1.1.3) colorator (1.1.0) concurrent-ruby (1.1.9) em-websocket (0.5.2) @@ -38,9 +37,6 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - kramdown-syntax-coderay (1.0.1) - coderay (~> 1.1) - kramdown (~> 2.0) liquid (4.0.3) listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) @@ -60,13 +56,14 @@ GEM terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (1.7.0) + webrick (1.7.0) PLATFORMS x64-mingw32 DEPENDENCIES jekyll - kramdown-syntax-coderay + webrick BUNDLED WITH 2.2.22 diff --git a/main/_data/projects.json b/main/_data/projects.json index 5bce100..1d8d161 100644 --- a/main/_data/projects.json +++ b/main/_data/projects.json @@ -1,5 +1,5 @@ [{ - "name": "Actually Additions", + "name": "๐Ÿ’ก Actually Additions", "desc": "Actually Additions is a rather popular Minecraft mod that I used to work on. It's become widely known in the modding community and has reached over 30 million downloads by now, which is crazy. I don't work on it anymore myself, but it's being maintained for current versions by someone else.", "links": [{ "name": "CurseForge page", @@ -15,7 +15,7 @@ "icon": "aa" }, { - "name": "Nature's Aura", + "name": "๐ŸŒฒ Nature's Aura", "desc": "Nature's Aura is a Minecraft mod about collecting, using and replenishing the Aura naturally present in the world to create useful devices and unique mechanics.", "status": "In development", "links": [{ @@ -28,7 +28,7 @@ "icon": "na" }, { - "name": "Pretty Pipes", + "name": "๐Ÿš‹ Pretty Pipes", "desc": "Pretty Pipes is a simple to use, all-inclusive item transport mod for Minecraft. It features simple pipes that can be upgraded using modules to accomplish much more advanced tasks.", "status": "In development", "links": [{ @@ -41,7 +41,7 @@ "icon": "pp" }, { - "name": "Tiny Life", + "name": "๐Ÿก Tiny Life", "desc": "Tiny Life is a fun simulation game that tries to capture the essence of games like The Sims, but in an isometric pixelart style. It's currently in development, but you can already play it and even make your own mods!", "status": "In development", "links": [{ @@ -51,7 +51,7 @@ "icon": "tiny" }, { - "name": "MLEM", + "name": "๐Ÿ•น๏ธ MLEM", "desc": "MLEM Library for Extending MonoGame is an addition to the game framework MonoGame that provides extension methods, quality of life improvements and additional features like a Ui system and easy input handling.", "links": [{ "name": "Get it on NuGet", @@ -64,7 +64,7 @@ "icon": "mlem" }, { - "name": "Touchy Tickets", + "name": "๐ŸŽŸ๏ธ Touchy Tickets", "desc": "Touchy Tickets is a fun idle game for Android that has you selling tickets with various theme park attractions.", "links": [{ "name": "Google Play", diff --git a/main/_includes/about.html b/main/_includes/about.html index 8e9f9a3..e9a0c0a 100644 --- a/main/_includes/about.html +++ b/main/_includes/about.html @@ -1,6 +1,6 @@
-

About

+

๐Ÿ’ฌ About

Sometimes, some people ask me some questions about myself or my projects, so I decided to compile a list of some of the answers in a Q&A-like fashion so that I don't have to keep repeating them. If you're curious about me, this might be interesting to you!

diff --git a/main/_includes/blog.html b/main/_includes/blog.html index 90d56db..e7a5d61 100644 --- a/main/_includes/blog.html +++ b/main/_includes/blog.html @@ -5,7 +5,7 @@ {% endfor %}
-

Blog

+

๐Ÿ“” Blog

This is my blog, where I post about gaming, programming and life. The featured posts are the ones you'll probably be most interested in, but you can select a different category to see every post.
Please be advised that some posts, especially short stories, may contain mature content. diff --git a/main/_includes/footer.html b/main/_includes/footer.html index 2ea9656..3645a06 100644 --- a/main/_includes/footer.html +++ b/main/_includes/footer.html @@ -4,64 +4,10 @@

- © 2018-2021 Ellpeck – Impressum – Privacy + © 2018-2021 Ellpeck – Impressum – Privacy
A blob emoji holding a heart
-
- - - - - - \ No newline at end of file diff --git a/main/_includes/nav/blognav.html b/main/_includes/nav/blognav.html index 0a2d7c5..6035e4b 100644 --- a/main/_includes/nav/blognav.html +++ b/main/_includes/nav/blognav.html @@ -16,10 +16,10 @@ {% break %} {% endfor %} -Back to Main Page +๐Ÿ  Back to Main Page {% if prev %} -Previous {{ tag }} Post +โฎ๏ธ Previous {{ tag }} Post {% endif %} {% if next %} -Next {{ tag }} Post +โญ๏ธ Next {{ tag }} Post {% endif %} \ No newline at end of file diff --git a/main/_includes/nav/indexnav.html b/main/_includes/nav/indexnav.html index 346a1cf..3488862 100644 --- a/main/_includes/nav/indexnav.html +++ b/main/_includes/nav/indexnav.html @@ -1,4 +1,4 @@ -Projects -Social -About -Blog \ No newline at end of file +๐Ÿ’ป Projects +๐Ÿ”— Social +๐Ÿ’ฌ About +๐Ÿ“” Blog \ No newline at end of file diff --git a/main/_includes/nav/miscnav.html b/main/_includes/nav/miscnav.html new file mode 100644 index 0000000..ac35416 --- /dev/null +++ b/main/_includes/nav/miscnav.html @@ -0,0 +1 @@ +๐Ÿ  Back to Main Page \ No newline at end of file diff --git a/main/_includes/nav/navbar.html b/main/_includes/nav/navbar.html index 664636f..5a2cc73 100644 --- a/main/_includes/nav/navbar.html +++ b/main/_includes/nav/navbar.html @@ -29,7 +29,7 @@
- +
diff --git a/main/_includes/projects.html b/main/_includes/projects.html index 5e01619..31a41ed 100644 --- a/main/_includes/projects.html +++ b/main/_includes/projects.html @@ -1,6 +1,6 @@
-

Projects

+

๐Ÿ’ป Projects

Here is a list of some of my bigger projects as well as some things you might know me from.
For a more exhaustive list of my projects, you can also check out the Social section. @@ -18,7 +18,7 @@ {% endif %} {%- for link in item.links -%} - {{ link.name }} + {{ link.name }} {%- endfor -%}

@@ -26,9 +26,9 @@
{% endif %} diff --git a/main/_layouts/default.html b/main/_layouts/default.html index 4eff7e9..3894bd5 100644 --- a/main/_layouts/default.html +++ b/main/_layouts/default.html @@ -16,7 +16,7 @@ - + diff --git a/main/_posts/2019-02-17-blogs_are_cool.md b/main/_posts/2019-02-17-blogs_are_cool.md index 73aa793..137e26e 100644 --- a/main/_posts/2019-02-17-blogs_are_cool.md +++ b/main/_posts/2019-02-17-blogs_are_cool.md @@ -1,6 +1,6 @@ --- layout: blog -title: Blogs are Cool, I Think +title: โœจ Blogs are Cool, I Think summary: The first post and how I created it tags: [Miscellaneous] discuss: https://twitter.com/Ellpeck/status/1096937184601538566 diff --git a/main/_posts/2019-02-17-why_you_should_mod_minecraft.md b/main/_posts/2019-02-17-why_you_should_mod_minecraft.md index e291350..ffe6f19 100644 --- a/main/_posts/2019-02-17-why_you_should_mod_minecraft.md +++ b/main/_posts/2019-02-17-why_you_should_mod_minecraft.md @@ -1,6 +1,6 @@ --- layout: blog -title: Why You Should Mod Minecraft +title: โš™๏ธ Why You Should Mod Minecraft summary: About what makes Minecraft modding great and why you should probably try it if you enjoy programming tags: [Minecraft, Programming] discuss: https://twitter.com/Ellpeck/status/1097177774337462272 diff --git a/main/_posts/2019-03-22-reading.md b/main/_posts/2019-03-22-reading.md index 4f6bbf0..454699c 100644 --- a/main/_posts/2019-03-22-reading.md +++ b/main/_posts/2019-03-22-reading.md @@ -1,6 +1,6 @@ --- layout: blog -title: Kindling the Reading Flame +title: ๐Ÿ”ฅ Kindling the Reading Flame summary: About the Kindle, Harry Potter and what I like and dislike about them tags: [Reading] discuss: https://twitter.com/Ellpeck/status/1109102077911973888 diff --git a/main/_posts/2019-05-01-small_projects.md b/main/_posts/2019-05-01-small_projects.md index 49d8959..8673887 100644 --- a/main/_posts/2019-05-01-small_projects.md +++ b/main/_posts/2019-05-01-small_projects.md @@ -1,6 +1,6 @@ --- layout: blog -title: Small Projects +title: ๐Ÿ—ก๏ธ Small Projects summary: Why creating a small, unplanned project is sometimes good for you tags: [Programming] discuss: https://twitter.com/Ellpeck/status/1123651624201871360 diff --git a/main/_posts/2019-07-06-cross_platform_trainwreck.md b/main/_posts/2019-07-06-cross_platform_trainwreck.md index 53ba132..8f353da 100644 --- a/main/_posts/2019-07-06-cross_platform_trainwreck.md +++ b/main/_posts/2019-07-06-cross_platform_trainwreck.md @@ -1,6 +1,6 @@ --- layout: blog -title: About Cross-Platform and Motivation +title: ๐Ÿ˜” About Cross-Platform and Motivation summary: How moving from Java to C# taught me how horrible it is to create a cross-platform application with little to no knowledge or documentation tags: [Programming] discuss: https://twitter.com/Ellpeck/status/1147502654236573697 diff --git a/main/_posts/2019-09-15-big_projects.md b/main/_posts/2019-09-15-big_projects.md index a6f2c3d..240d322 100644 --- a/main/_posts/2019-09-15-big_projects.md +++ b/main/_posts/2019-09-15-big_projects.md @@ -1,6 +1,6 @@ --- layout: blog -title: Big Projects +title: โš”๏ธ Big Projects summary: "How a once small project I even created a post about turned into the first game I'm selling: Foe Frenzy" tags: [Programming] discuss: https://twitter.com/Ellpeck/status/1173247686654517249 diff --git a/main/_posts/2019-10-03-rock_bottom_mod.md b/main/_posts/2019-10-03-rock_bottom_mod.md index d1a4fac..9a8a4a9 100644 --- a/main/_posts/2019-10-03-rock_bottom_mod.md +++ b/main/_posts/2019-10-03-rock_bottom_mod.md @@ -1,6 +1,6 @@ --- layout: blog -title: How to make a Rock Bottom mod +title: โฌ‡๏ธ How to make a Rock Bottom mod summary: My adventures back into a game I stopped working on about two years ago and how I start on a mod for it tags: [Programming] discuss: https://twitter.com/Ellpeck/status/1180092634410487808 diff --git a/main/_posts/2019-10-10-java_1.md b/main/_posts/2019-10-10-java_1.md index 6b10ad1..17a658b 100644 --- a/main/_posts/2019-10-10-java_1.md +++ b/main/_posts/2019-10-10-java_1.md @@ -1,6 +1,6 @@ --- layout: blog -title: "Java Tutorial, Part 1: Hello World" +title: "โ˜• Java Tutorial, Part 1: Hello World" summary: The first part of my post series for programming beginners where I explain how to write code in Java. tags: [Java Tutorials, Featured] discuss: https://twitter.com/Ellpeck/status/1182080078827737088 diff --git a/main/_posts/2019-10-10-java_2.md b/main/_posts/2019-10-10-java_2.md index 43a0a9e..b3a1ce3 100644 --- a/main/_posts/2019-10-10-java_2.md +++ b/main/_posts/2019-10-10-java_2.md @@ -1,6 +1,6 @@ --- layout: blog -title: "Java Tutorial, Part 2: Intro to Conditions and Loops" +title: "โ˜• Java Tutorial, Part 2: Intro to Conditions and Loops" summary: The second part of my post series for programming beginners. This one is all about conditions and loops. tags: [Java Tutorials] discuss: https://twitter.com/Ellpeck/status/1182354544707198976 diff --git a/main/_posts/2019-10-11-java_3.md b/main/_posts/2019-10-11-java_3.md index c9546b5..286e568 100644 --- a/main/_posts/2019-10-11-java_3.md +++ b/main/_posts/2019-10-11-java_3.md @@ -1,6 +1,6 @@ --- layout: blog -title: "Java Tutorial, Part 3: (Static) Methods" +title: "โ˜• Java Tutorial, Part 3: (Static) Methods" summary: In this Java tutorial for beginners, we cover what (static) methods, parameters and return types are. tags: [Java Tutorials] discuss: https://twitter.com/Ellpeck/status/1182775985885847558 diff --git a/main/_posts/2019-10-14-java_4.md b/main/_posts/2019-10-14-java_4.md index c065294..e520e3c 100644 --- a/main/_posts/2019-10-14-java_4.md +++ b/main/_posts/2019-10-14-java_4.md @@ -1,6 +1,6 @@ --- layout: blog -title: "Java Tutorial, Part 4: Classes and Objects" +title: "โ˜• Java Tutorial, Part 4: Classes and Objects" summary: In this Java tutorial for beginners, we cover the basics of creating classes with a constructor, some fields and some methods and creating objects of them. tags: [Java Tutorials] discuss: https://twitter.com/Ellpeck/status/1183857460660101133 diff --git a/main/_posts/2019-10-17-java_5.md b/main/_posts/2019-10-17-java_5.md index 455194d..2f2eadc 100644 --- a/main/_posts/2019-10-17-java_5.md +++ b/main/_posts/2019-10-17-java_5.md @@ -1,6 +1,6 @@ --- layout: blog -title: "Java Tutorial, Part 5: Things I Left Out So Far" +title: "โ˜• Java Tutorial, Part 5: Things I Left Out So Far" summary: In this Java tutorial for beginners, we cover some shorthands, some more data types, the difference between pass-by-reference and pass-by-value, null, as well as arrays and lists. tags: [Java Tutorials] discuss: https://twitter.com/Ellpeck/status/1184894859133509632 diff --git a/main/_posts/2019-10-20-lows.md b/main/_posts/2019-10-20-lows.md index 963a3e3..ebeffa1 100644 --- a/main/_posts/2019-10-20-lows.md +++ b/main/_posts/2019-10-20-lows.md @@ -1,6 +1,6 @@ --- layout: blog -title: "Lows" +title: ๐Ÿ˜ข Lows summary: About depression and what it feels like when I don't know what to do with myself tags: [Miscellaneous] discuss: https://twitter.com/Ellpeck/status/1186028260838334471 diff --git a/main/_posts/2019-10-31-java_6.md b/main/_posts/2019-10-31-java_6.md index dd96c2d..a60aa03 100644 --- a/main/_posts/2019-10-31-java_6.md +++ b/main/_posts/2019-10-31-java_6.md @@ -1,6 +1,6 @@ --- layout: blog -title: "Java Tutorial, Part 6: Inheritance" +title: "โ˜• Java Tutorial, Part 6: Inheritance" summary: In this Java tutorial for beginners, we cover classes extending other classes and the instanceof keyword. tags: [Java Tutorials] discuss: https://twitter.com/Ellpeck/status/1189904487722487809 diff --git a/main/_posts/2019-11-26-java_7.md b/main/_posts/2019-11-26-java_7.md index 15010b4..b0cdbdf 100644 --- a/main/_posts/2019-11-26-java_7.md +++ b/main/_posts/2019-11-26-java_7.md @@ -1,6 +1,6 @@ --- layout: blog -title: "Java Tutorial, Part 7: Overriding Methods" +title: "โ˜• Java Tutorial, Part 7: Overriding Methods" summary: In this Java tutorial for beginners, we cover overriding methods, calling superclass methods and toString(). tags: [Java Tutorials] discuss: https://twitter.com/Ellpeck/status/1199339701640945664 diff --git a/main/_posts/2020-11-23-future_actually_additions.md b/main/_posts/2020-11-23-future_actually_additions.md index 17f5da5..0e40edf 100644 --- a/main/_posts/2020-11-23-future_actually_additions.md +++ b/main/_posts/2020-11-23-future_actually_additions.md @@ -1,6 +1,6 @@ --- layout: blog -title: The Future of Actually Additions +title: ๐Ÿ”ฎ The Future of Actually Additions summary: Not wanting to accept the fate of Actually Additions, someone has come to its rescue. 1.16, here we come? tags: [Minecraft] discuss: https://twitter.com/Ellpeck/status/1330938597785169925 @@ -8,6 +8,8 @@ discuss: https://twitter.com/Ellpeck/status/1330938597785169925 *TLDR: Actually Additions for 1.16.4 in the future. No ETA. No Fabric port. No 1.13, 1.14 or 1.15. Beautiful art overhaul. Don't ask Ellpeck anything ever. Stay awesome.* +**November 2021 update: The port is still being actively worked on. You can stay up to date with the progress through [the `1.16` branch](https://github.com/Ellpeck/ActuallyAdditions/tree/1.16) on the GitHub repository.** + Before I start this post, I want to re-iterate that I haven't had a direct programming-related connection to Actually Additions in [over three years](https://github.com/Ellpeck/ActuallyAdditions/commits/main?after=896a082d747a3e19755ded1973544d59fa992787+244). I don't plan on changing this. This means that, if you have *anything* to say about the mod, be it issue reports or feature requests, **do not talk to me about that**. Go to [the issue tracker](https://github.com/Ellpeck/ActuallyAdditions/issues) or [my Discord](https://ellpeck.de/discord)'s `#minecraft` channel. Okay, now that that's out of the way... let's talk about the future of Actually Additions. In [my last post](https://ellpeck.de/blog-actually_additions), I talked about the things I disliked about the mod and, in that same vein, the reasons that I don't want it to be updated beyond Minecraft 1.12. What I didn't necessarily make clear in that post is that this isn't really my decision, because I haven't touched Actually Additions in *a long time*. For the last few years, **Shadows-of-Fire** has been maintaining the mod (that is, fixing issues and publishing updates), which is also the reason that there haven't been any new features during that time. So what about now? @@ -46,7 +48,9 @@ MiKeY has expressed great interest in helping me overhaul the features that I di # When? We don't know yet. *Please* don't ask. +**November 2021 update: We still don't know. It's a process.** + # Thank You -So yea, that's about it for the news. I hope all of you are as excited about the port and the upcoming changes as I am. If you want to be kept up to date with the changes, you can check the [GitHub repository](https://github.com/Ellpeck/ActuallyAdditions) every once in a while (especially [its `clean-start` branch](https://github.com/Ellpeck/ActuallyAdditions/tree/clean-start)) and join [my Discord server](https://ellpeck.de/discord), where we might post some updates from time to time. +So yea, that's about it for the news. I hope all of you are as excited about the port and the upcoming changes as I am. If you want to be kept up to date with the changes, you can check the [GitHub repository](https://github.com/Ellpeck/ActuallyAdditions) every once in a while (specifically [its `1.16` branch](https://github.com/Ellpeck/ActuallyAdditions/tree/1.16)) and join [my Discord server](https://ellpeck.de/discord), where we might post some updates from time to time. As an additional note, I would like to thank all of you for the continued support of not only Actually Additions, but all of my mods and even my non-Minecraft-related projects. Of course, there have also been some rude people, but all in all, yall have been an amazing community and I am so grateful that you enjoy the things I create. I love yall. โค๏ธ \ No newline at end of file diff --git a/main/_posts/2020-5-10-actually_additions.md b/main/_posts/2020-5-10-actually_additions.md index 295cdfd..03db98c 100644 --- a/main/_posts/2020-5-10-actually_additions.md +++ b/main/_posts/2020-5-10-actually_additions.md @@ -1,6 +1,6 @@ --- layout: blog -title: Oh God, Please Don't Port Actually Additions +title: โ›” Oh God, Please Don't Port Actually Additions summary: As Actually Additions celebrates its fifth birthday, I break down what I like and dislike about it. tags: [Minecraft] discuss: https://twitter.com/Ellpeck/status/1259600490377216002 diff --git a/main/_posts/2020-6-5-but_do_you_really_care.md b/main/_posts/2020-6-5-but_do_you_really_care.md index 1dac028..d1dd16a 100644 --- a/main/_posts/2020-6-5-but_do_you_really_care.md +++ b/main/_posts/2020-6-5-but_do_you_really_care.md @@ -1,6 +1,6 @@ --- layout: blog -title: But Do You Really Care? +title: ๐Ÿคท But Do You Really Care? summary: On taking a break from social media tags: [Miscellaneous] --- diff --git a/main/_posts/2021-05-28-ketchup_mayo_barbecue_sauce.md b/main/_posts/2021-05-28-ketchup_mayo_barbecue_sauce.md index f2dd8dd..33400a9 100644 --- a/main/_posts/2021-05-28-ketchup_mayo_barbecue_sauce.md +++ b/main/_posts/2021-05-28-ketchup_mayo_barbecue_sauce.md @@ -1,6 +1,6 @@ --- layout: blog -title: Ketchup, Mayo and Barbecue Sauce +title: ๐Ÿ Ketchup, Mayo and Barbecue Sauce summary: "Sally can't quite decide what skirt to buy. When she starts going out for lunch with David, an old crush from high school, she can't quite decide what to order. But she's sure about one thing: She likes David. A lot." tags: [Short Stories] book: true diff --git a/main/_posts/2021-07-27-vince_a_party_and_brandon.md b/main/_posts/2021-07-27-vince_a_party_and_brandon.md index be09af8..03891fb 100644 --- a/main/_posts/2021-07-27-vince_a_party_and_brandon.md +++ b/main/_posts/2021-07-27-vince_a_party_and_brandon.md @@ -1,6 +1,6 @@ --- layout: blog -title: Vince, a Party and Brandon +title: ๐ŸŽ‰ Vince, a Party and Brandon summary: "Vincent is an anxious introvert who is desperate to find a guy to have some fun with. At his best friend's party, he gets the chance to do just that, but his anxiety threatens to screw it all up." tags: [Short Stories, Featured] book: true diff --git a/main/_posts/2021-3-21-modding_ama.md b/main/_posts/2021-3-21-modding_ama.md index dff0096..d73d8e7 100644 --- a/main/_posts/2021-3-21-modding_ama.md +++ b/main/_posts/2021-3-21-modding_ama.md @@ -1,6 +1,6 @@ --- layout: blog -title: Your Minecraft Modding Questions, Answered +title: ๐Ÿ’ป Your Minecraft Modding Questions, Answered summary: I asked yall to send me your modding and programming questions on Twitter and Discord, and in this post, I try to answer all of those. tags: [Minecraft, Featured] discuss: https://twitter.com/Ellpeck/status/1373660751060160512 diff --git a/main/_posts/2021-3-24-em_and_ben.md b/main/_posts/2021-3-24-em_and_ben.md index 5ce0b0e..7ad626e 100644 --- a/main/_posts/2021-3-24-em_and_ben.md +++ b/main/_posts/2021-3-24-em_and_ben.md @@ -1,6 +1,6 @@ --- layout: blog -title: Em & Ben +title: โค๏ธ Em & Ben summary: Ben hates public gatherings because he suffers from anxiety. He's also in love with his best friend Emily, who frequently tries to drag him out of his shell. At the spring festival, he has a panic attack. Will Emily manage to support him? tags: [Short Stories] book: true diff --git a/main/_posts/2021-4-23-emilys_fake_boyfriend.md b/main/_posts/2021-4-23-emilys_fake_boyfriend.md index 0ac79a5..db4b4cc 100644 --- a/main/_posts/2021-4-23-emilys_fake_boyfriend.md +++ b/main/_posts/2021-4-23-emilys_fake_boyfriend.md @@ -1,6 +1,6 @@ --- layout: blog -title: Emily's Fake Boyfriend +title: ๐Ÿ‘ซ Emily's Fake Boyfriend summary: Emily's aunt keeps going on about her love life. To solve this problem, she pretends to be in a relationship with her best friend, Ben, who'd much rather have a real relationship with her. How will an evening with the three of them at the same table play out? tags: [Short Stories] book: true diff --git a/main/_posts/2021-4-23-jed_things_to_avoid_in_life.md b/main/_posts/2021-4-23-jed_things_to_avoid_in_life.md index 43a8a8c..956b466 100644 --- a/main/_posts/2021-4-23-jed_things_to_avoid_in_life.md +++ b/main/_posts/2021-4-23-jed_things_to_avoid_in_life.md @@ -1,6 +1,6 @@ --- layout: blog -title: Jed's Things to Avoid in Life +title: ๐Ÿ“… Jed's Things to Avoid in Life summary: "Jed's rules are clear: No relationships. They interfere too much with his life, and he's not made for them anyway. But then, he sees his old crush from school in his hometown. Will he break his own rules for Davy?" tags: [Short Stories] book: true diff --git a/main/_posts/2021-5-24-tiny_life_one_year.md b/main/_posts/2021-5-24-tiny_life_one_year.md index feb3579..af2c9c0 100644 --- a/main/_posts/2021-5-24-tiny_life_one_year.md +++ b/main/_posts/2021-5-24-tiny_life_one_year.md @@ -1,6 +1,6 @@ --- layout: blog -title: One Year of Tiny Life, and Cursed Comment Time +title: ๐Ÿคก One Year of Tiny Life, and Cursed Comment Time summary: It's been exactly one year since I started working on my isometric Sims-style life simulation game Tiny Life, and since then, a lot has happened, especially in the realm of weird, funny and cursed comments in the code. tags: [Programming, Featured] discuss: https://ellpeck.itch.io/tiny-life/devlog/256839/one-year-of-tiny-life-and-cursed-comment-time diff --git a/main/_posts/2021-6-26-reading_habits.md b/main/_posts/2021-6-26-reading_habits.md index a13eb1b..040b445 100644 --- a/main/_posts/2021-6-26-reading_habits.md +++ b/main/_posts/2021-6-26-reading_habits.md @@ -1,6 +1,6 @@ --- layout: blog -title: Dog-Earing and Other Terrible Reading Habits +title: ๐Ÿถ Dog-Earing and Other Terrible Reading Habits summary: Since I've been reading a lot more in recent history, I thought I'd start writing some blog posts about the reading. So first up, here are some of my terrible reading habits that would probably make a lot of book lovers angry. This isn't clickbait. I'm just terrible. tags: [Reading, Featured] discuss: https://twitter.com/Ellpeck/status/1408565191218978818 diff --git a/main/actaddmanual/index.html b/main/actaddmanual/index.html index bc8f11f..905c553 100644 --- a/main/actaddmanual/index.html +++ b/main/actaddmanual/index.html @@ -30,14 +30,17 @@
diff --git a/main/actaddmanual/index.js b/main/actaddmanual/index.js index 4fa1726..a9eb7a5 100644 --- a/main/actaddmanual/index.js +++ b/main/actaddmanual/index.js @@ -26,7 +26,7 @@ function populateManual(lang) { let data = lang.substring(startIndex + 18); let entries = $("#entries"); - let sidebar = $("#sidebar"); + let sidebar = $("#sidebar-content"); for (let topic of data.split("\n\n")) { let lines = topic.split("\n"); @@ -46,13 +46,6 @@ function populateManual(lang) { entries.append(t); } - sidebar.append("
"); - sidebar.append(`Main Site`); - sidebar.append(`Impressum`); - sidebar.append(`Privacy`); - sidebar.append(`© Ellpeck`); - sidebar.append("
"); - forceToAnchor(); } diff --git a/main/commissions/closed.js b/main/commissions/closed.js index fed5870..40b78ce 100644 --- a/main/commissions/closed.js +++ b/main/commissions/closed.js @@ -9,8 +9,8 @@ $.ajax({ `); + //
Alternatively, you can also commission my friend Quarris, who has done some great work in the past. } }); \ No newline at end of file diff --git a/main/commissions/index.html b/main/commissions/index.html index 8a0b2bd..7a199a4 100644 --- a/main/commissions/index.html +++ b/main/commissions/index.html @@ -40,7 +40,7 @@
-

About Me

+

๐Ÿ’ฌ About Me

@@ -55,14 +55,14 @@
-

Past Commissions

+

๐Ÿ’พ Past Commissions

-

Terms and Pricing

+

๐Ÿ“œ Terms and Pricing

Here is all the information you need if you want to commission me to make a mod for you:

  • I create Minecraft Forge mods only.
    • @@ -89,12 +89,12 @@
    -

    Contact

    +

    โœ‰๏ธ Contact

    If you're interested, you can easily contact me by joining my Discord server and messaging me privately from there. Alternatively, you can also send me an email.

    - © 2021 Ellpeck – Impressum – Privacy + © 2021 Ellpeck – Impressum – Privacy
    \ No newline at end of file diff --git a/main/impressum.html b/main/impressum.html new file mode 100644 index 0000000..494576a --- /dev/null +++ b/main/impressum.html @@ -0,0 +1,20 @@ +--- +layout: default +title: Impressum +summary: Impressum +nav: nav/miscnav.html +--- + +
    +

    ๐Ÿ“œ Impressum

    +

    + Julian Schubert +
    Kastanienweg 27 +
    52074 Aachen +

    +

    + Telefon: 0241 45093753 +
    E-Mail: me@ellpeck.de +

    +

    Die obenstehende Person ist ebenfalls verantwortlich fรผr den Inhalt (gem. ยง 55 Abs. 2 RStV).

    +
    \ No newline at end of file diff --git a/main/index.html b/main/index.html index ed17db8..5b5b8de 100644 --- a/main/index.html +++ b/main/index.html @@ -17,13 +17,21 @@ nav: nav/indexnav.html

    Welcome to my little website! I'm Ellpeck, a student and programmer from Germany. I do a lot of stuff, actually. My life is pretty busy.

    - -
    - - - Become a patron - + + +
diff --git a/main/privacy.html b/main/privacy.html new file mode 100644 index 0000000..a2ddda3 --- /dev/null +++ b/main/privacy.html @@ -0,0 +1,26 @@ +--- +layout: default +title: Privacy Policy +summary: Privacy Policy +nav: nav/miscnav.html +--- + +
+

๐Ÿ™ˆ Privacy Policy

+

This site uses cookies to store information about your browsing activity.

+

Ellpeck.de stores the following information:

+
    +
  • A cookie named dark with the value true or false that stores if you have dark mode enabled
    • +
  • A cookie named notification with the value true or false that stores if you have already closed the cookie notification that displays at the top of the page
    • +
+

Due to widgets and embeds, additional information will be stored by other sites. Please refer to those sites' privacy policies for more information:

+ +

+ Transparency is very important to us, and as such, if you have any doubts about the security of this website, you can view its source code on Gitea. +
Keep in mind that you can also review or delete stored cookies for any site at any time in your browser's settings. +

+
\ No newline at end of file diff --git a/main/res/becomePatron.png b/main/res/becomePatron.png deleted file mode 100644 index e3a4b8f..0000000 Binary files a/main/res/becomePatron.png and /dev/null differ diff --git a/main/res/projects/crossword.png b/main/res/projects/crossword.png deleted file mode 100644 index 3d3ca4f..0000000 Binary files a/main/res/projects/crossword.png and /dev/null differ diff --git a/main/res/projects/ff.png b/main/res/projects/ff.png deleted file mode 100644 index 72a22d0..0000000 Binary files a/main/res/projects/ff.png and /dev/null differ diff --git a/main/res/projects/glimmers.png b/main/res/projects/glimmers.png deleted file mode 100644 index 06b3832..0000000 Binary files a/main/res/projects/glimmers.png and /dev/null differ diff --git a/main/res/projects/grammar.png b/main/res/projects/grammar.png deleted file mode 100644 index 86bf12f..0000000 Binary files a/main/res/projects/grammar.png and /dev/null differ diff --git a/main/res/projects/memory.png b/main/res/projects/memory.png deleted file mode 100644 index 5eae9fe..0000000 Binary files a/main/res/projects/memory.png and /dev/null differ diff --git a/main/res/projects/music.png b/main/res/projects/music.png deleted file mode 100644 index f09c8a1..0000000 Binary files a/main/res/projects/music.png and /dev/null differ diff --git a/main/res/projects/poem.png b/main/res/projects/poem.png deleted file mode 100644 index a8d8cb1..0000000 Binary files a/main/res/projects/poem.png and /dev/null differ diff --git a/main/res/projects/rb.png b/main/res/projects/rb.png deleted file mode 100644 index 706910d..0000000 Binary files a/main/res/projects/rb.png and /dev/null differ diff --git a/main/res/projects/sudoku.png b/main/res/projects/sudoku.png deleted file mode 100644 index 15b415f..0000000 Binary files a/main/res/projects/sudoku.png and /dev/null differ diff --git a/main/res/projects/tetro.png b/main/res/projects/tetro.png deleted file mode 100644 index b21944a..0000000 Binary files a/main/res/projects/tetro.png and /dev/null differ diff --git a/main/res/projects/tracer.png b/main/res/projects/tracer.png deleted file mode 100644 index 97a4a72..0000000 Binary files a/main/res/projects/tracer.png and /dev/null differ diff --git a/main/res/projects/wildwood.png b/main/res/projects/wildwood.png deleted file mode 100644 index 885ae1c..0000000 Binary files a/main/res/projects/wildwood.png and /dev/null differ diff --git a/main/res/social/discord.png b/main/res/social/discord.png deleted file mode 100644 index ed1f3d5..0000000 Binary files a/main/res/social/discord.png and /dev/null differ diff --git a/main/res/social/facebook.png b/main/res/social/facebook.png deleted file mode 100644 index e21a085..0000000 Binary files a/main/res/social/facebook.png and /dev/null differ diff --git a/main/res/social/last.fm.png b/main/res/social/last.fm.png deleted file mode 100644 index f07545a..0000000 Binary files a/main/res/social/last.fm.png and /dev/null differ diff --git a/main/res/social/linkedin.png b/main/res/social/linkedin.png deleted file mode 100644 index 58749bc..0000000 Binary files a/main/res/social/linkedin.png and /dev/null differ diff --git a/main/res/social/patreon.png b/main/res/social/patreon.png deleted file mode 100644 index aefdb1e..0000000 Binary files a/main/res/social/patreon.png and /dev/null differ diff --git a/main/res/social/reddit.png b/main/res/social/reddit.png deleted file mode 100644 index 816f8ed..0000000 Binary files a/main/res/social/reddit.png and /dev/null differ diff --git a/main/res/social/reddit_dark.png b/main/res/social/reddit_dark.png deleted file mode 100644 index eebebf9..0000000 Binary files a/main/res/social/reddit_dark.png and /dev/null differ diff --git a/main/res/social/spotify.png b/main/res/social/spotify.png deleted file mode 100644 index d4c7ff6..0000000 Binary files a/main/res/social/spotify.png and /dev/null differ diff --git a/main/res/social/steam.png b/main/res/social/steam.png deleted file mode 100644 index bcca160..0000000 Binary files a/main/res/social/steam.png and /dev/null differ diff --git a/main/res/support/amazon.png b/main/res/support/amazon.png deleted file mode 100644 index d2540bd..0000000 Binary files a/main/res/support/amazon.png and /dev/null differ diff --git a/main/res/support/amazon_dark.png b/main/res/support/amazon_dark.png deleted file mode 100644 index 0518909..0000000 Binary files a/main/res/support/amazon_dark.png and /dev/null differ diff --git a/main/res/support/paypal.png b/main/res/support/paypal.png deleted file mode 100644 index d61c18e..0000000 Binary files a/main/res/support/paypal.png and /dev/null differ diff --git a/main/scripts/blog.js b/main/scripts/blog.js index 8cc7f7e..0997057 100644 --- a/main/scripts/blog.js +++ b/main/scripts/blog.js @@ -10,8 +10,9 @@ $(".blog-cat-button").on("click", function () { history.replaceState(null, null, `#blog-${tag}`); }); -let category = window.location.hash.match(/#blog-(.+)/); +let category = location.hash.match(/#blog-(.+)/); openCategory(category && decodeURI(category[1])); +forceToAnchor(); function openCategory(name) { // if there are no tags that match our name, we display featured @@ -29,7 +30,7 @@ function openCategory(name) { } }); // show or hide "no archived posts" text - $("#no-archived-posts").attr("hidden", all || $("#blog-archive").children(`.blog-tag-${name}`).length > 0); + $("#no-archived-posts").attr("hidden", $("#blog-archive").children(all ? "*" : `.blog-tag-${name}`).length > 0); // disable the shown category's button $(`.blog-cat-button`).each(function () { $(this).attr("disabled", $(this).attr("id") == name); diff --git a/main/scripts/main.js b/main/scripts/main.js index 66152cc..d52c200 100644 --- a/main/scripts/main.js +++ b/main/scripts/main.js @@ -1,13 +1,15 @@ -const dark = getCookie("dark") === "true"; +const darkCookie = getCookie("dark"); +const dark = darkCookie == undefined ? window.matchMedia("(prefers-color-scheme: dark)").matches : darkCookie == "true"; if (dark) addStyle("/style/dark.css"); -$(function () { - openModals(window.location.hash); - $('a').on('click', function () { - openModals($(this).attr('href')); - }); +// redirect legacy anchors +if (/^#privacy\/?$/.test(location.hash)) + location.href = "/privacy"; +if (/^#impressum\/?$/.test(location.hash)) + location.href = "/impressum"; +$(function () { $('.navbar-collapse a').on('click', function () { $('.navbar-collapse').collapse('hide'); }); @@ -20,15 +22,7 @@ $(function () { mode.prop('checked', dark); mode.on('click', function () { setCookie("dark", $(this).prop('checked'), 365); - window.location.hash = ""; + location.hash = ""; location.reload(); }); -}); - -function openModals(hash) { - if (hash && hash.startsWith("#")) { - let modal = $(`${hash}-modal`); - if (modal.length) - modal.modal('show'); - } -} \ No newline at end of file +}); \ No newline at end of file diff --git a/main/scripts/quote.js b/main/scripts/quote.js index 91cf06f..74db156 100644 --- a/main/scripts/quote.js +++ b/main/scripts/quote.js @@ -352,6 +352,27 @@ const quotes = [ "Call me by your name", "Tell me you love me in private", "I do not care if you lying", - "I'm not fazed, only here to sin" + "I'm not fazed, only here to sin", + "We ain't getting through this, babe", + "This is the last time I'll ever call you babe", + "What a shame, didn't want to be the one that got away", + "Big mistake, you broke the sweetest promise", + "What a waste, taking down the pictures and the plans we made", + "Message in a bottle is all I can do", + "I become hypnotized by freckles and bright eyes", + "Cause you could be the one that I love", + "How is it in London?", + "You could be the one that I keep", + "I was never good at telling jokes", + "The punchline goes: I'll get older but your lovers stay my age", + "Did the twin flame bruise paint you blue?", + "I still remember the first fall of snow", + "Did the love affair maim you too?", + "Sacred prayer, I was there, I remember it", + "Down the stairs, I was there, I remember it", + "Wind in my hair, I was there, I remember it", + "It's supposed to be fun, turning twenty-one", + "They say all's well that ends well, but I'm in a new hell", + "A jewel whose shine reflects on you" ]; -$('#quote-text').html(`🎵 ${quotes[Math.floor(Math.random() * quotes.length)]}`); \ No newline at end of file +$('#quote-text').html(`๐ŸŽต ${quotes[Math.floor(Math.random() * quotes.length)]}`); \ No newline at end of file diff --git a/main/scripts/util.js b/main/scripts/util.js index f6ceab4..ee0b4ef 100644 --- a/main/scripts/util.js +++ b/main/scripts/util.js @@ -10,7 +10,7 @@ function setCookie(key, value, days) { } function forceToAnchor(customAnchor) { - let anchor = customAnchor || window.location.hash; + let anchor = customAnchor || location.hash; // this is probably a terrible hack if (anchor.startsWith("#")) { let element = $(anchor); diff --git a/main/style/dark.css b/main/style/dark.css index 1099d54..cbff553 100644 --- a/main/style/dark.css +++ b/main/style/dark.css @@ -23,14 +23,6 @@ body { background-color: #343a40; } -.modal-header { - border-bottom: 1px solid #323233; -} - -.modal-content { - background-color: #404142; -} - .blog-button:link, .blog-button:visited { color: white !important; diff --git a/main/style/style.css b/main/style/style.css index 8d7ccdf..c356091 100644 --- a/main/style/style.css +++ b/main/style/style.css @@ -209,15 +209,6 @@ blockquote { font-style: italic; } -.sellout { - display: flex; - align-items: center; -} - -.patreon-button :hover { - filter: saturate(130%); -} - #banner { position: fixed; left: 0; @@ -235,6 +226,14 @@ blockquote { overflow: auto; } +.highlight { + border-radius: 10px; +} + +pre.highlight { + padding: 15px; +} + @media (max-width: 768px) { .container { max-width: none; @@ -252,15 +251,6 @@ blockquote { right: auto; top: auto; } - - .sellout { - flex-direction: column; - } - - .sellout iframe { - margin-bottom: 10px; - margin-right: 0 !important; - } } @media (max-width: 510px) {