Anuken 1a9d701d32 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ...

# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java

2018-04-21 18:47:43 -04:00

..

backgrounds

Main menu rework [currently incomplete]

2018-03-16 17:00:11 -04:00

blocks

Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0

2018-04-21 18:47:43 -04:00

effects

Static effects / Better shell ejections / Implemented new cannon turret

2018-04-04 21:13:49 -04:00

items

Implemented silicon production / Centrifuge / Retexturing

2018-03-30 23:25:39 -04:00

mechs

Progress on implementing unit teams

2018-03-15 00:19:05 -04:00

shapes

New resources, blocks, core no longer accepts fuel materials

2018-02-22 20:12:20 -05:00

ui

Ammo things added

2018-04-01 21:07:52 -04:00

units

Added many new block types, changed land unit AI, bugfixes

2018-03-26 20:26:36 -04:00

weapons

Fixed startup crash, implemented basic player animations

2018-03-14 23:03:27 -04:00

pack.json

Added in-game changelogs

2018-03-09 17:11:01 -05:00