562fa07755
Merge branch 'master' into crater
2020-02-10 12:09:14 +01:00
da5755b7c1
For consistancy ( #1517 )
...
Swap "liquids" with "liquid." Also proposing because the category for liquid blocks is "liquid" and not "liquids" when modding.
2020-02-06 14:46:33 -05:00
445126ea65
Rename Track to CraterConveyor
...
though it does not extend the conveyor class.
2020-01-28 11:41:20 +01:00
683211cb1f
Untangle conveyor entanglement
...
Made track a standalone block due to the influx of conveyor code changes, and if it were ever to return it would make sense to also include the conduits in one form or another, like a 🐍 class/trait/abstract/method/etc
2020-01-28 10:41:30 +01:00
9a289c83e6
Fuse with conveyor optimization
...
# Conflicts:
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-27 18:06:48 +01:00
0d5dd146ef
Fixed #1451
2020-01-26 10:58:14 -05:00
58a79d8631
Update to v103
...
# 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/content/Blocks.java
# core/src/mindustry/content/TechTree.java
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-24 20:25:03 +01: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
eaa86023f9
Visual tweaks
2020-01-14 17:07:39 -05:00
35835cacd3
Fixed #1355
2020-01-11 12:47:54 -05:00
ed765ad10a
Merge branch 'master' into crater
...
# 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
2020-01-10 12:02:07 +01:00
8f208920f7
Merged in liquid void
2020-01-08 11:04:12 -05:00
2948738e33
Refractor away overhead
2020-01-05 10:28:43 +01:00
d843f29e09
Make crater speed configurable
2020-01-03 12:19:33 +01:00
0ae6527584
Sacrifice hivemind to convert craters to drawings
...
Sad, yes, but crater units would never sync well over the net in its current state, so faking them unto conveyors is the only real option.
Forgive me future ai overlord <3
2020-01-02 21:29:19 +01:00
c3186b63ce
Rename compression to plastanium
...
Breaking change.
2020-01-01 13:43:14 +01:00
830f67e001
Merge branch 'master' into crater
2019-12-31 17:31:09 +01: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
326f75cbda
Merge branch 'master' into crater
2019-12-29 19:09:27 +01:00
730d30ef98
Added core schematic selection setting
2019-12-29 11:40:52 -05:00
e0cfbc7609
All hail the cuteness of this crater roomba critter
2019-12-27 20:45:27 +01: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
