Merge branch 'crux-floor' of https://github.com/Anuken/MindustryPrivate

Browse Source

...

This commit is contained in:

Anuken

2025-07-21 02:43:02 -04:00

parent 895c4da2f6 0c15d1be86

commit c0a551a006

155 changed files with 1482 additions and 731 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

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay-white.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay0.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay10.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay11.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay12.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay13.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay14.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay15.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay16.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay17.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay18.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay19.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay2.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay20.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay21.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay22.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay23.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay24.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay25.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay26.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay27.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay28.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay29.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay3.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay30.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay31.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay32.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay33.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay34.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay35.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay36.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay37.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay38.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay39.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay4.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay40.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay41.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay42.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay43.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay44.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay45.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay46.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay47.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay48.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay49.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay5.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay50.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay51.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay52.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay53.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay54.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay55.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay56.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay57.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay58.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay59.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay6.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay60.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay61.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay62.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay63.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay7.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay8.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/character-overlay/character-overlay9.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/clear-editor.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/colored-floor-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/colored-floor.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/colored-wall-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/colored-wall.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/grate-detailed.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-1-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-10-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-11-autotile1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-11-autotile2.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-11-autotile3.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-11.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile1.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile2.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile3.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile4.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-12.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-2-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-3-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-4-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-5-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-6-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-7-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-2.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-3.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-4.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-5.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-6.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-7.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-8.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-9.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-8-autotile.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/environment/metal-tiles-8-mid-2.png Normal file

Binary file not shown.

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

Some files were not shown because too many files have changed in this diff Show More