Merge remote-tracking branch 'origin/main'

Browse Source

...

This commit is contained in:

IonutParau

2026-04-18 19:49:25 +02:00

parent df86086d10 07c8dc914d

commit dc16cebc25

11 changed files with 140 additions and 24 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

BIN

src/main/resources/assets/neocomputers/textures/gui/borders.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 220 B

BIN

src/main/resources/assets/neocomputers/textures/gui/combustgui.png Normal file

Binary file not shown.

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