|
ad6e0bcd0f
|
Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
# Conflicts:
# android/src/mindustry/android/AndroidLauncher.java
# annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
# annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java
# build.gradle
# core/assets-raw/fontgen/config.json
# core/assets/bundles/bundle_cs.properties
# core/assets/bundles/bundle_it.properties
# core/assets/fonts/font.ttf
# core/assets/fonts/icon.ttf
# 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/UnitTypes.java
# core/src/mindustry/core/NetClient.java
# core/src/mindustry/core/NetServer.java
# core/src/mindustry/entities/bullet/BulletType.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/maps/filters/FilterOption.java
# core/src/mindustry/mod/Scripts.java
# core/src/mindustry/ui/Fonts.java
# core/src/mindustry/ui/dialogs/DeployDialog.java
# core/src/mindustry/ui/fragments/HudFragment.java
# core/src/mindustry/ui/fragments/MenuFragment.java
# core/src/mindustry/world/blocks/production/Cultivator.java
# core/src/mindustry/world/blocks/units/CommandCenter.java
# gradle.properties
# tools/src/mindustry/tools/FontGenerator.java
|
2020-01-27 15:51:02 -05:00 |
|
|
0d5dd146ef
|
Fixed #1451
|
2020-01-26 10:58:14 -05:00 |
|
|
a4e820f907
|
Added default ore flags for modded ores
|
2020-01-23 20:20:04 -05:00 |
|
|
26676d60e1
|
Added underflow gates
|
2020-01-20 18:54:25 -05:00 |
|
|
c0844304a6
|
Merge
|
2020-01-19 11:10:14 -05:00 |
|
|
eaa86023f9
|
Visual tweaks
|
2020-01-14 17:07:39 -05:00 |
|
|
35835cacd3
|
Fixed #1355
|
2020-01-11 12:47:54 -05:00 |
|
|
f7791a2bb2
|
Merge; internal changes
|
2020-01-10 11:30:42 -05:00 |
|
|
8f208920f7
|
Merged in liquid void
|
2020-01-08 11:04:12 -05:00 |
|
|
51bd74fcc1
|
Build time increase of basic blocks
|
2019-12-30 12:55:35 -05:00 |
|
|
f2e1d17ce9
|
Made junction harder to spam
|
2019-12-30 12:49:27 -05:00 |
|
|
730d30ef98
|
Added core schematic selection setting
|
2019-12-29 11:40:52 -05:00 |
|
|
186a2aaa45
|
Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
# 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/ai/BlockIndexer.java
# core/src/mindustry/core/World.java
# core/src/mindustry/entities/traits/Entity.java
# core/src/mindustry/entities/type/BaseEntity.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/world/blocks/defense/MendProjector.java
# core/src/mindustry/world/blocks/defense/OverdriveProjector.java
# core/src/mindustry/world/blocks/production/Drill.java
# gradle.properties
|
2019-12-27 01:41:06 -05:00 |
|
|
8ac0949ddf
|
Added default liquid turret liquid display
|
2019-12-25 14:38:43 -05:00 |
|
|
514d4817c8
|
it is done
|
2019-12-25 01:39:38 -05:00 |
|