Merge branch 'master' of https://github.com/Anuken/Mindustry into tileable-logic-displays

Browse Source

# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/logicids.dat

...

This commit is contained in:

Anuken

2025-04-14 22:50:47 -04:00

parent 022b21f710 666c68edb1

commit 1a00264902

494 changed files with 17743 additions and 9826 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

core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-light.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-pod.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/campaign/advanced-launch-pad.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/campaign/landing-pad.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/basalt-vent1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/basalt-vent2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/stone-vent1.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/blocks/environment/stone-vent2.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/effects/select-arrow-small.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/items/liquid-cryofluid.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 525 B After Width:  |  Height:  |  Size: 398 B

core/assets-raw/sprites/items/liquid-oil.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 508 B After Width:  |  Height:  |  Size: 335 B

core/assets-raw/sprites/items/liquid-slag.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 483 B After Width:  |  Height:  |  Size: 378 B

core/assets-raw/sprites/ui/sectors/sector-aegis.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-atlas.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-atolls.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-basin.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-biomassFacility.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-caldera-erekir.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-coastline.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-craters.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-crevice.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-crossroads.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-cruxscape.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-desolateRift.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-extractionOutpost.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-facility32m.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-frontier.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-frozenForest.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-fungalPass.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-geothermalStronghold.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-groundZero.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-impact0078.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-infestedCanyons.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-intersect.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-karst.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-lake.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-marsh.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-mycelialBastion.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-navalFortress.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-nuclearComplex.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-onset.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-origin.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-overgrowth.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-peaks.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-planetaryTerminal.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-ravine.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-ruinousShores.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-saltFlats.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-seaPort.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-siege.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-split.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-stainedMountains.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-stronghold.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-taintedWoods.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-tarFields.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-testingGrounds.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-weatheredChannels.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/ui/sectors/sector-windsweptIslands.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/scathe-missile-phase-cell.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/scathe-missile-phase.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/scathe-missile-surge-cell.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/scathe-missile-surge-split-cell.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/scathe-missile-surge-split.png

BIN

Binary file not shown.

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

core/assets-raw/sprites/units/weapons/scathe-missile-surge.png

BIN

Binary file not shown.

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