Commit Graph

8048 Commits

Author SHA1 Message Date
okx-code
69f36dab60 Merge branch 'main' into hiddenore 2024-02-23 22:31:11 +00:00
okx-code
674136bc30 Merge branch 'main' into railswitch 2024-02-23 22:30:47 +00:00
okx-code
9abf13c55e Merge branch 'main' into civduties 2024-02-23 22:30:25 +00:00
okx-code
2f4ca074ba Merge branch 'main' into essenceglue 2024-02-23 22:30:07 +00:00
okx-code
e6181df091 Merge branch 'main' into namecolors 2024-02-23 22:29:46 +00:00
okx-code
3eca6c0228 Fix RealisticBiomes plugin name 2024-02-23 22:28:43 +00:00
okx-code
b3cd41fe3a Make skyBase not additive 2024-02-23 22:28:21 +00:00
okx-code
eccdd0f7d3 move repo 2024-02-23 22:26:53 +00:00
okx-code
68dcf17f63 fix indentation 2024-02-23 22:26:13 +00:00
okx-code
87da4b501a fix indentation 2024-02-23 22:25:32 +00:00
AngrySoundTech
2dfe9c9b5c Merge pull request #318 from CivMC/kirabukkitgateway
Add KiraBukkitGateway
2024-02-23 17:17:48 -05:00
okx-code
9bba4683d4 Fix RealisticBiomes plugin name 2024-02-23 22:05:30 +00:00
okx-code
e340c29112 Merge branch 'essenceglue' into mc/1.20 2024-02-23 22:03:47 +00:00
okx-code
6f7817d968 fix name 2024-02-23 21:58:50 +00:00
Alexander
109294b299 Replace MoreClassUtils.castOrNull() with instanceof pattern matching 2024-02-23 21:53:22 +00:00
Walkers
fae6628e42 change where toggle status is saved to be player specific 2024-02-23 16:22:01 +00:00
Walkers
2455dbd31c add cooldown to toggle button 2024-02-23 10:57:29 +00:00
Walkers
3866486261 add toggle option for banned players in showall 2024-02-23 10:39:29 +00:00
okx-code
c85c33c820 Merge branch 'mc/exilepearl-1.20' into mc/1.20 2024-02-23 01:45:22 +00:00
okx-code
682a18c48b proxy method properly 2024-02-23 01:45:05 +00:00
okx-code
86b3bd1b26 Update KiraBukkitGateway to 1.20 2024-02-23 01:41:34 +00:00
okx-code
c9b0856f55 Update NameColors to 1.20 2024-02-23 01:38:26 +00:00
okx-code
f618d501d4 Update RailSwitch to 1.20 2024-02-23 01:37:54 +00:00
okx-code
ef9c537a90 Update HiddenOre to 1.20 2024-02-23 01:35:45 +00:00
okx-code
5171271f5b Update EssenceGlue to 1.20 2024-02-23 01:31:15 +00:00
okx-code
45061c84b8 Update CivDuties to 1.20 2024-02-23 01:30:19 +00:00
okx-code
e0d5901412 Merge branch 'railswitch' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:27:46 +00:00
okx-code
5fcff41bcd Merge branch 'namecolors' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:27:34 +00:00
okx-code
ec7da3405c Merge branch 'kirabukkitgateway' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:27:25 +00:00
okx-code
0693cca092 Merge branch 'hiddenore' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:27:14 +00:00
okx-code
ae0352b5d2 Merge branch 'essenceglue' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:26:39 +00:00
okx-code
0e1d6b5327 Merge branch 'civduties' into mc/1.20 2024-02-23 01:26:19 +00:00
okx-code
66e00808ae Update CopperRail to 1.20 2024-02-23 01:25:14 +00:00
okx-code
a1b861f0d1 Merge branch 'main' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:15:30 +00:00
okx-code
eb3d4939c2 Add KiraBukkitGateway 2024-02-22 23:32:33 +00:00
okx-code
ffd0abbaaf Add NameColors 2024-02-22 22:30:54 +00:00
okx-code
8f7bd389b7 Add EsssenceGlue 2024-02-22 22:21:05 +00:00
okx-code
b980ad8917 Add CivDuties 2024-02-22 22:08:55 +00:00
okx-code
6a915e86b7 Add RailSwitch 2024-02-22 21:37:06 +00:00
okx-code
2173e8541e Add HiddenOre 2024-02-22 21:31:00 +00:00
okx-code
50626e1e2c Merge pull request #310 from MrJeremyFisher/mc/bastion-1.20
Bastion 1.20
2024-02-22 16:18:20 +00:00
Alexander
c19b8fceb6 Improve time formatting in snitch logs
This switches the how timestamps are rendered in snitch logs from "2011-12-03T10:15:30" to "Tue, 3 Jun 2008 11:05:30 GMT". It retains the old format for chat outputs for compaction and mod-parsing reasons.
2024-02-22 16:03:54 +00:00
MrJeremyFisher
10543b0450 1.20.4 2024-02-22 10:47:07 -05:00
MrJeremyFisher
457a080a5a 1.20.4 2024-02-22 10:40:25 -05:00
MrJeremyFisher
56d8036799 1.20.4 2024-02-22 10:19:34 -05:00
RedDevel2
f929bcce63 Merge pull request #273 from CivMC/transport
Add BetterRails, FasterHorses, CopperRail, and miscellaneous things
2024-02-22 15:12:04 +01:00
RedDevel2
0eceee6ab3 Merge pull request #275 from CivMC/jalist-lore-lag
Optimise snitch GUI
2024-02-22 13:35:41 +01:00
okx-code
c29be1d578 Update FactoryMod to 1.20 2024-02-22 02:57:52 +00:00
AngrySoundTech
bb6c37647e Merge branch 'main' into finale 2024-02-21 21:57:08 -05:00
okx-code
c8cb717c88 Merge branch 'factorymod' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-22 02:52:33 +00:00