11 commits

Author	SHA1	Message	Date
Anuken	c225291790	a r c	2020-05-21 16:53:30 -04:00
Anuken	14e79b50d2	Removed legacy IO code	2020-05-21 16:50:49 -04:00
Anuken	530ff9761b	Fixed core selection in preset sectors	2020-05-18 15:38:56 -04:00
Anuken	becc23ca42	Cleaner formatting	2020-05-03 21:18:25 -04:00
Anuken	a2706a80b1	Merged with master	2020-02-09 12:27:44 -05:00
Patrick 'Quezler' Mounier	e06d8eabec	[formatting] add newline to file(s) (#1508) ... * Trail appropriate files with a new line * For some ironic reason it ignored itself Probably because it wasn’t tracked/commited yet. * Rename newlines to server executable naming pattern	2020-02-05 18:36:56 -05:00
Anuken	be50997f94	Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl ... # Conflicts: # 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/Vars.java # core/src/mindustry/entities/traits/SaveTrait.java # core/src/mindustry/maps/generators/MapGenerator.java # core/src/mindustry/ui/dialogs/DeployDialog.java # core/src/mindustry/world/blocks/Floor.java # desktop/src/mindustry/desktop/DesktopLauncher.java # gradle.properties	2020-02-04 12:25:18 -05:00
Anuken	a4e820f907	Added default ore flags for modded ores	2020-01-23 20:20:04 -05:00
Anuken	1e7c83f0c9	Partial merge	2019-12-25 13:22:36 -05:00
Anuken	c0f14185a8	More fixes	2019-12-25 12:35:23 -05:00
Anuken	514d4817c8	it is done	2019-12-25 01:39:38 -05:00

Renamed from core/src/io/anuke/mindustry/maps/Maps.java (Browse further)