Anuken
|
e6bd259c0e
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts:
core/assets/icons/icons.properties
core/assets/logicids.dat
core/src/mindustry/ui/dialogs/PlanetDialog.java
core/src/mindustry/world/blocks/distribution/ItemBridge.java
core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
core/src/mindustry/world/blocks/storage/StorageBlock.java
gradle.properties
|
2021-08-10 15:15:07 -04:00 |
|
Anuken
|
00a2c1aad0
|
Refactored fireball into FireBulletType
|
2021-08-08 13:37:55 -04:00 |
|
Anuken
|
00e3a59463
|
Land animation progress / IntelliJ android plugin hack
|
2021-07-27 16:26:13 -04:00 |
|
Anuken
|
269c48b65b
|
AmmoType refactoring
|
2021-07-27 12:42:50 -04:00 |
|
Anuken
|
7a1f332731
|
Ammo system redesign
|
2021-07-25 17:15:39 -04:00 |
|
Anuken
|
f98622fdc9
|
Class renaming
|
2021-07-23 13:18:08 -04:00 |
|
Anuken
|
bda461e480
|
Large constructor variant
|
2021-07-22 17:48:50 -04:00 |
|
Anuken
|
d30c32eddc
|
reorganization
|
2021-07-22 16:52:05 -04:00 |
|
Anuken
|
42497d8627
|
ClassMap regen
|
2021-07-04 09:55:12 -04:00 |
|
Anuken
|
ebf0c71db6
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts:
core/src/mindustry/mod/ClassMap.java
|
2021-07-04 09:52:57 -04:00 |
|
Anuken
|
bc7085826e
|
Re-generated ClassMap
|
2021-07-01 11:44:29 -04:00 |
|
Anuken
|
23ced8d006
|
aa
|
2021-06-17 11:10:39 -04:00 |
|
Anuken
|
347b38ba26
|
Added unit tests for Java, JavaScript and JSON mods
|
2021-06-12 20:59:28 -04:00 |
|
Anuken
|
28b235ef07
|
Partial 7.0 merge - API preview
|
2021-06-02 11:08:08 -04:00 |
|
Anuken
|
467402ef73
|
Various fixes
|
2021-02-19 19:20:04 -05:00 |
|
Anuken
|
a7188c4884
|
Content parser class discovery improvements
|
2021-02-18 13:11:20 -05:00 |
|