Merge branch 'master' into mcstat

This commit is contained in:
mc776 2024-08-13 07:28:42 -07:00 committed by GitHub
commit 2a6fa4c47f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 6 additions and 0 deletions

View file

@ -3853,6 +3853,12 @@ MCSTAT8 128 128
MCSTAT9 128 128
* MC20 0 0
A-VINE1A 256 64 ; dangling ends of the big vine textures
* W107_2 0 0
A-VINE2A 256 64
* W106_2 0 0
; These textures are only in FreeDM
#ifdef FREEDM