Merge branch 'master' of https://github.com/Anuken/Mindustry into v9

# Conflicts:
#	core/src/mindustry/mod/DataImagePacker.java
#	gradle.properties
This commit is contained in:
Anuken
2026-08-04 21:46:46 -04:00
98 changed files with 2219 additions and 193 deletions
+1 -1
View File
@@ -2448,7 +2448,7 @@ block.world-processor.description = A processor for use in mapmaking. Cannot be
block.world-cell.description = A memory cell for use in mapmaking. Cannot be destroyed.
block.world-switch.description = A switch block for use in mapmaking. Cannot be destroyed. Can only be interacted by players on the same team.
block.shield-projector.description = An unbreakable shield projector for use in mapmaking.
block.large-shield-projector = An unbreakable shield projector for use in mapmaking.
block.large-shield-projector.description = An unbreakable shield projector for use in mapmaking.
block.graphite-press.description = Lisuje uhlí na grafit.
block.multi-press.description = Lisuje uhlí na grafit. Vyžaduje vodu jako chladivo.
block.silicon-smelter.description = Rafinuje křemík z písku a uhlí.