Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,803 Commits 12 Branches 45 Tags 104 MiB
dbea214d6f
Commit Graph

3803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
c72b209070 Merge branch 'dev' into feature/proxy-stats 2024-01-16 19:24:39 +00:00
Iain Powrie
0e1afb4041 Merge branch 'tweak/server-config-check' into 'dev' 
Fix indent on public status check box

See merge request crafty-controller/crafty-4!691
 2024-01-16 19:21:16 +00:00
Zedifus
d9682fdf8f Update changelog !691 2024-01-16 19:15:06 +00:00
Zedifus
a8fc90d0f9 Merge branch 'dev' into tweak/server-config-check 2024-01-16 19:13:13 +00:00
Iain Powrie
5a96fa10cd Merge branch 'bugfix/server-id-stack' into 'dev' 
Fix bug where invalid server Id leads to stack

See merge request crafty-controller/crafty-4!690
 2024-01-16 19:10:15 +00:00
Zedifus
fc308d8985 Update changelog !690 2024-01-16 19:02:09 +00:00
Zedifus
3c5288abfc Merge branch 'dev' into bugfix/server-id-stack 2024-01-16 19:00:42 +00:00
Iain Powrie
c89dbed26c Merge branch 'feature/paper-builds' into 'dev' 
Implement paper builds using paper API

See merge request crafty-controller/crafty-4!688
 2024-01-16 18:57:38 +00:00
amcmanu3
0b520aae80 Fix misc sonarcube finding 2024-01-16 13:53:50 -05:00
amcmanu3
7d7ae02beb Add parameter to version call 2024-01-16 13:50:05 -05:00
Zedifus
09c2917e27 Update changelog !688 2024-01-16 18:26:17 +00:00
Zedifus
01a7c2e238 Merge branch 'dev' into feature/paper-builds 2024-01-16 18:23:18 +00:00
Iain Powrie
700635acf2 Merge branch 'tweak/forge-fix' into 'dev' 
Fixing Forge Installation

See merge request crafty-controller/crafty-4!687
 2024-01-16 18:08:27 +00:00
Zedifus
b76636ed99 Update changelog !687 2024-01-16 18:04:59 +00:00
Zedifus
12bb29ac2d Merge branch 'dev' into tweak/forge-fix 2024-01-16 18:02:57 +00:00
Iain Powrie
e873908ad3 Merge branch 'bugfix/bukkit-MOTD' into 'dev' 
Fix bukkit and downstream fork MOTD crash

See merge request crafty-controller/crafty-4!686
 2024-01-16 17:58:58 +00:00
Zedifus
c43749cc7c Update changelog !686 2024-01-16 17:53:21 +00:00
amcmanu3
1b047b1733 Remove scroll bars from player management 2024-01-13 18:27:25 -05:00
Andrew
589a11f43c Allow omission of player stats from total 2024-01-13 16:43:16 -05:00
amcmanu3
90806b613c Fix log file output on page 2024-01-12 18:33:21 -05:00
amcmanu3
78b2feab01 Remove update url for paper builds 2024-01-12 14:46:25 -05:00
amcmanu3
e3dee7dcd6 Fix indent on checkbox on server config 2024-01-12 13:43:04 -05:00
amcmanu3
96d5ce58d2 Get jars direct frrom paper 2024-01-12 11:23:35 -05:00
amcmanu3
5f2236563b Fix bug where invalid server Id leads to stack 2024-01-11 19:53:22 -05:00
amcmanu3
cd3b8d4d9c Fix update urls 2024-01-11 19:35:08 -05:00
amcmanu3
e274b0c677 Implement paper builds using mineacademy API 
Big shoutout to zed for fnding this
 2024-01-11 19:20:50 -05:00
amcmanu3
9d319b7460 Fix unicode chars in terminal w/ texitiowrapper 2024-01-11 16:11:08 -05:00
Silversthorn
dc09f47871 Fixing issues for forge installation for versions >= 1.20 2024-01-03 21:10:33 +01:00
Andrew
60ac3bf630 Check type in extra so we don't iterate thru str 2023-12-29 12:11:29 -05:00
Andrew
a67f53a4c9 Fix bukkit and downstream fork MOTD crash 2023-12-28 18:34:35 -05:00
Zedifus
76e46807a0 Merge branch 'dev' into feature/steamcmd 2023-12-13 02:46:22 +00:00
Zedifus
1d32afa09d Prepare 4.2.3 release base 2023-12-13 02:17:54 +00:00
Zedifus
148b349e2a Close changelog v4.2.2 2023-12-13 02:01:04 +00:00
Iain Powrie
994dcb58da Merge branch 'maintenance/translations-12-11' into 'dev' 
Maintenance/translations 12 11

See merge request crafty-controller/crafty-4!684
 2023-12-13 01:57:13 +00:00
Zedifus
1c65cf5937 Update changelog !684 2023-12-13 01:49:49 +00:00
Zedifus
f94c3720aa Merge branch 'dev' into maintenance/translations-12-11 2023-12-13 01:47:36 +00:00
Iain Powrie
ce4371f91e Merge branch 'tweak/queue-log' into 'dev' 
Add user queue debug logging

See merge request crafty-controller/crafty-4!683
 2023-12-13 01:37:50 +00:00
Zedifus
717f121f1f Update changelog !683 2023-12-13 01:32:28 +00:00
amcmanu3
fb66e4fcda Update translations 2023-12-11 15:44:48 -05:00
amcmanu3
5fd3fbee26 Merge branch 'maintenance/translations-12-11' of https://gitlab.com/crafty-controller/crafty-4 into maintenance/translations-12-11 2023-12-11 15:28:39 -05:00
Andrew
69fcdfddf0 Add json sort script 2023-12-11 15:15:26 -05:00
Andrew
2cab7de6af Make watcher log debug 2023-12-07 18:03:31 -05:00
Andrew
d2b738f857 Add queue logging 2023-12-07 18:02:54 -05:00
Zedifus
78d7934e29 Merge branch 'dev' into feature/steamcmd 2023-12-07 17:15:48 +00:00
Zedifus
7c3c19df5b Merge branch 'feature/steamcmd' of gitlab.com:crafty-controller/crafty-4 into feature/steamcmd 2023-12-07 17:05:17 +00:00
Iain Powrie
4447fdfdff Merge branch 'refactor/unraid-description' into 'dev' 
Documentation adjustment for !672

See merge request crafty-controller/crafty-4!673
 2023-12-07 17:01:47 +00:00
Iain Powrie
bf13d4285b Merge branch 'sec/admin-creation' into 'dev' 
Force random password on first run. Stop using Crafty as default password

See merge request crafty-controller/crafty-4!672
 2023-12-07 16:49:46 +00:00
Zedifus
e3f8531eda Update changelog !673 
Premptive
 2023-12-07 16:44:56 +00:00
Zedifus
e247b5c71e Update changelog !672 2023-12-07 16:43:21 +00:00
Andrew
7037d857d7 Black codebase 2023-12-07 11:05:26 -05:00