Merge remote-tracking branch 'origin/mech-rework' into mech-rework

Browse Source

# Conflicts:
#	core/src/mindustry/entities/Weapons.java
#	gradle.properties

...

This commit is contained in:

Anuken

2020-01-19 11:11:10 -05:00

parent c0844304a6 432a40c656

commit 4f144c8f3d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available