Commit Graph

10440 Commits

Author SHA1 Message Date
okx-code
5e4d2daea6 Merge pull request #501 from CivMC/tabfix
update kirabukkitgateway
2024-05-10 18:56:53 +01:00
okx-code
9cb24b1235 update kirabukkitgateway 2024-05-10 18:56:31 +01:00
okx-code
f05bad6977 Merge pull request #500 from CivMC/tabfix
fix tab
2024-05-10 18:25:22 +01:00
okx-code
bcf3d9e5dc fix tab 2024-05-10 18:24:58 +01:00
RedDevel2
35148d6988 Merge pull request #498 from CivMC/RedDevel2-patch-1
Update variables
2024-05-10 18:10:11 +02:00
RedDevel2
b0345b4d56 Update variables 2024-05-10 17:22:12 +02:00
RedDevel2
50e8681e62 Merge pull request #324 from CivMC/mc/1.20
1.20 update
v2.0.0
2024-05-10 17:17:42 +02:00
RedDevel2
ac975b3425 Try rebuilding plugins 2024-05-10 17:01:52 +02:00
RedDevel2
38ae2bbc8c reEnable 2024-05-10 16:20:12 +02:00
RedDevel2
93f51f14be revert fossil change 2024-05-10 16:08:36 +02:00
RedDevel2
0335011f32 Test 2024-05-10 15:37:47 +02:00
RedDevel2
362cd8fad1 Remove name/lore 2024-05-09 13:27:12 +02:00
RedDevel2
82840ff6ac update 2024-05-09 13:06:24 +02:00
okx-code
5c8106a07b Update plugins 2024-05-09 00:56:31 +01:00
okx-code
b3f0438a94 Merge main 2024-05-09 00:52:02 +01:00
okx-code
854e657280 Merge pull request #494 from CivMC/revert-factorymod
Revert "Merge pull request #394 from MrJeremyFisher/maybe-fix-factory…
2024-05-09 00:49:50 +01:00
okx-code
b52671a0f0 Revert "Merge pull request #394 from MrJeremyFisher/maybe-fix-factory-overflow"
This reverts commit 6f1690f5aa, reversing
changes made to 314a69332d.
2024-05-09 00:46:29 +01:00
okx-code
e0c6b514cb Update server.properties 2024-05-07 10:29:30 +01:00
okx-code
3f22fa66aa Update server.properties 2024-05-07 10:28:41 +01:00
RedDevel2
2b875803f3 moree things 2024-05-07 11:13:35 +02:00
AngrySoundTech
22bcb367d3 Fix local docker setup 2024-05-07 00:43:01 +01:00
okx-code
1b63abe343 move viaversion to paper 2024-05-07 00:40:38 +01:00
okx-code
87d3605b20 Merge pull request #491 from CivMC/feature/fix-local-docker
Fix local docker setup
2024-05-06 21:59:25 +01:00
AngrySoundTech
aed1f2ac37 Fix local docker setup 2024-05-04 20:45:13 -04:00
RedDevel2
ac0dc2a3d8 Merge pull request #490 from CivMC/revertfm
Revert  change
v1.27.1
2024-05-03 14:11:25 +02:00
RedDevel2
15304e9688 Revert factory change 2024-05-03 11:30:51 +02:00
RedDevel2
018829dd03 Merge pull request #487 from CivMC/RedDevel2-patch-1
Update tag
2024-05-02 16:27:23 +02:00
RedDevel2
a2c298ddc4 Update tag 2024-05-02 15:37:57 +02:00
RedDevel2
2f67008553 Merge pull request #486 from CivMC/127jars
Upload new jars
v1.27.0
2024-05-02 15:33:29 +02:00
RedDevel2
d5fb63d4b5 reset 2024-05-02 14:04:00 +02:00
RedDevel2
8e46e55579 Update config.yml 2024-05-02 13:41:24 +02:00
RedDevel2
e8e2adaeb7 Update config.yml 2024-05-02 12:45:03 +02:00
RedDevel2
1ae1c9ed63 upload fresh config 2024-05-02 12:06:42 +02:00
RedDevel2
fb101f4541 try generating fresh config 2024-05-02 11:25:23 +02:00
RedDevel2
9a03ec8f69 Update Viaversion 2024-05-02 10:59:49 +02:00
RedDevel2
fd927b9498 Upload new jars 2024-05-02 09:53:35 +02:00
RedDevel2
25550d45db Merge pull request #350 from MrJeremyFisher/nllim
Add `/nllim` (Name Layer List Invited Members)
2024-05-01 23:16:25 +02:00
RedDevel2
c172178111 Merge pull request #347 from MrJeremyFisher/pot-glitch-fix
Don't heal dead entities with health potions
2024-05-01 23:16:17 +02:00
RedDevel2
fbc55520c7 Merge pull request #383 from drekamor/main
Proper /nldg confirmation
2024-05-01 23:15:55 +02:00
RedDevel2
01cb3304de Merge pull request #386 from CivMC/fix-portals
Fix portal hack not triggering
2024-05-01 23:15:28 +02:00
RedDevel2
358031b27a Merge pull request #391 from CivMC/fix-chunk-meta
Fix chunk meta not saving
2024-05-01 23:15:18 +02:00
RedDevel2
6d6d05fbbd Merge pull request #404 from Protonull/ignorelist-command
Refactor /ignorelist command
2024-05-01 23:15:09 +02:00
RedDevel2
6f1690f5aa Merge pull request #394 from MrJeremyFisher/maybe-fix-factory-overflow
Fix Factory Overflow
2024-05-01 23:15:01 +02:00
RedDevel2
390a69b5ba Missed an input 2024-05-01 19:12:10 +02:00
AngrySoundTech
2d0669bbfb Merge remote-tracking branch 'origin/mc/1.20' into mc/1.20 2024-05-01 12:18:19 -04:00
AngrySoundTech
1e07538ec0 Merge branch 'main' into mc/1.20 2024-05-01 12:14:54 -04:00
AngrySoundTech
314a69332d Merge pull request #481 from CivMC/feature/eliminate-containers
Eliminate Intermediate containers
2024-05-01 11:51:33 -04:00
RedDevel2
b1240c895d Merge pull request #482 from CivMC/main
update branch
2024-05-01 11:50:34 +02:00
AngrySoundTech
9e09bec3af Fix terra 2024-04-30 18:28:20 -04:00
AngrySoundTech
83e25d500f Fix server icon 2024-04-30 18:14:47 -04:00