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

Merge branch '6.0' into crater

Browse Source 
# Conflicts:
#	core/assets/icons/icons.properties
#	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/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java
This commit is contained in:
Patrick 'Quezler' Mounier
2020-04-16 12:39:52 +02:00
parent 424e58ff7d 8a01b87c99
commit 5c28985ee6
610 changed files with 27167 additions and 25697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fastlane/metadata/android/en-US/changelogs/104.5.txt Normal file
View File

@@ -0,0 +1,4 @@
- Updated feature suggestion link
- Updated translations
- Fixed modified player name persisting after server is exited
- Added solar power multiplier rule

4
fastlane/metadata/android/en-US/changelogs/29623.txt Normal file
View File

@@ -0,0 +1,4 @@
- Updated feature suggestion link
- Updated translations
- Fixed modified player name persisting after server is exited
- Added solar power multiplier rule