Commit Graph

86 Commits

Author SHA1 Message Date
08d66f5e22
change max players to 50 2025-07-27 22:18:49 +03:00
3d5418d275 Merge pull request 'fix-skinsrestorer-db' (#28) from fix-skinsrestorer-db into develop
All checks were successful
/ build-docker (push) Successful in 8m16s
Reviewed-on: #28
2025-07-27 17:21:28 +00:00
98515ebd97
enable database use by SkinsRestorer 2025-07-27 20:20:08 +03:00
45ae6ee0f6
fix formatting in Dockerfile 2025-07-27 20:19:06 +03:00
06d24e9e98 Merge pull request 'feature-57-fix-Dockerfile-symlinking' (#27) from feature-57 into develop
All checks were successful
/ build-docker (push) Successful in 7m58s
Reviewed-on: #27
2025-07-26 19:28:21 +00:00
7930780aa5
fix Dockerfile symlinking 2025-07-26 22:27:17 +03:00
8b2f80eef9 Merge pull request 'feature-57-lobby-styling' (#25) from feature-57 into develop
Some checks failed
/ build-docker (push) Failing after 5m18s
Reviewed-on: #25
Reviewed-by: apathy <zloiyudin@gmail.com>
2025-07-26 19:16:11 +00:00
81e82f05c7
make ImageFrame files trackable by git 2025-07-26 22:11:32 +03:00
e0c5451479
remove unnecessary symlinks from Dockerfile 2025-07-26 22:05:34 +03:00
a11297f72c
fix typo in donate item description in main menu 2025-07-26 21:55:44 +03:00
bf04186d93 Merge pull request 'new-chat-formatting' (#26) from carbonchat-config into develop
All checks were successful
/ build-docker (push) Successful in 7m54s
Reviewed-on: #26
Reviewed-by: cuqmbr <me@cuqmbr.xyz>
2025-07-26 18:37:17 +00:00
3df9e68d9a new format 2025-07-26 20:01:12 +03:00
1c064e04e8
change colors and sounds in menus 2025-07-26 19:39:15 +03:00
ee94836afd
add and configure Spawn plugin to teleport player to spawn on join 2025-07-26 17:56:19 +03:00
6c75d1fa07
create and configure worldguard region aroud the spawn in lobby 2025-07-26 17:56:19 +03:00
eb44538f7b
create survival npc and holohrams with links
make npc and hologram files trackable by git
2025-07-26 17:56:18 +03:00
4c0e32d0f0
make world trackable by git, upload lobby map 2025-07-26 17:56:18 +03:00
987aafecd9 Merge pull request 'feature-46-unifiedmetrics' (#24) from feature-46 into develop
All checks were successful
/ build-docker (push) Successful in 8m31s
Reviewed-on: #24
2025-07-25 18:22:10 +00:00
2116d13e5a
add and configure UnifiedMetrics prometheus exporter 2025-07-25 17:56:23 +03:00
6b086e81d4 Merge pull request 'menu-config' (#23) from menu-config into develop
All checks were successful
/ build-docker (push) Successful in 7m9s
Reviewed-on: #23
2025-07-24 16:37:31 +00:00
68e65fa20b
add styles to menu item 2025-07-23 23:28:00 +03:00
3afb8f4800
add styles to menu screens 2025-07-23 23:27:23 +03:00
85b92006be
disable sql database in ItemJoin 2025-07-23 21:43:24 +03:00
76f7452ee6 Merge pull request 'feature-61-no-chat-signing' (#21) from feature-61 into develop
All checks were successful
/ build-docker (push) Successful in 6m2s
Reviewed-on: #21
Reviewed-by: apathy <zloiyudin@gmail.com>
2025-07-21 14:57:17 +00:00
6c05ebbd68 Merge pull request 'feature-62-ViaVersion' (#22) from feature-62 into develop
Some checks are pending
/ build-docker (push) Waiting to run
Reviewed-on: #22
Reviewed-by: apathy <zloiyudin@gmail.com>
2025-07-21 14:55:57 +00:00
cd5f0d8c4b
add and configure ViaVersion 2025-07-20 23:26:44 +03:00
62da614ed8
add and configure FreedomChat 2025-07-20 22:15:21 +03:00
972b458922 Merge pull request 'feature-21-inventory-menu' (#20) from feature-21 into develop
All checks were successful
/ build-docker (push) Successful in 6m54s
Reviewed-on: #20
Reviewed-by: apathy <zloiyudin@gmail.com>
2025-07-18 16:04:56 +00:00
e384692c09
Merge branch 'develop' into feature-21 2025-07-18 19:04:28 +03:00
8bed7c0cbe Merge pull request 'feature-30-worldguard' (#19) from feature-30 into develop
All checks were successful
/ build-docker (push) Successful in 5m9s
Reviewed-on: #19
Reviewed-by: apathy <zloiyudin@gmail.com>
2025-07-18 11:09:19 +00:00
bb16ef78a4
add and configure zMenu 2025-07-18 00:25:45 +03:00
3770415684
add and configure ItemJoin 2025-07-18 00:25:24 +03:00
9812924a99 Merge pull request 'feature-25-TAB' (#18) from feature-25 into develop
All checks were successful
/ build-docker (push) Successful in 42m44s
Reviewed-on: #18
Reviewed-by: cuqmbr <services@cuqmbr.xyz>
2025-07-16 19:11:18 +00:00
3f09f62709
add and configure WordlGuard with RegionTeleport plugin 2025-07-16 22:04:38 +03:00
3df0835a74 feature-25-moved tab to proxy 2025-07-15 23:33:51 +03:00
d75c4b5a04 add plugin TAB by neznamy check docker 2025-07-15 18:20:32 +03:00
4a575507bd Merge pull request 'feature-32-discordsrv' (#17) from feature-32 into develop
All checks were successful
/ build-docker (push) Successful in 5m19s
Reviewed-on: #17
Reviewed-by: cuqmbr <me@cuqmbr.xyz>
2025-07-15 09:56:15 +00:00
cb09ece53c
fix unmerged changes in .dockerignore 2025-07-15 12:54:50 +03:00
a982c099a1
add DiscordSRV symlinks and secrets to Dockerfile 2025-07-15 12:52:17 +03:00
65a0d9c4e5
Merge branch 'develop' into feature-32 2025-07-15 12:45:34 +03:00
3441f4612c feature-32-DiscordSRV 2025-07-15 12:41:49 +03:00
4ad00ef13e Merge pull request 'feature-22-images' (#16) from feature-22 into develop
All checks were successful
/ build-docker (push) Successful in 5m42s
Reviewed-on: #16
Reviewed-by: cuqmbr <me@cuqmbr.xyz>
2025-07-15 09:31:51 +00:00
0ac921a059
add ImageFrame docker container symlinks 2025-07-15 12:23:16 +03:00
30a6b8667e
fix whitespaces in ignore files 2025-07-15 12:12:47 +03:00
c4d19ffca0 feature-22-image 2025-07-15 12:05:42 +03:00
44b0130ca5 Merge pull request 'feature-20-npcs' (#11) from feature-20 into develop
All checks were successful
/ build-docker (push) Successful in 6m43s
Reviewed-on: #11
Reviewed-by: apathy <zloiyudin@gmail.com>
2025-07-15 03:18:51 +00:00
4b4b081272
Merge branch 'develop' into feature-20 2025-07-15 06:18:08 +03:00
75c635fd10 Merge pull request 'feature-19-holograms' (#12) from feature-19 into develop
Some checks failed
/ build-docker (push) Has been cancelled
Reviewed-on: #12
Reviewed-by: apathy <zloiyudin@gmail.com>
2025-07-15 03:15:38 +00:00
52b2bebae5
Merge branch 'develop' into feature-19 2025-07-15 06:14:59 +03:00
fb5efbd07d Merge pull request 'feature-24-CarbonChat' (#15) from feature-24 into develop
All checks were successful
/ build-docker (push) Successful in 4m55s
Reviewed-on: #15
Reviewed-by: cuqmbr <me@cuqmbr.xyz>
2025-07-14 11:09:46 +00:00