Anuken 39939f8a51 Merge https://github.com/joshuaptfan/Mindustry ...

# Conflicts:
#	core/assets/bundles/bundle.properties
#	core/src/io/anuke/mindustry/content/Blocks.java
#	core/src/io/anuke/mindustry/input/Binding.java

2019-11-18 19:40:45 -05:00

..

Blocks.java

Merge https://github.com/joshuaptfan/Mindustry

2019-11-18 19:40:45 -05:00

Bullets.java

Better organization

2019-10-21 21:22:35 -04:00

Fx.java

Lighting improvements

2019-11-10 16:18:47 -05:00

Items.java

Better organization

2019-10-21 21:22:35 -04:00

Liquids.java

Added armored conduit / Lighting improvements / Moved liquid package

2019-11-17 13:51:36 -05:00

Loadouts.java

Replaced 'loadout' class with schematics / Small sound tweaks

2019-11-03 22:15:05 -05:00

Mechs.java

Bugfixes

2019-11-05 15:32:13 -05:00

StatusEffects.java

Better organization

2019-10-21 21:22:35 -04:00

TechTree.java

Might as well add a tech tree entry

2019-11-14 21:36:58 +01:00

TypeIDs.java

Better organization

2019-10-21 21:22:35 -04:00

UnitTypes.java

Bugfixes

2019-10-22 20:17:43 -04:00

Zones.java

Deduplicate requirements assignment for Tar Fields (#1065)

2019-11-15 20:02:27 -05:00