summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/legal/notices.md32
-rw-r--r--includes/projects.json6
-rw-r--r--includes/refresh.php2
-rw-r--r--includes/version.txt2
-rw-r--r--legal/notices/index.php2
5 files changed, 24 insertions, 20 deletions
diff --git a/includes/legal/notices.md b/includes/legal/notices.md
index 1789198..a19c249 100644
--- a/includes/legal/notices.md
+++ b/includes/legal/notices.md
@@ -1,12 +1,12 @@
# Equestria.dev Legal Notices
-> If you ever need more details, please contact [contact@minteck.org](mailto:contact@minteck.org) or [leah@minteck.org](mailto:leah@minteck.org). Some information is kept hidden for privacy reasons.
+> If you ever need more details, please contact [raindrops@equestria.dev](mailto:raindrops@equestria.dev) or [cloudburst@equestria.dev](mailto:cloudburst@equestria.dev). Some information is kept hidden for privacy reasons.
## Content administrators
The following people are responsible for content hosted on Equestria.dev's platforms:
-* Mia Raindrops ([contact@minteck.org](mailto:contact@minteck.org))
-* Leah Cloudburst ([leah@minteck.org](mailto:leah@minteck.org))
+* Mia Raindrops ([raindrops@equestria.dev](mailto:raindrops@equestria.dev))
+* Leah Cloudburst ([cloudburst@equestria.dev](mailto:cloudburst@equestria.dev))
## Disclaimer
@@ -14,7 +14,7 @@ Even though we make as much effort as possible into providing users with accurat
## Copyright
-Unless stated otherwise, all content is © Equestria.dev Developers, All rights reserved. Source code may be publicly accessible for some of our platforms. Icons are provided by the [Icons8](https://icons8.com) platform.
+Unless stated otherwise, all content is © Equestria.dev Developers, All rights reserved. Source code may be publicly accessible for some of our platforms. Icons are provided by the [Icons8](https://icons8.com) platform, or by Google or Microsoft.
## Servers
@@ -23,7 +23,7 @@ The Equestria.dev network is spread across multiple servers:
* **Servers in France:**
* **Legally owned by:**
* Mia Raindrops
- * [contact@minteck.org](mailto:contact@minteck.org)
+ * [raindrops@equestria.dev](mailto:raindrops@equestria.dev)
* **Located in:** Loiret, Centre Val-de-Loire, France
* **Current IP address:** %ip-eq1%
* **Internet service provider:**
@@ -46,17 +46,17 @@ The Equestria.dev network is spread across multiple servers:
* 2 rue Kellermann<br>
59100 Roubaix<br>
France
-* **Servers in the United States:**
+* **Servers in the United Kingdom:**
* **Legally owned by:**
- * Matthew Anderson
- * [matt@mattwanderson.com](mailto:matt@mattwanderson.com)
- * **Located in:** South Dakota, United States
+ * Leah Cloudburst
+ * [cloudburst@equestria.dev](mailto:cloudburst@equestria.dev)
+ * **Located in:** Northumberland, England, United Kingdom
* **Current IP address:** %ip-eq3%
* **Internet service provider:**
- * Midcontinent Communications
- * Midco<br>
- Attn: Chief Legal Officer<br>
- 3901 North Louise Avenue<br>
- Sioux Falls, SD 57107<br>
- United States
- * [+1 800 888 1300](tel:+18008881300) \ No newline at end of file
+ * Vodafone<br>
+ Registered in England No 1833679
+ * Vodafone House<br>
+ The Connection, Newbury<br>
+ Berkshire RG14 2FN<br>
+ England, United Kingdom
+ * [+44 7836 191191](tel:+447836191191) \ No newline at end of file
diff --git a/includes/projects.json b/includes/projects.json
index 6a9cc91..cab8468 100644
--- a/includes/projects.json
+++ b/includes/projects.json
@@ -106,6 +106,7 @@
"ditzydoo": "Ditzy Doo",
"genitalia": "Genitalia",
"booru-genitalia": "Genitalia for Booru",
+ "genitalia-plus": "Genitalia Plus",
"stellarbot-epilogue": "Stellarbot",
"zephyrheights-nginx": "zephyrheights nginx configuration",
"cold-haze-archives": "Cold Haze Archives",
@@ -113,5 +114,8 @@
"pone": "Pone.eu.org",
"booru-wearos": "Booru for Wear OS",
"cold-haze-desktop": "Cold Haze Desktop",
- "equilink": "Equilink"
+ "equilink": "Equilink",
+ "rplace-pony": "r/place Pony",
+ "rplace-analytics": "r/place Analytics",
+ "maneos": "maneOS"
} \ No newline at end of file
diff --git a/includes/refresh.php b/includes/refresh.php
index 5bbf142..b6e95df 100644
--- a/includes/refresh.php
+++ b/includes/refresh.php
@@ -162,6 +162,6 @@ $addresses = [];
$addresses["france"] = exec("./getip.sh zephyrheights.equestria.dev");
$addresses["germany"] = exec("./getip.sh bridlewood.equestria.dev");
-$addresses["usa"] = exec("./getip.sh canterlot.equestria.dev");
+$addresses["uk"] = exec("./getip.sh cloudsdale.equestria.dev");
file_put_contents("./data/addresses.json", json_encode($addresses, JSON_PRETTY_PRINT)); \ No newline at end of file
diff --git a/includes/version.txt b/includes/version.txt
index c83e5f9..ce7f951 100644
--- a/includes/version.txt
+++ b/includes/version.txt
@@ -1 +1 @@
-12.2.5 \ No newline at end of file
+12.3.0 \ No newline at end of file
diff --git a/legal/notices/index.php b/legal/notices/index.php
index 69588e9..21b3e43 100644
--- a/legal/notices/index.php
+++ b/legal/notices/index.php
@@ -9,7 +9,7 @@
$addresses = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/addresses.json"), true);
$Parsedown = new Parsedown();
- echo $Parsedown->text(str_replace("%ip-eq3%", $addresses["usa"], str_replace("%ip-eq2%", $addresses["germany"], str_replace("%ip-eq1%", $addresses["france"], file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/legal/notices.md")))));
+ echo $Parsedown->text(str_replace("%ip-eq3%", $addresses["uk"], str_replace("%ip-eq2%", $addresses["germany"], str_replace("%ip-eq1%", $addresses["france"], file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/legal/notices.md")))));
?>
</div>