onebeastchris 5162aeb9b3 Merge remote-tracking branch 'refs/remotes/upstream/master' into feature/1.21.4 ... # Conflicts: # gradle.properties		2024-12-03 23:14:05 +08:00
..
wrapper	Update to loom 1.7-SNAPSHOT, update gradle wrapper (#4820)	2024-07-06 20:47:49 +02:00
libs.versions.toml	Merge remote-tracking branch 'refs/remotes/upstream/master' into feature/1.21.4	2024-12-03 23:14:05 +08:00