Commit Graph

9226 Commits

Author SHA1 Message Date
okx-code
4d6532456e Merge branch 'main' into mc/1.20
# Conflicts:
#	plugins/civduties-paper/build.gradle.kts
#	settings.gradle.kts
2024-02-23 22:33:27 +00:00
okx-code
54e78eaa32 Merge pull request #313 from CivMC/hiddenore
Add HiddenOre
2024-02-23 22:31:43 +00:00
okx-code
20c4f9ffd6 Merge branch 'main' into hiddenore 2024-02-23 22:31:11 +00:00
okx-code
9c78b6ea44 Merge pull request #314 from CivMC/railswitch
Add RailSwitch
2024-02-23 22:30:52 +00:00
okx-code
7da5ceb84a Merge branch 'main' into railswitch 2024-02-23 22:30:47 +00:00
okx-code
4af5a80b37 Merge pull request #315 from CivMC/civduties
Add CivDuties
2024-02-23 22:30:33 +00:00
okx-code
631ed439a9 Merge branch 'main' into civduties 2024-02-23 22:30:25 +00:00
okx-code
e58cefb325 Merge pull request #316 from CivMC/essenceglue
Add EssenceGlue
2024-02-23 22:30:13 +00:00
okx-code
b94d180213 Merge branch 'main' into essenceglue 2024-02-23 22:30:07 +00:00
okx-code
84af614d62 Merge pull request #317 from CivMC/namecolors
Add NameColors
2024-02-23 22:29:52 +00:00
okx-code
bf743ad3b4 Merge branch 'main' into namecolors 2024-02-23 22:29:46 +00:00
okx-code
06a582281e move repo 2024-02-23 22:26:53 +00:00
okx-code
c8f280ba75 fix indentation 2024-02-23 22:26:13 +00:00
okx-code
28c98db2f9 fix indentation 2024-02-23 22:25:32 +00:00
AngrySoundTech
e3a4e5b87c Merge pull request #318 from CivMC/kirabukkitgateway
Add KiraBukkitGateway
2024-02-23 17:17:48 -05:00
okx-code
c25d16a950 Fix RealisticBiomes plugin name 2024-02-23 22:05:30 +00:00
okx-code
d3ca24267b Merge branch 'essenceglue' into mc/1.20 2024-02-23 22:03:47 +00:00
okx-code
d966ae9eda fix name 2024-02-23 21:58:50 +00:00
okx-code
124d8353d2 Merge pull request #321 from Protonull/instanceof-pattern-matching
Replace MoreClassUtils.castOrNull() with instanceof pattern matching
2024-02-23 21:55:50 +00:00
Alexander
0ce87475af Replace MoreClassUtils.castOrNull() with instanceof pattern matching 2024-02-23 21:53:22 +00:00
RedDevel2
e74edff7ee Merge pull request #242 from Protonull/better-snitch-log-times
Improve time formatting in snitch logs
2024-02-23 21:30:46 +01:00
okx-code
34a379aaf9 Merge branch 'mc/exilepearl-1.20' into mc/1.20 2024-02-23 01:45:22 +00:00
okx-code
83b755580a proxy method properly 2024-02-23 01:45:05 +00:00
okx-code
6d3b1931b4 Update KiraBukkitGateway to 1.20 2024-02-23 01:41:34 +00:00
okx-code
3c73af352f Update NameColors to 1.20 2024-02-23 01:38:26 +00:00
okx-code
b14cbc94e1 Update RailSwitch to 1.20 2024-02-23 01:37:54 +00:00
okx-code
ddcbbe6355 Update HiddenOre to 1.20 2024-02-23 01:35:45 +00:00
okx-code
a30374107f Update EssenceGlue to 1.20 2024-02-23 01:31:15 +00:00
okx-code
66090c288e Update CivDuties to 1.20 2024-02-23 01:30:19 +00:00
okx-code
35f93adc91 Merge branch 'railswitch' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:27:46 +00:00
okx-code
3668e891cb Merge branch 'namecolors' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:27:34 +00:00
okx-code
b5fe73cd67 Merge branch 'kirabukkitgateway' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:27:25 +00:00
okx-code
5f944df42a Merge branch 'hiddenore' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:27:14 +00:00
okx-code
f00c134024 Merge branch 'essenceglue' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:26:39 +00:00
okx-code
8f1f576526 Merge branch 'civduties' into mc/1.20 2024-02-23 01:26:19 +00:00
okx-code
98525ce97e Update CopperRail to 1.20 2024-02-23 01:25:14 +00:00
okx-code
5ea511f414 Merge branch 'main' into mc/1.20
# Conflicts:
#	settings.gradle.kts
2024-02-23 01:15:30 +00:00
okx-code
1b11360a45 Publish the remapped jar 2024-02-23 01:13:58 +00:00
okx-code
682764aeda Add KiraBukkitGateway 2024-02-22 23:32:33 +00:00
okx-code
a611bff9af Add NameColors 2024-02-22 22:30:54 +00:00
okx-code
312a04c802 Add EsssenceGlue 2024-02-22 22:21:05 +00:00
okx-code
bc516d79d9 Add CivDuties 2024-02-22 22:08:55 +00:00
okx-code
e9c60faf80 Add RailSwitch 2024-02-22 21:37:06 +00:00
okx-code
aa9f07e886 Add HiddenOre 2024-02-22 21:31:00 +00:00
okx-code
2cadb5d2a8 Merge pull request #310 from MrJeremyFisher/mc/bastion-1.20
Bastion 1.20
2024-02-22 16:18:20 +00:00
okx-code
ddaa5b2a24 Merge pull request #312 from MrJeremyFisher/mc/banstick-1.20
BanStick 1.20.4
2024-02-22 16:17:09 +00:00
Alexander
a7170f5d48 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
eba2002953 1.20.4 2024-02-22 10:47:07 -05:00
MrJeremyFisher
fa410ca382 1.20.4 2024-02-22 10:40:25 -05:00
MrJeremyFisher
15ac25b01b 1.20.4 2024-02-22 10:19:34 -05:00