Anuken 5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ...

 Conflicts:

	core/src/mindustry/type/UnitType.java

	gradle.properties

2021-11-04 19:39:16 -04:00

..

ClassMap.java

drag multiplier

2021-10-15 17:10:24 -04:00

ContentParser.java

Basic unitsorts for hjson (#6280)

2021-10-31 21:30:35 -04:00

Mod.java

Make Mod an abstract class (#5155)

2021-04-29 19:51:46 -04:00

ModClassLoader.java

Fixed #5498

2021-06-28 09:25:38 -04:00

ModListing.java

Allow mod re-import / Save mod repo on import

2021-02-04 19:30:52 -05:00

Mods.java

Content parser listener

2021-09-15 10:49:22 -04:00

Plugin.java

Cleanup

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

Scripts.java

Moved Scripts loaders to Vars.tree.loadSound/Music

2021-09-15 11:24:39 -04:00