Anuken b1f32d241b Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 ...

# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/blocks/power/ImpactReactor.java
#	gradle.properties

2020-04-11 10:37:52 -04:00

..

ContentParser.java

Bugfixes

2020-04-07 14:08:42 -04:00

Mod.java

it is done

2019-12-25 01:39:38 -05:00

ModListing.java

Added mod listing data class

2020-01-05 00:08:48 -05:00

ModLoadingSound.java

Fixed mock audio package

2020-02-15 12:41:57 -05:00

Mods.java

Slightly improved mod dialog

2020-04-10 11:49:22 -04:00

Plugin.java

Cleanup

2020-03-01 15:41:10 -05:00

Scripts.java

let scripts require from the same mod (#1698)

2020-03-26 18:30:34 -04:00