merge upstream

Browse Source

...

This commit is contained in:

Fireblade

2026-07-05 19:48:38 -04:00

parent 878198d6f1

commit 3f51fcb01f

85 changed files with 2097 additions and 914 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Minecraft.Client/Common/res/1_2_2/mob/char17.png → Minecraft.Client/Common/res/1_2_2/mob/DevAlex.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

Minecraft.Client/Common/res/1_2_2/mob/char8.png → Minecraft.Client/Common/res/1_2_2/mob/DevSteve.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 16 KiB

Minecraft.Client/Common/res/1_2_2/mob/alex.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

Minecraft.Client/Common/res/1_2_2/mob/char13.png → Minecraft.Client/Common/res/1_2_2/mob/alex1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 2.1 KiB

Minecraft.Client/Common/res/1_2_2/mob/char10.png → Minecraft.Client/Common/res/1_2_2/mob/alex2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 17 KiB

Minecraft.Client/Common/res/1_2_2/mob/char15.png → Minecraft.Client/Common/res/1_2_2/mob/alex3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

Minecraft.Client/Common/res/1_2_2/mob/char16.png → Minecraft.Client/Common/res/1_2_2/mob/alex4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 1.9 KiB

Minecraft.Client/Common/res/1_2_2/mob/char12.png → Minecraft.Client/Common/res/1_2_2/mob/alex5.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 2.1 KiB

Minecraft.Client/Common/res/1_2_2/mob/char14.png → Minecraft.Client/Common/res/1_2_2/mob/alex6.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 17 KiB

Minecraft.Client/Common/res/1_2_2/mob/char11.png → Minecraft.Client/Common/res/1_2_2/mob/alex7.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.4 KiB After Width:  |  Height:  |  Size: 2.4 KiB

Minecraft.Client/Common/res/1_2_2/mob/char.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.3 KiB

Minecraft.Client/Common/res/1_2_2/mob/char1.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.4 KiB After Width:  |  Height:  |  Size: 1.7 KiB

Minecraft.Client/Common/res/1_2_2/mob/char2.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 4.2 KiB

Minecraft.Client/Common/res/1_2_2/mob/char3.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 4.1 KiB

Minecraft.Client/Common/res/1_2_2/mob/char4.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.3 KiB After Width:  |  Height:  |  Size: 4.5 KiB

Minecraft.Client/Common/res/1_2_2/mob/char5.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 4.2 KiB

Minecraft.Client/Common/res/1_2_2/mob/char6.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 4.4 KiB

Minecraft.Client/Common/res/1_2_2/mob/char7.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 4.9 KiB

Minecraft.Client/Common/res/1_2_2/mob/char9.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.6 KiB