Merge branch 'master' into more-more-qol

Browse Source

...

This commit is contained in:

70000hp 2024-08-30 17:34:55 -04:00

parent b5f2bb3355 487503fe87

commit be84276f92

5 changed files with 9603 additions and 4652 deletions

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

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

10610

src/main/resources/assets/hbm/models/machines/lpw2.obj

File diff suppressed because it is too large Load Diff

3645

src/main/resources/assets/hbm/models/weapons/pepperbox.obj Normal file

File diff suppressed because it is too large Load Diff

BIN

src/main/resources/assets/hbm/textures/blocks/playground/deco_steel_kit.png

Binary file not shown.

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

BIN

src/main/resources/assets/hbm/textures/models/machines/lpw2.png

Binary file not shown.

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

BIN

src/main/resources/assets/hbm/textures/models/weapons/pepperbox.png Normal file

Binary file not shown.

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