From 056bb4f1c2916225fe65974650e2226a999d8dcc Mon Sep 17 00:00:00 2001 From: Lupancham Date: Mon, 10 Jun 2024 17:48:20 +0200 Subject: [PATCH 1/5] CI added to website (#18) Reviewed-on: https://git.theclashfruit.me/CRSS/Website/pulls/18 Reviewed-by: blurryface Co-authored-by: Lupancham Co-committed-by: Lupancham --- index.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index.php b/index.php index ef69c6e..4f4854f 100644 --- a/index.php +++ b/index.php @@ -83,6 +83,13 @@ 'short' => 'ntn', 'short_description' => 'The Northern Company.', 'description' => 'Creators of the H1 and the Northern Complex, Northern is dedicated to improving the CRSS experience.' + ), + 'cin' => array( + 'name' => 'Charge Industries', + 'logo' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Companies/The%20Toaster-Königreich/ChargeIndustries.svg', + 'short' => 'cin', + 'short_description' => 'A multipurpose company owned and operated by The Toaster-Königreich', + 'description' => 'Charge Industries helped bring a new endermen farm to the end, available for public use regardless of nationality. Currently Charge is looking forward to build a artificial village for villagers on Blurry Island (East of Portal Island), this area will allow anyone to come and trade with the residents. Charge Industries™.' ) ); From 572df6b14b3bf096a8fabfc281fced89e09e94a4 Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Mon, 10 Jun 2024 18:50:17 +0200 Subject: [PATCH 2/5] fix: use p instead of ol and close it at the modpack part --- template/index.twig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/template/index.twig b/template/index.twig index a667f3b..8908c7d 100644 --- a/template/index.twig +++ b/template/index.twig @@ -10,8 +10,8 @@

Information

-
    +

    This is CRSS, a server hosted by Blurryface which updates every 1st of the month, ever since beta 1.0.
    We've been doing this for a good while, and our server has many structures and has had many players.
    @@ -22,16 +22,15 @@ The seed used in the world is the same seed the first Main Menu Panorama used, and a pack with a panorama from the area which we built over, on the original coordinates, is due to be released soon™.
    Stay tuned to our Modrinth to download it! - -

+

Modpack

-
    +

    If you want to get started with simple mods for CRSS, you can download the CRSS Modpack on Modrinth! The mods included are designed to be small, simple, and follows the rules of CRSS (which you can see below). Download CRSS Modpack on Modrinth: https://modrinth.com/modpack/crsspack - +

    Rules

      From e1c569e0e7b7c7e73ddc1b480b039bad7bbe06ea Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Mon, 10 Jun 2024 18:51:57 +0200 Subject: [PATCH 3/5] fix: put the modpack link in an anchor tag why wasn't it in one :moyai: --- template/index.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/index.twig b/template/index.twig index 8908c7d..188fe1c 100644 --- a/template/index.twig +++ b/template/index.twig @@ -29,7 +29,7 @@

      If you want to get started with simple mods for CRSS, you can download the CRSS Modpack on Modrinth! The mods included are designed to be small, simple, and follows the rules of CRSS (which you can see below). - Download CRSS Modpack on Modrinth: https://modrinth.com/modpack/crsspack + Download CRSS Modpack on Modrinth: https://modrinth.com/modpack/crsspack

      Rules

      From 16ba01ab37ac91e27007fa9b52c1c46473ddab0a Mon Sep 17 00:00:00 2001 From: polycord Date: Tue, 11 Jun 2024 14:15:50 +0200 Subject: [PATCH 4/5] adding deforest and updating info text on homepage (#20) Reviewed-on: https://git.theclashfruit.me/CRSS/Website/pulls/20 Reviewed-by: blurryface Co-authored-by: polycord Co-committed-by: polycord --- index.php | 7 +++++++ template/index.twig | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 4f4854f..4fdb189 100644 --- a/index.php +++ b/index.php @@ -90,6 +90,13 @@ 'short' => 'cin', 'short_description' => 'A multipurpose company owned and operated by The Toaster-Königreich', 'description' => 'Charge Industries helped bring a new endermen farm to the end, available for public use regardless of nationality. Currently Charge is looking forward to build a artificial village for villagers on Blurry Island (East of Portal Island), this area will allow anyone to come and trade with the residents. Charge Industries™.' + ), + 'def' => array( + 'name' => 'Deforest' + 'logo' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Companies/The%20Romanian%20Federation%20of%20Minecraft/deforest%20white%20svg.svg', + 'short' => 'def', + 'short_description' => 'Helping clear out forests', + 'description' => 'Helping clear out forests for emerging nations or for new projects.' ) ); diff --git a/template/index.twig b/template/index.twig index 188fe1c..94b3143 100644 --- a/template/index.twig +++ b/template/index.twig @@ -16,7 +16,7 @@ We've been doing this for a good while, and our server has many structures and has had many players.
      - It currently has 3 nations, PSF, DRR and CNK, each one with unique builds and terrain.
      + It currently has 6 nations, PSF, CNK, TTK, ROB, RFM and TCG, each one with unique builds and terrain.
      We have an Youtube channel where we post some bits of our server, you can stay tuned to it to get to know more about us.
      From 48528ecde4ca732568d67d1dfdd77fcc8eced805 Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Tue, 11 Jun 2024 14:50:08 +0200 Subject: [PATCH 5/5] fix: missing comma and indentation --- index.php | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/index.php b/index.php index 4fdb189..fa189e5 100644 --- a/index.php +++ b/index.php @@ -12,7 +12,6 @@ session_start(); $nations = array( - 'psf' => array( 'name' => 'Panorama Socialist Federation', 'flag' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Nations/Republic%20of%20Panorama/Flag.svg', @@ -58,7 +57,7 @@ 'leader' => 'polycord', 'leader_term' => 'President', ), - 'tcg' => array( + 'tcg' => array( 'name' => 'Toasteric Colony of Grapetopia', 'flag' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Nations/Grapetopia/TCG.svg', 'short' => 'tcg', @@ -85,18 +84,18 @@ 'description' => 'Creators of the H1 and the Northern Complex, Northern is dedicated to improving the CRSS experience.' ), 'cin' => array( - 'name' => 'Charge Industries', - 'logo' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Companies/The%20Toaster-Königreich/ChargeIndustries.svg', - 'short' => 'cin', - 'short_description' => 'A multipurpose company owned and operated by The Toaster-Königreich', - 'description' => 'Charge Industries helped bring a new endermen farm to the end, available for public use regardless of nationality. Currently Charge is looking forward to build a artificial village for villagers on Blurry Island (East of Portal Island), this area will allow anyone to come and trade with the residents. Charge Industries™.' + 'name' => 'Charge Industries', + 'logo' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Companies/The%20Toaster-Königreich/ChargeIndustries.svg', + 'short' => 'cin', + 'short_description' => 'A multipurpose company owned and operated by The Toaster-Königreich', + 'description' => 'Charge Industries helped bring a new endermen farm to the end, available for public use regardless of nationality. Currently Charge is looking forward to build a artificial village for villagers on Blurry Island (East of Portal Island), this area will allow anyone to come and trade with the residents. Charge Industries™.' ), 'def' => array( - 'name' => 'Deforest' - 'logo' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Companies/The%20Romanian%20Federation%20of%20Minecraft/deforest%20white%20svg.svg', - 'short' => 'def', - 'short_description' => 'Helping clear out forests', - 'description' => 'Helping clear out forests for emerging nations or for new projects.' + 'name' => 'Deforest', + 'logo' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Companies/The%20Romanian%20Federation%20of%20Minecraft/deforest%20white%20svg.svg', + 'short' => 'def', + 'short_description' => 'Helping clear out forests', + 'description' => 'Helping clear out forests for emerging nations or for new projects.' ) );