Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update

Browse Source
This commit is contained in:
ApsZoldat
2023-11-28 22:08:33 +03:00
parent 02a53daa58 6543c41bde
commit 557f2d4447
69 changed files with 440 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+2 -4
View File
@@ -1081,7 +1081,7 @@ setting.backgroundpause.name = Pause In Background
setting.buildautopause.name = Auto-Pause Building
setting.doubletapmine.name = Double-Tap to Mine
setting.commandmodehold.name = Hold For Command Mode
setting.distinctcontrolgroups.name = Limit One Control Group Per Unit
setting.distinctcontrolgroups.name = Limit One Control Group Per Unit
setting.modcrashdisable.name = Disable Mods On Startup Crash
setting.animatedwater.name = Animated Surfaces
setting.animatedshields.name = Animated Shields
@@ -1785,7 +1785,6 @@ block.disperse.name = Disperse
block.afflict.name = Afflict
block.lustre.name = Lustre
block.scathe.name = Scathe
block.fabricator.name = Fabricator
block.tank-refabricator.name = Tank Refabricator
block.mech-refabricator.name = Mech Refabricator
block.ship-refabricator.name = Ship Refabricator
@@ -2111,7 +2110,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
#Erekir
block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
@@ -2149,7 +2147,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
block.reinforced-junction.description = Acts as a bridge between two crossing conduits.
block.reinforced-liquid-tank.description = Stores a large amount of fluids.
block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2350,6 +2347,7 @@ graphicstype.poly = Fill a regular polygon.
graphicstype.linepoly = Draw a regular polygon outline.
graphicstype.triangle = Fill a triangle.
graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
graphicstype.print = Draws text from the print buffer.\nOnly ASCII characters are allowed.\nClears the print buffer.
lenum.always = Always true.
lenum.idiv = Integer division.