CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,638 Commits 31 Branches 181 Tags
4b2e8b241bc19b3b3b0e16de749da9df9d3f8755
Commit Graph

49 Commits

Author SHA1 Message Date
okx-code
9f681dc606 Merge branch 'gamma' 2025-08-28 23:30:14 +01:00
okx-code
7c3b9424a2 update leaf 2025-08-26 14:09:39 +01:00
okx-code
724638f805 update leaf 2025-08-20 15:12:49 +01:00
okx-code
85e3664f6d add reinforcement decay close to border 2025-08-20 05:29:15 +01:00
okx-code
0883f2d40f Merge branch 'main' into gamma 
# Conflicts:
#	ansible/files/paper-config/config/paper-world-defaults.yml
#	ansible/files/paper-config/server.properties
#	ansible/files/proxy-config/plugins/minimotd-velocity/extra-configs/main.conf
#	ansible/files/proxy-config/plugins/minimotd-velocity/extra-configs/pvp.conf
#	ansible/files/proxy-config/plugins/minimotd-velocity/main.conf
#	ansible/variables/settings.yml
 2025-08-19 23:52:38 +01:00
okx-code
b456cbbb5f update leaf 2025-08-19 23:03:11 +01:00
okx-code
7abfe940b3 add playercap hack 2025-08-17 16:01:08 +01:00
okx-code
72f1e0b5a3 switch paper 2025-08-17 02:49:22 +01:00
okx-code
29152ddb58 add second civ server 2025-08-15 04:55:25 +01:00
okx-code
9b37d93a1a add queue 2025-08-12 23:59:26 +01:00
okx-code
8dd59ef2c8 add civpaper for 1.21.8 and random tick scale 2025-08-09 15:54:16 +01:00
okx-code
510ae50845 disable healthcheck but in the right place this time 2025-08-04 02:13:18 +01:00
okx-code
71b3e699bd disable healthcheck 2025-08-04 02:08:40 +01:00
okx-code
b3f77f36f3 update docker images 2025-08-04 02:00:44 +01:00
okx-code
f0e73ca2e4 update velocity 2025-08-04 01:42:06 +01:00
okx-code
6c24cde085 update plugins 2025-08-04 00:24:43 +01:00
okx-code
b45df59cca update velocity 2025-07-22 02:09:01 +01:00
okx-code
fd27d74065 Use CivPaper 2025-07-21 23:41:29 +01:00
okx-code
39812ebbdc fix velocity 2025-06-24 13:53:38 +01:00
okx-code
9ede2b7e9e update more plugins 2025-02-26 15:18:21 +00:00
okx-code
a7fb8a07ce update image again 2025-01-01 07:11:37 +00:00
okx-code
bb26754e82 smh itzg 2025-01-01 07:06:44 +00:00
okx-code
2e884a2788 update proxy 2025-01-01 06:45:29 +00:00
okx-code
ab145a621d Reapply "update to 1.21.3" 
This reverts commit a2e1c7dd1b.
 2024-12-15 01:48:34 +00:00
okx-code
a2e1c7dd1b Revert "update to 1.21.3" 
This reverts commit d0b06a8525.
 2024-11-28 22:24:22 +00:00
okx-code
d0b06a8525 update to 1.21.3 2024-11-24 18:46:28 +00:00
okx-code
a572dde4a3 Replace Waterfall with Velocity 2024-11-24 03:04:13 +00:00
okx-code
9ec9d71f5c add forced hosts 2024-11-07 20:34:46 +00:00
okx-code
15539b4a2f add pvp hostname 2024-11-07 20:21:27 +00:00
okx-code
36a2cef17c use custom jar 2024-10-15 02:07:49 +01:00
okx-code
e28f767402 fix 2024-10-15 01:26:10 +01:00
okx-code
adfd8b2dbb add dynamic arenas 2024-10-15 01:08:44 +01:00
okx-code
cdc57c6d05 test 2024-10-01 21:44:29 +01:00
okx-code
c7802819eb Fix debugging and allow extended timeouts 2024-09-04 01:02:49 +01:00
okx-code
265c75f6bd use graalvm 2024-08-21 16:58:28 +01:00
okx-code
fefc1ff58d Update to 1.21 2024-08-19 22:49:53 +01:00
okx-code
d296d328a0 Add options for debugging + update ViaVersion 2024-08-18 15:54:57 +01:00
AngrySoundTech
6540b64d15 Support privateconfig for local development 
Not yet supported for production deployments, that's still cloned manually for now
 2024-07-31 17:13:22 -04:00
AngrySoundTech
4a526aa550 Update server and plugins to 1.20.6 2024-07-19 11:55:46 -04:00
AngrySoundTech
8eec5384d5 Merge branch 'main' into feature/always-build-plugins 2024-05-12 12:41:56 -04:00
AngrySoundTech
ab04a7422c Update docker compose configuration 2024-05-09 18:20:00 -04:00
AngrySoundTech
02c33203e1 Fix local docker setup 2024-05-07 00:43:01 +01:00
AngrySoundTech
66e5681e4d Fix local docker setup 2024-05-04 20:45:13 -04:00
AngrySoundTech
e9ce5d414f Merge branch 'main' into mc/1.20 2024-05-01 12:14:54 -04:00
AngrySoundTech
fa0f3fda34 Eliminate intermediate waterfall container 2024-04-30 17:41:42 -04:00
AngrySoundTech
8c8ff79c35 Eliminate intermediate paper container 2024-04-30 17:41:41 -04:00
AngrySoundTech
e2ddc32715 Assimilate CivDocker 2024-04-16 11:27:27 -04:00
AngrySoundTech
28172760d4 Add RabbitMQ Management port, update README.md 2024-03-20 20:01:49 -04:00
AngrySoundTech
51b91e3d89 Create pvp container 2024-03-04 14:13:39 -05:00