Merge branch 'main' of https://gitea.codersquack.nl/NeoFlock/NeoComputers

Browse Source

# Conflicts:
#	src/main/kotlin/org/neoflock/neocomputers/gui/screen/CaseScreen.kt

...

This commit is contained in:

IonutParau

2026-04-21 20:53:45 +02:00

parent 7542052d1e f3ebc4f684

commit 35a659475a

7 changed files with 57 additions and 37 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/bar.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 598 B

BIN

src/main/resources/assets/neocomputers/textures/gui/bar_old.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 628 B

BIN

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

Binary file not shown.

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