Anuken
|
b0503d9930
|
Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry
# Conflicts:
# core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
# gradle.properties
|
2019-09-29 17:03:28 -04:00 |
|
Anuken
|
429bb6ac13
|
plugins -> mods
|
2019-09-29 16:52:17 -04:00 |
|
Anuken
|
33416aadef
|
Parsing fixes / Moved annotations to Arc
|
2019-09-29 16:09:43 -04:00 |
|
Anuken
|
f17e46015a
|
JSON block, item loading
|
2019-09-29 15:21:50 -04:00 |
|
Anuken
|
9c175ac893
|
Type parsing work
|
2019-09-29 12:36:01 -04:00 |
|
Anuken
|
c6bc398950
|
Texture packing
|
2019-09-29 11:26:25 -04:00 |
|
Anuken
|
fe3f75f141
|
Starting work on json content parsing
|
2019-09-28 23:58:30 -04:00 |
|
Anuken
|
79554bf8e9
|
Mod import/export dialog, restarting
|
2019-09-28 23:26:55 -04:00 |
|
Anuken
|
4f9ed73a59
|
Added mod file tree, bundle loading
|
2019-09-28 21:13:44 -04:00 |
|
Anuken
|
b3666ed2a8
|
More mod setup
|
2019-09-27 22:20:16 -04:00 |
|
Anuken
|
70ab102d8c
|
Mods branch
|
2019-09-27 19:51:46 -04:00 |
|