Update pack description

Thanks inventorytweaks
Rewrite the last few links to point to srv.9iron.club for large files
2021-05-14 10:08:28 -05:00 · 2021-05-14 10:04:17 -05:00 · 2021-05-12 15:52:15 -05:00 · 2021-05-11 22:23:14 -05:00 · 2021-05-11 21:34:54 -05:00 · 2021-05-07 00:54:01 -05:00
26 changed files with 257 additions and 154 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,6 @@
 .git
 .gitignore
 .templates
 deploy.sh
 README.md
 test.sh
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 *.swp
 /files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,54 @@
 #
 # This guy is awesome: https://dev.to/bzinoun/gitlab-ci-to-build-and-push-containers-to-registry-538a
 #
 image: morlay/buildx:607a2ce
 variables:
  # DinD's vfs driver is pretty intensive; this is less so
  DOCKER_DRIVER: overlay2
  CI_HUB_USERNAME: rehashedsalt
 stages:
  - build
 #  - test
 services:
  - docker:dind
 before_script:
  - echo -n "$CI_LOGIN_PASSWORD" | docker login -u "$CI_LOGIN_USERNAME" --password-stdin
  - docker version
  - docker info
 after_script:
  - docker logout hub.docker.com
 # BUILD
 Build:
  stage: build
  script:
    - docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest || true
    - docker buildx create --use
    - >
      docker buildx build
      --pull
      --platform linux/amd64,linux/arm64
      --cache-from $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
      --push
      .
    - docker images
 Build_Tag:
  stage: build
  only:
    - tags
  script:
    - docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest || true
    - docker buildx create --use
    - >
      docker buildx build
      --pull
      --platform linux/amd64,linux/arm64
      --cache-from $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
      --push
      .
    - docker images
--- a/3
+++ b/3
@@ -0,0 +1,3 @@
 FROM php:7-apache
 COPY ./ /var/www/html/
 EXPOSE 80
--- a/README.md
+++ b/README.md
@@ -6,6 +6,16 @@ A website for me and my friends.
 This repo is a ready-to-go webroot. `git clone` and configure Apache. `git pull` for updates.
 ## Docker
 You can pull the image from `rehashedsalt/9iron`. The `:latest` tag will always have the latest git tag applied and the `:bleeding` tag will always be the latest *commit*.
 The following directories contain stateful content that you will be interested in keeping in a PV:
 * `/var/www/html/files`
 The image listens on `:80` and does not terminate SSL; proxy connections if you're interested in that.
 ## Random Subtitles
 I've got random subtitles generated at page load. Hit me up (i.e. open an issue) if you've got dumb ideas for some.
--- a/about/index.php
+++ b/about/index.php
@@ -11,7 +11,7 @@
 				<h1>About 9iron</h1>
 				<p>9iron is a website spun up by yours truly to unify the services I host and inevitably rope my friends into. It also aggregates documentation about the various games we play.</p>
 				<h1>About Me</h1>
-				<p>I am Salt. I'm a sysadmin and I play video games. I try to be most active on Matrix, but inevitably have to use Discord all the damn time. You can also reach me very effectively through the Fediverse and email.</p>
+				<p>I am Salt. I'm a sysadmin and I play video games. I'm regrettably most active on Discord because there are no good alternatives (that my friends will join). You can also reach me very effectively through the Fediverse and email.</p>
 				<p>Hit me up if you wanna play something or if shit breaks.</p>
 				<dl>
 					<dt>Fedi:</dt>
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,10 +0,0 @@
 #! /bin/sh
 #
 # post-deploy.sh
 # Copyright (C) 2020 Vintage Salt <rehashedsalt@cock.li>
 #
 # Distributed under terms of the MIT license.
 #
 ssh -t salt@www.9iron.club sudo git -C /var/www/www.9iron.club pull
--- a/files/.keep
+++ b/files/.keep
--- a/gmod/index.php
+++ b/gmod/index.php
@@ -1,25 +0,0 @@
 <!DOCTYPE html>
 <html>
 	<head>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
 		<title>9iron - Garry's Mod</title>
 	</head>
 	<body>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
 		<div class="content">
 			<div class="section">
 				<h1>Garry's Mod</h1>
 				<p>Just toss the IP into your favorites or open it through the console. Ask around for the password.</p>
 			</div>
 			<div class="section">
 				<h1>Servers</h1>
 				<div class="subcontainer">
 					<h2>Trouble in Terrorist Town</h2>
 					<p><code>ttt.src.9iron.club</code></p>
 					<p><a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2155532035">Addons List</a></p>
 				</div>
 			</div>
 		</div>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
 	</body>
 </html>
--- a/index.php
+++ b/index.php
@@ -19,15 +19,10 @@
 					<h1>Terraria</h1>
 					<p>A game we've sunk just as much time into as Minecraft. Sometimes modded, sometimes not</p>
 				</a>
-				<a href="/tes3mp" class="iconbutton">
+				<a href="/smz3mw" class="iconbutton">
-					<i class="fa fa-moon"></i>
+					<i class="fa fa-random"></i>
-					<h1>TES3MP</h1>
+					<h1>SMZ3 Multiworld</h1>
-					<p>Morrowind, but multiplayer. And it's nowhere near as jank as it sounds</p>
+					<p>Strap two games together, then strap a bunch of those games together and shake them real hard</p>
 				</a>
 				<a href="/gmod" class="iconbutton">
 					<i class="fa fa-circle-o"></i>
 					<h1>Garry's Mod</h1>
 					<p>It's second banana to other games, but we may have a server up from time to time</p>
 				</a>
 			</div>
 			<div class="break"></div>
--- a/minecraft/index.php
+++ b/minecraft/index.php
@@ -5,22 +5,16 @@
 		<link href="/styles/buttons.css" type="text/css" rel="stylesheet" />
 		<link href="/minecraft/styles/styles.css" type="text/css" rel="stylesheet" />
 		<link rel="shortcut icon" href="/favicon.ico" />
-		<title>9iron</title>
+		<title>9iron - Modded Minecraft</title>
 	</head>
 	<body>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
 		<div class="content">
 			<div class="section">
-				<h1>Modded Minecraft</h1>
+				<a href="/minecraft/setup" class="startbutton">
-				<p>It's been a go-to of ours for a while. Ongoing and historical modpacks are listed here for your convenience and participation.</p>
+					<i class="fa fa-arrow-right"></i>
-				<p>At-a-glance information is provided here for the various packs we play.</p>
+					<p>Confused? Click here to get started</p>
-				<div class="iconbuttoncontainer">
+				</a>
 					<a href="/minecraft/setup" class="iconbutton">
 						<i class="fa fa-play"></i>
 						<h1>Setup</h1>
 						<p>Set up an entire modded Minecraft environment</p>
 					</a>
 				</div>
 			</div>
 			<?php
 # Define a pack card generator function
@@ -48,11 +42,11 @@ function echo_pack($pack) {
 	# A small button to browse previous world downloads
 	if (file_exists("../files/packs/$pack/worlds")) {
-		echo "<p><a href=\"/files/packs/$pack/worlds\" class=\"worldsbutton\">Browse world backups</a></p>";
+		echo "<p><a href=\"https://srv.9iron.club/files/packs/$pack/worlds\" class=\"worldsbutton\">Browse world backups</a></p>";
 	}
 	# And a bright big download button
-	echo "<a href=\"/files/packs/$pack/latest.zip\" class=\"downloadbutton\">Download</a>";
+	echo "<a href=\"https://srv.9iron.club/files/packs/$pack/latest.zip\" class=\"downloadbutton\">Download</a>";
 	echo '</div>';
 }
 # Get list of modpacks
@@ -72,14 +66,14 @@ if (!empty($packs)) {
 		# We have a valid current pack, remove it from the list and print it upfront
 		$currentpack = readlink("packs/current");
 		$packs = array_diff($packs, ["$currentpack", "current"]);
-		echo '<h1>Current Modpack</h1>';
+		echo '<div class="currentcontainer"><h1>Current Modpack</h1>';
 		echo_pack($currentpack);
 		# If there's a server IP name along with that, print that out too
 		if (file_exists("packs/currentip")) {
 			$ip = file_get_contents("packs/currentip");
 			echo "<p><code class=\"bigcode\">$ip</code></p>";
 		}
-		echo '</div><div class="section">';
+		echo '</div></div><div class="section">';
 	}
 	# Sort the list of remaining packs
 	sort($packs);
--- a/minecraft/packs/1.16.5-valhelsia/desc.html
+++ b/minecraft/packs/1.16.5-valhelsia/desc.html
@@ -0,0 +1,3 @@
 <h2>Valhelsia 3+</h2>
 <p>1.16.5, Forge 36.1.13</p>
 <p>Valhelsia 3.3.1 with some tweaks, such as chunk loaders and a disappointingly non-clicky version of InventoryTweaks.</p>
--- a/minecraft/packs/1.16.5-valhelsia/icon.png
+++ b/minecraft/packs/1.16.5-valhelsia/icon.png
--- a/minecraft/packs/1.7.10-magicpack/desc.html
+++ b/minecraft/packs/1.7.10-magicpack/desc.html
@@ -1,3 +1,3 @@
 <h2>The Magic Pack</h2>
 <p>1.7.10, Forge 1614</p>
-<p>A very, <i>very</i> well-run modpack with a ton of magic content. Includes Thaumcraft, Blood Magic, Botania, Witchery, Ars, and a couple others.</p>
+<p>A very, <i>very</i> well-worn modpack with a ton of magic content. Includes Thaumcraft, Blood Magic, Botania, Witchery, Ars, and a couple others.</p>
--- a/minecraft/packs/current
+++ b/minecraft/packs/current
@@ -1 +1 @@
-1.7.10-magicpack
+1.16.5-valhelsia
--- a/minecraft/packs/currentip
+++ b/minecraft/packs/currentip
@@ -1 +1 @@
-magic.thefuck.how
+thefuck.how
--- a/minecraft/setup/index.php
+++ b/minecraft/setup/index.php
@@ -2,37 +2,36 @@
 <html>
 	<head>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
 		<link href="/minecraft/styles/styles.css" type="text/css" rel="stylesheet" />
 		<title>9iron - Modded Minecraft Setup</title>
 	</head>
 	<body>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
 		<div class="content">
 			<div class="section">
 				<a href="/minecraft" class="startbutton">
 					<i class="fa fa-arrow-left"></i>
 					<p>Return to modpacks</p>
 				</a>
 				<h1>Setting Up Modded Minecraft</h1>
 				<p>This guide will set you up with the following:</p>
 				<ul>
 					<li>Java, because that's <em>still</em> a pain in the dick to set up</li>
 					<li>A new Minecraft game launcher to help organize modpacks</li>
 					<li>Whatever modpack we're playing</li>
 				</ul>
 			</div>
-			<div class="section" id="java">
+			<div class="subcontainer" id="java">
-				<h1>1. Installing Java</h1>
+				<h2>1. Installing Java</h2>
 				<p>Minecraft depends on Java. It's important that you have the latest 64-bit edition of Java installed.</p>
 				<ol>
-					<li>Download <a href="https://sdlc-esd.oracle.com/ESD6/JSCDL/jdk/8u251-b08/3d5a2bb8f8d4428bbe94aed7ec7ae784/jre-8u251-windows-x64.exe?GroupName=JSC&FilePath=/ESD6/JSCDL/jdk/8u251-b08/3d5a2bb8f8d4428bbe94aed7ec7ae784/jre-8u251-windows-x64.exe&BHost=javadl.sun.com&File=jre-8u251-windows-x64.exe&AuthParam=1593609737_aee69d42e03369a5aed61477a858b110&ext=.exe">the 64-bit edition of Java 8</a></li>
+					<li>Go to <a href="https://www.java.com/en/download/manual.jsp">Java Downloads</a></li>
-					<li>Run it</li>
+					<li>Download and run the "Windows Offline (64-bit)" option</li>
 					<li>You're done</li>
 				</ol>
 			</div>
-			<div class="section" id="multimc">
+			<div class="subcontainer" id="multimc">
-				<h1>2. Installing MultiMC</h1>
+				<h2>2. Installing MultiMC</h2>
 				<p>MultiMC is the launcher that we use to organize our modpacks. It has a number of features to make pack installation easier.</p>
 				<ol>
 					<li>Download <a href="https://multimc.org/#Download">MultiMC</a></li>
-					<li>Extract the zip file somewhere, like your desktop or Documents</li>
+					<li>Extract the zip file somewhere, like your desktop or Documents folder</li>
 					<li>Run <code>multimc.exe</code></li>
 				</ol>
-				<p>MultiMC will then run you through basic setup. You can accept the defaults, but change the following:</p>
+				<p>MultiMC will then run you through basic setup. You can accept the defaults, but will probably want to change the following:</p>
 				<ul>
 					<li>On the page where it asks you to set up Java, set these values:</li>
 					<ul>
@@ -42,28 +41,32 @@
 				</ul>
 				<p>After that, it'll drop you to the main screen and you can progress to the next step.</p>
 			</div>
-			<div class="section" id="pack">
+			<div class="subcontainer" id="pack">
-				<h1>3. Installing a Modpack</h1>
+				<h2>3. Installing a Modpack</h2>
-				<p>Packs on the server, as of the time of writing this document, will from now on be provided in a format that's much easier to use with MultiMC. If, for whatever reason, you have to install one that <em>isn't</em>, flag down a moderator and have them show you. It's honestly a pretty involved process.</p>
+				<p>All modpacks here are installable through MultiMC.</p>
 				<ol>
 					<li>Download the modpack you want to play</li>
 					<li>Open MultiMC</li>
 					<li>Hit the "Add Instance" button in the upper-left</li>
 					<li>Pick the option on the left called "Import from Zip"</li>
-					<li>Copy the pack download link from the previous page and stick it in the URL</li>
+					<li>Browse for the zip you just downloaded</li>
 					<li>Click OK</li>
 				</ol>
 				<p>This will set you up with a nice, shiny new instance with all the mods ready to go. Double-click it to launch it.</p>
 				<p>If MultiMC prompts for it, be sure to set up your Minecraft account.</p>
 			</div>
-			<div class="section" id="joining">
+			<div class="subcontainer" id="joining">
-				<h1>4. Joining a Server</h1>
+				<h2>4. Joining the Server</h2>
-				<p>This one's pretty easy, thankfully</p>
+				<p>Now the last thing we need to do is connect you to the server.</p>
 				<ol>
 					<li>Launch the game by double-clicking the modpack icon</li>
 					<li>Copy the server URL (something like <code>modpack.mc.9iron.club</code>)</li>
-					<li>Open the game, go to Multiplayer, and click "Add Server"</li>
+					<li>In the game, go to "Multiplayer", and click "Add Server"</li>
 					<li>Stick whatever name you want in the name field and paste the server URL in the "IP Address" field</li>
 					<li>Double-click it to join</li>
 				</ol>
 				<p>You're looking for the huge, can't-miss-it serif font with the gray background:</p>
 				<code class="bigcode">serverip.blah.blah</code>
 			</div>
 		</div>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
--- a/minecraft/styles/styles.css
+++ b/minecraft/styles/styles.css
@@ -5,13 +5,44 @@
 * Distributed under terms of the MIT license.
 */
 a.startbutton {
 	background: var(--greenlink);
 	border-radius: 8px;
 	box-shadow: 5px 5px var(--shadow);
 	color: var(--background);
 	display: block;
 	font-size: 140%;
 	padding: 1em;
 }
 a.startbutton:hover {
 	background: var(--greenlink-hover);
 }
 a.startbutton i {
 	float: right;
 	vertical-align: middle;
 }
 a.startbutton p {
 	display: inline-block;
 	font-weight: bold;
 	margin: 0;
 	vertical-align: middle;
 }
 code.bigcode {
 	background: var(--background);
 	border-radius: 8px;
 	display: block;
 	font-size: 400%;
 	text-align: center;
 	margin: auto;
 	padding: 0.5em;
 }
 div.currentcontainer {
 	border: 4px solid var(--line);
 	border-radius: 8px;
 	box-shadow: 5px 5px var(--shadow);
 	margin: 1em 0;
 	padding: 1em;
 }
 div.packcontainer {
 	display: grid;
 	grid-gap: 1em;
--- a/smz3mw/index.php
+++ b/smz3mw/index.php
@@ -0,0 +1,75 @@
 <!DOCTYPE html>
 <html>
 	<head>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
 		<title>9iron - SMZ3 Multiworld</title>
 	</head>
 	<body>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
 		<div class="content">
 			<h1>Setting Up the <i>Super Metroid</i>/<i>The Legend of Zelda - A Link to the Past</i> Multiworld Item Randomizer</h1>
 			<p>Disclaimer: Most of this information is duplicated from <a href="https://samus.link/mwinstructions">upstream documentation</a>. If anything here breaks, please consult that guide as the instructions may have changed.</p>
 			<div class="subcontainer">
 				<h2>1. Installing QUSB2SNES</h2>
 				<p>It's a big fancy name that means "driver to allow your emulator to talk to the multiworld server".</p>
 				<ol>
 					<li><a href="https://github.com/Skarsnik/QUsb2snes/releases">Go here</a></li>
 					<li>Download the latest release (expand "Assets" and pick the file that ends in ".exe")</li>
 					<li>Put it somewhere</li>
 					<li>Run it</li>
 					<li>Pick the option for "Enable Lua Bridge (snes9x-rr)" (you may have to right-click the tray icon if you don't get a window when you start the application)</li>
 				</ol>
 			</div>
 			<div class="subcontainer">
 				<h2>2. Installing Snes9x-rr</h2>
 				<p>We have to install a special emulator to interact with some special tooling and allow items to be sent between worlds.</p>
 				<ol>
 					<li><a href="https://github.com/gocha/snes9x-rr/releases/">Go here</a></li>
 					<li>Download the latest release (ends in "win32.zip")</li>
 					<li>Unzip it somewhere</li>
 					<li>Run <code>snes9x.exe</code> to start the emulator</li>
 					<li>File -&gt; Lua Scripting -&gt; New Lua Script Window</li>
 					<li>Load "luabridge.lua" from the directory you ran snes9x out of</li>
 				</ol>
 			</div>
 			<div class="subcontainer">
 				<h2>3. Connecting to the Multiworld</h2>
 				<p>From here, you have an emulator and a program to expose that emulator to the internet. Now we connect it to the multiworld randomizer engine so you can join the game.</p>
 				<ol>
 					<li>Ask somebody for the link to the party at <a href="https://samus.link">samus.link</a></li>
 					<li>Visit the link in your browser</li>
 					<li>Hit the "Connect" button next to your name</li>
 					<li>Upload your totally legitimately obtained Super Metroid and ALttP ROMs (the randomizer is very picky about which ones you upload; ask around for the right ones if you don't have them)</li>
 					<li>Pick your favorite sprites and colors and energy beep frequency</li>
 					<li>Download and play the ROM in snes9x</li>
 					<li>Hate life</li>
 				</ol>
 			</div>
 			<div class="subcontainer">
 				<h2>4. Playing the Game</h2>
 				<p>There are a number of resources available to help you in managing the sheer amount of information that you'll need to keep track of during the randomizer. Make good use of these:</p>
 				<ul>
 					<li><a href="http://smalttpr.mymm1.com/tracker/">ALttP Item Tracker</a> - Plug in what items you have and it'll tell you where you can go. Accounts for crossing through Super Metroid to get to somewhere you normally couldn't</li>
 					<li><a href="https://wiki.supermetroid.run/List_of_rooms">List of Rooms in Super Metroid</a> - The game is huge, so naming each room helps keep track of where you are. You can also see full screenshots of each room</li>
 				</ul>
 				<p>Also some tips:</p>
 				<ul>
 					<li>There are several points at which you can softlock in Super Metroid. Save early, save often, and know when to reset</li>
 					<li>You start with a full map in Super Metroid detailing every item's location. It's very helpful</li>
 					<li>There are many ways to skin a cat, some of them more or less painful than others</li>
 				</ul>
 				<ul>
 					<li>Kakariko Village is incredibly lucrative early on; there are 10-15 items in that area you can acquire with literally no items</li>
 					<li>Getting to the Dark World is a huge priority; you need the Moon Pearl and either a Hammer or a Glove to get there</li>
 					<li>Certain trees can be pulled in ALttP to yield pickups. The pickups that drop are random for each player</li>
 				</ul>
 				<ul>
 					<li>Just because you CAN get somewhere doesn't mean there will be anything helpful there. Glitches yield sequence breaks, not progression</li>
 					<li>Having a trusted third party available to check the spoiler log might not be a bad idea</li>
 					<li>Sometimes your progression can be in somebody else's world. If you know there's nothing for you to do, there's no shame in going and getting some Burger King while you wait</li>
 				</ul>
 			</div>
 		</div>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
 	</body>
 </html>
--- a/src/common-meta.php
+++ b/src/common-meta.php
@@ -5,18 +5,3 @@
 <link href="/styles/styles.css" type="text/css" rel="stylesheet" />
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous">
 <link href="/favicon.ico" rel="shortcut icon" />
 <link rel="alternate" href="/feed" title="9iron RSS Feed" type="application/rss+xml" />
 <!-- No FOUC -->
 <style type="text/css">
        .no-fouc {display: none;}
 </style>
 <script type="text/javascript">
        document.documentElement.classname = 'no-fouc';
        window.addEventListener("load", function(event) {
                // No flash of unstyled content
                nf = document.getElementsByClassName('no-fouc');
                for (i = 0, len = nf.length; i < len; i++) {
                        nf[i].removeClass('no-fouc');
                }
        });
 </script>
--- a/src/common-subtitle.php
+++ b/src/common-subtitle.php
@@ -86,7 +86,6 @@
 		"Lain in a bear suit",
 		"Let's get this out onto a tray. Nice. Mmkay.",
 		"This space intentionally left blank",
 		"",
 		"Banned in Australia",
 		"Banned in Australia(?)",
 		"I want a PSP again",
@@ -111,6 +110,8 @@
 		// - Me, irritating Sam
 		"\"My heart runs Linux\"",
 		// - Me, context forgotten
 		"\"Brett has Mrs. Chapman nipples\"",
 		// - Me
 		"\"I suck a lot of dick, get over here\"",
 		// - Brett
 		"\"This was worth sucking dick\"",
@@ -123,14 +124,20 @@
 		// - Brett
 		"\"Be grody on my back. Wait-\"",
 		// - Brett
 		"\"Let's get this cock onto a tray!\"",
 		// - Brett
 		"\"This is Hell, they are all prostitutes.\"",
 		// - Jordyn
 		"\"Isn't an asshole like a brass instrument?\"",
 		// - Jordyn
 		"\"Sir, this is an M32 grenade launcher\"",
 		// - Jacob https://www.youtube.com/watch?v=DJRkFLFnv3c
 		"\"OHNO!\"",
 		// - Jacob
 		"\"Much edge\"",
 		// - Jacob
 		"\"Oh it's a bear\"",
 		// - Lea, moments before being mauled by a grizzly bear
 		"\"I'm in danger!\"",
 		// - At least four of us, constantly shittalking
 		"\"He got cancer and became a Nazi\"",
@@ -161,8 +168,14 @@
 		// - Jacob, after I said he's my little pogchamp
 		"\"They're children you thirsty whores\"",
 		// - Sam
-		"\"Imagine \'Blades of Glory\' but they fuck\"",
+		"\"Pichu is illegal\"",
 		// - Sam
 		"\"DEDEDE FUCKS\"",
 		// - Sam
 		"\"Imagine 'Blades of Glory' but they fuck\"",
 		// - Also Sam
 		"\"There's no D in BDSM\"",
 		// - Rachael
 		"God dammit, Sam",
 		"God dammit, Jacob",
 		"God dammit",
@@ -198,6 +211,7 @@
 		"No backing database edition",
 		"Motherfucking website edition",
 		"Licensed under MIT edition",
 		"Absolutely no scripts edition",
 		"Now SFW edition",
 		"NSFW edition?",
 		"NSFW edition"
--- a/startpage/index.php
+++ b/startpage/index.php
@@ -23,7 +23,7 @@
 					<h4>desu.ltd</h4>
 					<a href="https://desu.ltd">Index</a>
 					<a href="https://git.desu.ltd">Gitea</a>
-					<a href="https://app.netdata.cloud">Netdata</a>
+					<a href="http://local.desu.ltd">Local</a>
 				</div>
 				<div class="spsubsection">
 					<h4>9iron</h4>
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -10,10 +10,12 @@
 :root {
 	--background-bright: #fdfcfa;
 	--background: #ecebe9;
-	--line: #d6d5d3;
+	--line: rgba(0,0,0,0.1);
 	--greenlink: #327117;
 	--greenlink-hover: #47b625;
 	--link: #286a9d;
 	--link-hover: #3ea5f3;
-	--shadow: 8px -5px #d6d5d3;
+	--shadow: 8px -5px rgba(0,0,0,0.1);
 	--text: #414040;
 	--text-code: #a7674e;
 }
@@ -54,6 +56,12 @@ dl dt {
 dl dd {
 	margin: 0;
 }
 ol,ul {
 	margin: 1em 2em;
 }
 ol li,ul li {
 	padding: 0.25em 0.5em;
 }
 /* CUSTOM DIVS AND SPANS */
 a.quickbutton {
@@ -125,7 +133,7 @@ img.bigimg {
 }
 .header nav ul li {
 	display: inline-block;
-	padding: 0.8em;
+	padding: 1em;
 }
 .header nav ul li:hover {
 	background: var(--link-hover);
@@ -144,7 +152,7 @@ img.bigimg {
 	border-radius: 8px;
 	box-shadow: 5px 5px var(--shadow);
 	margin: 1em 0;
-	padding: 1em;
+	padding: 2em;
 }
 .subcontainer h2 {
 	margin: 0;
@@ -168,6 +176,7 @@ img.bigimg {
 }
 .footer p {
 	margin: 0;
 	opacity: 0.8;
 }
 /* MOBILE */
--- a/terraria/index.php
+++ b/terraria/index.php
@@ -26,7 +26,7 @@
 					<p>A pretty light modpack (as Terraria packs tend to be) with Calamity, extra music, and Magic Storage. Also the 1.4 door tweak thing, that's important too.</p>
 					<p>World Backups:</p>
 					<ul>
-						<li><a href="/files/calamity1.tgz">calamity1</a> - 2020-10-05</li>
+						<li><a href="https://srv.9iron.club/files/calamity1.tgz">calamity1</a> - 2020-10-05</li>
 					</ul>
 				</div>
 				<div class="subcontainer">
@@ -34,7 +34,7 @@
 					<p>It totally met the hype, but was simultaneously underwhelming. I don't know how they did it.</p>
 					<p>World Backups:</p>
 					<ul>
-						<li><a href="/files/1401-farm-master1.wld">1401-farm-master1</a> - 2020-06-01</li>
+						<li><a href="https://srv.9iron.club/files/1401-farm-master1.wld">1401-farm-master1</a> - 2020-06-01</li>
 					</ul>
 				</div>
 			</div>
--- a/tes3mp/index.php
+++ b/tes3mp/index.php
@@ -1,33 +0,0 @@
 <!DOCTYPE html>
 <html>
 	<head>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
 		<title>9iron - TES3MP</title>
 	</head>
 	<body>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
 		<div class="content">
 			<div class="section">
 				<h1>TES3MP - Morrowind Multiplayer</h1>
 				<p>TES3MP is a multiplayer mod for OpenMW, a Morrowind engine rewrite. World state is tied to your character, so multiple people can have multiple playthroughs at the same time.</p>
 			</div>
 			<div class="section">
 				<h1>Installation</h1>
 				<ol>
 					<li>Download the package: <a href="https://github.com/TES3MP/openmw-tes3mp/releases/download/0.7.0-alpha/tes3mp-client.Win32.prerelease.0.7-alpha.zip">Windows</a>, <a href="https://github.com/TES3MP/openmw-tes3mp/releases/download/0.7.0-alpha/tes3mp-GNU+Linux-x86_64-release-0.7.0-alpha-abc4090a0f-01d297f5c6.tar.gz">Linux</a></li>
 					<li>Extract it somewhere</li>
 				</ol>
 			</div>
 			<div class="section">
 				<h1>Connecting to the Server</h1>
 				<ol>
 					<li>Go to where you extracted TES3MP</li>
 					<li>Run <code>tes3mp-browser</code></li>
 					<li>Search for "9iron" and enter the server</li>
 				</ol>
 				<p>The password is "dicks". The password is always "dicks".</p>
 			</div>
 		</div>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
 	</body>
 </html>
--- a/test.sh
+++ b/test.sh
@@ -1,10 +0,0 @@
 #! /bin/sh
 #
 # test.sh
 # Copyright (C) 2020 Vintage Salt <rehashedsalt@cock.li>
 #
 # Distributed under terms of the MIT license.
 #
 php -S localhost:8000
Author	SHA1	Message	Date
Salt	2fc1547401	Update pack description Thanks inventorytweaks	2021-05-14 10:08:28 -05:00
Salt	6d0f4b7614	Rewrite the last few links to point to srv.9iron.club for large files	2021-05-14 10:04:17 -05:00
Salt	96c9785f97	Add bear	2021-05-12 15:52:15 -05:00
Salt	142d2978d0	Redirect to srv.9iron.club for large files	2021-05-11 22:23:14 -05:00
Salt	abda022dfb	Add Valhelsia stuff	2021-05-11 21:34:54 -05:00
Salt	29ff158901	Style changes to make tutorials easier to parse	2021-05-07 00:54:01 -05:00
Salt	c07889ddb9	More tips for SMZ3MW	2021-05-07 00:38:09 -05:00
Salt	172435e78e	Remove TES3MP and Gmod	2021-05-07 00:32:26 -05:00
Salt	d3073d7b6e	Add SMZ3MW instructions	2021-05-07 00:32:06 -05:00
Salt	fa73ce8f58	Update gitlab-ci.yml	2021-05-01 15:44:31 -05:00
Salt	24f624a673	Update about page	2021-04-29 00:11:24 -05:00
Salt	ce18848bb0	Correct protocol for local.desu.ltd	2021-04-22 18:16:17 -05:00
Salt	37254883a4	Add entry for local.desu.ltd	2021-04-22 18:02:06 -05:00
Salt	722f32e0a9	Add more Sam quotes	2021-04-22 14:06:58 -05:00
Salt	d97b679f1e	Add subtitle	2021-04-21 20:01:25 -05:00
Salt	4bfa632dff	More subtitles	2021-04-08 14:37:38 -05:00
Salt	0c30da7e6d	Actually really for real point current to god knows where	2021-04-08 14:33:49 -05:00
Salt	2fcf3ad3a2	Point current off to god knows where	2021-03-25 13:01:32 -05:00
Salt	930c550385	Alright fuck it, disable testing	2021-03-25 01:02:41 -05:00
Salt	ea31268ef5	Wait for Apache to start up before testing it	2021-03-25 00:56:04 -05:00
Salt	c1b575f5a9	Add more debugging info to the test cases	2021-03-25 00:42:24 -05:00
Salt	ad67e1831b	Oh right --push doesn't take an argument	2021-03-25 00:31:04 -05:00
Salt	7330851694	Fix some issues with docker buildx Unfortunately, I can't use --load, I'll have to use --push directly	2021-03-25 00:24:13 -05:00
Salt	62829cecad	Oh more diag pls	2021-03-20 20:36:24 -05:00
Salt	afa3886de5	Maybe this fixes it? Hopefully I can at least diag from here	2021-03-20 20:36:00 -05:00
Salt	d066bed021	Alright, new approach	2021-03-20 20:30:58 -05:00
Salt	1cf9089e33	Disabel SELinux to fix builds on arm64	2021-03-20 20:27:42 -05:00
Salt	9aeb4b44b4	That image doesn't work; try this one	2021-03-20 18:50:45 -05:00
Salt	f3f6fd7be5	No wait I want this one	2021-03-20 14:28:24 -05:00
Salt	138fa27962	Switch to an image that will have buildx	2021-03-20 14:25:59 -05:00
Salt	234992141c	Set up multi-arch builds	2021-03-20 14:20:43 -05:00
Salt	89d9610ba8	Need to actually add curl. Whoops	2021-03-20 14:17:37 -05:00
Salt	73cad693a1	Set up some barebones automated testing	2021-03-20 14:14:11 -05:00
Salt	acc4e3f324	Remove janky script stuff	2021-03-20 13:50:26 -05:00
Salt	7b5af1e979	Update README, ensure /files exists in the docroot	2021-03-20 13:49:49 -05:00
Salt	6a633ec2eb	Fix typo in push for bleeding pipeline	2021-03-20 13:39:01 -05:00
Salt	67f15c17e6	Add a GitLab CI	2021-03-20 13:34:56 -05:00
Salt	3b5544f99f	Update README	2021-03-20 13:03:11 -05:00
Salt	b57bcea176	Deprecate current pack	2021-03-09 02:47:38 -06:00
Salt	dbd6856dce	Add another quote	2021-02-20 01:32:04 -06:00
Salt	36f5753088	Add a basic bitch dockerfile	2021-02-15 13:25:00 -06:00
Salt	7909e8f91d	RGBA Lines	2021-02-14 20:07:03 -06:00
Salt	063ffd6f34	Use transparent shadows	2021-02-14 20:05:02 -06:00
Salt	1ac6174029	Add subtitle to celebrate no scripts	2021-02-14 19:48:52 -06:00
Salt	c3c1761c75	Remove no-fouc	2021-02-14 19:46:55 -06:00
Salt	5de09c8789	Remove netdata	2021-02-11 13:25:17 -06:00
Salt	f7f1b8b052	Minor description text change for 1.7.10-magicpack	2021-02-09 05:35:42 -06:00
Salt	f93a0218a0	Fix escaped quotes in a quote	2021-02-09 05:34:32 -06:00
Salt	1225552189	Minor style changes to Minecraft section	2021-02-09 05:34:06 -06:00
Salt	756a5a9a8a	Work on more revamping of the Minecraft section	2021-02-09 05:24:58 -06:00