Merge remote-tracking branch 'upstream/develop' into data-packs

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
2025-06-02 09:52:05 +01:00
81 changed files with 5996 additions and 2605 deletions

View File

@@ -247,7 +247,7 @@
<!-- matrix logo -->
<file>scalable/matrix.svg</file>
<!-- discord logo icon thing. from discord. traced from bitmap -->
<file>scalable/discord.svg</file>
@@ -279,7 +279,7 @@
<file>scalable/instances/fox.svg</file>
<file>scalable/instances/bee.svg</file>
<!-- instance icons -->
<file>32x32/instances/chicken_legacy.png</file>
<file>128x128/instances/chicken_legacy.png</file>
@@ -347,6 +347,7 @@
<file>scalable/export.svg</file>
<file>scalable/launch.svg</file>
<file>scalable/server.svg</file>
<file>scalable/appearance.svg</file>
<file>scalable/instances/quiltmc.svg</file> <!-- CC0 QuiltMC -->
<file>scalable/instances/fabricmc.svg</file> <!-- CC0 unascribed, https://github.com/FabricMC/community/blob/main/media/unascribed/README.md -->

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 154 KiB