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 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/mod/ClassMap.java
This commit is contained in:
Anuken
2021-07-04 09:52:57 -04:00
parent 0d280ea77f 178cb12f85
commit ebf0c71db6
34 changed files with 168 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@@ -806,6 +806,7 @@ bullet.reload = [stat]{0}[lightgray]x fire rate
unit.blocks = blocks
unit.blockssquared = blocks²
unit.powersecond = power units/second
unit.tilessecond = tiles/second
unit.liquidsecond = liquid units/second
unit.itemssecond = items/second
unit.liquidunits = liquid units