Christian Bergschneider 28132e0f13

resolve merge conflicts

2025-06-05 10:08:58 +02:00

..

allay

Merge branch 'master' into dev/7.0-2

2025-06-03 22:38:32 -06:00

bukkit

Merge branch 'master' into dev/7.0-2

2025-06-03 22:38:32 -06:00

cli

WIP Seismic Integration

2025-03-01 21:32:39 -07:00

fabric

Dev/1.21.5 (#495)

2025-06-03 22:20:23 -06:00

forge

WIP Seismic Integration

2025-03-01 21:32:39 -07:00

merged

build: prepare for merging

2024-09-18 12:59:30 +08:00

minestom

resolve merge conflicts

2025-06-05 10:08:58 +02:00

mixin-common

fix up

2025-06-03 22:52:26 -06:00

mixin-lifecycle

Merge branch 'master' into dev/7.0-2

2025-06-03 22:38:32 -06:00

quilt

working 1.20.6

2024-09-17 16:34:30 -06:00

sponge

Change Java whitespace handling in .editorconfig (#425)

2023-11-13 00:57:01 +00:00

LICENSE

finalize licensing changes

2021-11-21 21:22:34 -07:00