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

Merge branch 'master' into crater

Browse Source 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java
This commit is contained in:
Patrick 'Quezler' Mounier
2020-02-05 10:26:34 +01:00
parent 55932d03c9 67106abb9b
commit 05ccdfd51b
56 changed files with 1115 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,7 @@ stat.built = Buildings Built:[accent] {0}
stat.destroyed = Buildings Destroyed:[accent] {0}
stat.deconstructed = Buildings Deconstructed:[accent] {0}
stat.delivered = Resources Launched:
stat.playtime = Time Played:[accent] {0}
stat.rank = Final Rank: [accent]{0}
launcheditems = [accent]Launched Items