13 Commits

Author	SHA1	Message	Date
Patrick 'Quezler' Mounier	a1d4804fae	Merge branch '6.0' into crater ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites2.png # core/assets/sprites/sprites4.png # core/assets/sprites/sprites6.png # core/src/mindustry/ui/fragments/PlayerListFragment.java	2020-04-16 17:13:18 +02:00
Anuken	256f805754	Payload fixes	2020-04-16 09:55:57 -04:00
Patrick 'Quezler' Mounier	5c28985ee6	Merge branch '6.0' into crater ... # Conflicts: # core/assets/icons/icons.properties # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/content/Blocks.java # core/src/mindustry/ui/fragments/PlayerListFragment.java # core/src/mindustry/world/BlockStorage.java	2020-04-16 12:39:52 +02:00
Anuken	0eaf9bc9c6	Various prototypes	2020-04-15 12:44:53 -04:00
Anuken	2af12a632a	Added basic multi-unit factories	2020-04-13 16:56:33 -04:00
Anuken	85e4270536	New water textures	2020-04-04 00:31:29 -04:00
Anuken	9081f3ff03	Fixed antialiasing	2020-03-30 12:00:08 -04:00
Anuken	0573160b2f	Added sorter cross (#1566)	2020-03-26 17:39:23 -04:00
Anuken	60d28fb01b	Bugfixes	2020-03-06 16:07:07 -05:00
Anuken	2afb175560	Generation tweaks	2020-02-22 12:05:31 -05:00
Anuken	baa0eb1149	Added cliffs as separate block	2020-02-21 23:45:25 -05:00
Anuken	e215772f30	Added backwards compatibility for legacy saves	2020-02-17 11:13:46 -05:00
Anuken	d45d7f21b6	Procedural scorch marks / Bugfixes	2020-02-09 12:07:36 -05:00