Commit graph

112 commits

Author SHA1 Message Date
TheClashFruit 706e6b789b
feat: add rob 2024-05-26 10:20:41 +02:00
blurryface 98872ff1f7
Merge pull request 'Clarified the cheating rule (the first one)' (#13) from KTrain5169/CRSSWebsite:main into main
Reviewed-on: CRSS/Website#13
now I merged lma
2024-05-25 19:13:34 +02:00
KTrain5169 21235a71e2
Clarified the cheating rule (the first one)
Please just... word it better somewhat

Signed-off-by: Forgejo <>
2024-05-25 12:45:33 +02:00
TheClashFruit fc16d400a2
fix: parse to floats instead of ints 2024-05-24 18:50:59 +02:00
blryface a5fbe399b0 aaaaaaaaaaaaaaaaaaaaaaaaa 2024-05-18 17:18:07 -03:00
blryface bf7b0d9920 uhhhh was it this 2024-05-18 17:14:49 -03:00
blryface f813ddc007 pls work 2024-05-18 17:10:23 -03:00
blryface be92698ffe companies 2024-05-18 17:07:45 -03:00
blryface fc5495ab13 Remove DRR, add companies template, add Fedbank 2024-05-18 16:58:50 -03:00
blurryface aeb2e7fd43
1.9
Signed-off-by: Forgejo <>
2024-05-12 01:16:13 +02:00
TheClashFruit 2a62ac00b2
fix: only run upload task on main branch 2024-05-10 18:05:02 +02:00
blurryface 9c7ab20085
Merge pull request 'Updates index.php & nation.twig' (#10) from Lupancham/Website:main into main
Reviewed-on: CRSS/Website#10
2024-04-25 22:27:22 +02:00
Lupancham 92e106b041 Editing the previous update
Forgot to change controled to controlled.
2024-04-25 13:51:19 -04:00
Lupancham 8925d91e59 Minor Change to nation.twig & change TTK flag link to the one in the CRSS repo
Flag didn't look with the word "Flag:" beside the flag image.
2024-04-25 13:49:26 -04:00
blurryface 2a530c7bff
, 2024-04-25 03:42:34 +02:00
blurryface d8c370a57f
NEW IP ‼️ 2024-04-25 03:18:23 +02:00
blurryface 07e9144235
Merge pull request 'Add The Toaster-Königreich to index.php' (#9) from Lupancham/Website:main into main
Reviewed-on: CRSS/Website#9
2024-04-25 03:16:59 +02:00
Lupancham 25e3a40101
Update index.php 2024-04-25 02:22:04 +02:00
TheClashFruit e0548b4079
feat: change discord invite (closes #8) 2024-04-18 09:58:35 +02:00
blurryface 1c5be9ea35
mian 2024-04-12 05:30:04 +02:00
blryface 113a63849e , 2024-04-07 03:12:34 -03:00
blryface 62b80d2b60 Make separate kinds of Descriptions 2024-04-07 03:10:23 -03:00
blryface 80870547d0 Add nation descriptions to nation pages 2024-04-07 03:05:42 -03:00
TheClashFruit 0bfe0f99f5
fix typo (#6)
Reviewed-on: CRSS/Website#6
2024-04-02 00:22:31 +02:00
flash e3940b0846
fix typo 2024-04-02 00:20:16 +02:00
TheClashFruit 063292dd9d
feat: start making an admin panel 2024-04-01 19:10:19 +02:00
blurryface c8b4814aef
<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /> 2024-03-29 08:37:03 +01:00
blurryface ea17b74017
Attempt to make [U+FE0F] not be 2024-03-29 08:34:06 +01:00
blurryface 41781cf33d
fix stuff moyai (also i forgor to have a git message last time oopsies) 2024-03-29 08:33:19 +01:00
blurryface 4c34017303
Update template/index.twig 2024-03-29 08:30:20 +01:00
blurryface 74a036eb48
Discord + more "sponsors" 2024-03-29 08:13:01 +01:00
blurryface 5b62de4393
1.8 real (this is the last month before combat update..) 2024-03-27 23:46:04 +01:00
blurryface b4e4a2ed68
Make ROP become PSF 2024-03-27 02:34:11 +01:00
TheClashFruit 4f45938de6
feat: change version 2024-03-18 19:02:39 +01:00
TheClashFruit 402021f113
feat: new tile url 2024-03-03 11:46:11 +01:00
TheClashFruit a77e428fcc
feat: update my mastodon link 2024-02-25 10:31:42 +01:00
blurryface ec99b7bc99
Merge pull request 'Version 1.6.4' (#5) from blurryface/CRSS_Website:main into main
Reviewed-on: CRSS/Website#5
2024-02-07 18:46:43 +01:00
blurryface 3f060ba407
Version 1.6.4 2024-02-07 18:46:04 +01:00
TheClashFruit ed8e3f92a7
fix: don't use discord cdn link 2024-01-14 10:48:14 +01:00
Mya deabb2f462
Merge pull request 'Fix a tiny little spelling error :)' (#4) from WorldWidePixel/Website:main into main
Reviewed-on: CRSS/Website#4
2024-01-14 04:24:34 +01:00
WorldWidePixel efee1d083a
Fix a tiny little spelling error :) 2024-01-14 04:23:44 +01:00
Mya dc1d7e2b8c
Merge pull request 'Add country Chunkia to index.php' (#3) from WorldWidePixel/Website:main into main
Reviewed-on: CRSS/Website#3
2024-01-14 04:20:35 +01:00
WorldWidePixel 12329252a6
Add country Chunkia to index.php
title
2024-01-14 04:14:19 +01:00
TheClashFruit a4e5c331e3
feat: start making the admin panel 2024-01-14 00:58:35 +01:00
TheClashFruit 8bcebc7069
feat: make marker not hardcoded 2024-01-13 23:12:46 +01:00
blurryface 3a17988114
Copyright 2024, "Studios" in Pridecraft
Signed-off-by: Forgejo <>
2024-01-12 18:31:23 +01:00
TheClashFruit 73062a8729
Website Update (#2)
Reviewed-on: CRSS/Website#2
2024-01-12 09:21:10 +01:00
Mya 7fca31ab3a Feat: Added cards in Nations and improved Drawer. 2024-01-12 00:41:07 +01:00
Mya 2cd9377649 Fix: Updated link to my fedi page :3 2024-01-11 21:22:20 +01:00
Mya 71ed2f2486 Fix: Updated displayed version to 1.5.2 from 1.3.2. 2024-01-11 21:12:25 +01:00