Anuken
|
ce0e26f008
|
New liquid tanks/routers/contaienrs
|
2021-11-08 09:47:00 -05:00 |
|
Anuken
|
d72de24942
|
WIP liquid blocks
|
2021-11-08 08:56:12 -05:00 |
|
Anuken
|
07d9feeb09
|
WIP reinforced conduits
|
2021-11-07 12:56:58 -05:00 |
|
Anuken
|
09a934385e
|
"stuff"
|
2021-11-06 22:21:46 -04:00 |
|
Anuken
|
da49328412
|
Stack router + Consistent item source + Item void flow
|
2021-11-06 16:31:42 -04:00 |
|
Anuken
|
059dc4b3bc
|
Directional duct unloader
|
2021-11-05 19:45:27 -04:00 |
|
Anuken
|
6b3dfa6036
|
Carbide, surge conveyors
|
2021-11-05 16:41:08 -04:00 |
|
Anuken
|
57ef7c823e
|
WIP carbide
|
2021-11-05 08:47:05 -04:00 |
|
Anuken
|
5e534822b8
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts:
core/src/mindustry/type/UnitType.java
gradle.properties
|
2021-11-04 19:39:16 -04:00 |
|
Anuken
|
3a70a26b93
|
Fixed 'spark' name conflict
|
2021-11-04 16:20:39 -04:00 |
|
Anuken
|
240ffe1ca3
|
impact drill progress
|
2021-11-04 15:42:16 -04:00 |
|
Anuken
|
1a8a2c326e
|
impact drill wip
|
2021-11-04 11:41:12 -04:00 |
|
Anuken
|
38f7d2dcd0
|
tungsten
|
2021-11-02 14:49:05 -04:00 |
|
Anuken
|
18f28ef224
|
Full BuildTower impl
|
2021-11-02 11:47:35 -04:00 |
|
Anuken
|
00293d022c
|
progress
|
2021-11-02 10:39:05 -04:00 |
|
Anuken
|
6fb2b3e920
|
WIP build tower
|
2021-11-02 00:13:25 -04:00 |
|
Anuken
|
a2d7f21518
|
block visibility tweaks
|
2021-11-01 15:26:30 -04:00 |
|
Anuken
|
5e249e50dd
|
Beam tower
|
2021-11-01 11:46:32 -04:00 |
|
Matthew Peng
|
223fb8d6f5
|
Basic unitsorts for hjson (#6280)
* Create some basic unitSorts
* Set as defaults
* add to ContentParser
|
2021-10-31 21:30:35 -04:00 |
|
Anuken
|
abf13874fa
|
Default loadout for erekir
|
2021-10-30 14:39:07 -04:00 |
|
Anuken
|
0781a325c7
|
new core unit
|
2021-10-29 19:42:51 -04:00 |
|
Anuken
|
58544e6a21
|
Beam nodes
|
2021-10-28 22:18:07 -04:00 |
|
Anuken
|
cd909913ca
|
turbine condenser
|
2021-10-27 19:41:12 -04:00 |
|
Anuken
|
3ee7ee7e79
|
WIP pressure turbine
|
2021-10-27 18:25:58 -04:00 |
|
Anuken
|
705c85281c
|
the vent
|
2021-10-26 20:34:45 -04:00 |
|
Anuken
|
bc0b9e9eb3
|
plasma bore
|
2021-10-25 20:51:45 -04:00 |
|
Anuken
|
f347ab4714
|
WIP core bastion
|
2021-10-24 18:08:07 -04:00 |
|
Anuken
|
b19691078f
|
a
|
2021-10-24 15:14:43 -04:00 |
|
Anuken
|
aa6eb73de8
|
asd
|
2021-10-23 19:59:11 -04:00 |
|
Anuken
|
255f97dc56
|
breach
|
2021-10-23 17:32:58 -04:00 |
|
Anuken
|
693e420074
|
WIP breach turret
|
2021-10-23 14:35:37 -04:00 |
|
JrTRinny
|
f944d3d579
|
deselectable content selection UI (#6205)
|
2021-10-21 12:40:34 -04:00 |
|
Anuken
|
e9612ce9f0
|
Fixed #6203 / Minor block requirement changes
|
2021-10-21 12:11:54 -04:00 |
|
Anuken
|
699364580e
|
Added hiddenBuildItems rule
|
2021-10-20 16:25:24 -04:00 |
|
Anuken
|
d3343c0ae9
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts:
core/src/mindustry/content/Planets.java
tools/src/mindustry/tools/Generators.java
|
2021-10-20 10:45:51 -04:00 |
|
Anuken
|
9cb8c6d83d
|
Added liquid container to tech tree
|
2021-10-17 15:30:52 -04:00 |
|
Anuken
|
bd329f57d6
|
Add sensing of reconstructor config
|
2021-10-16 10:22:20 -04:00 |
|
Anuken
|
4a979058c2
|
Crawler shootOnDeath
|
2021-10-15 21:40:09 -04:00 |
|
Anuken
|
a04e8f87a9
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
|
2021-10-15 17:10:30 -04:00 |
|
Anuken
|
7a94af5e82
|
drag multiplier
|
2021-10-15 17:10:24 -04:00 |
|
Anuken
|
f683496440
|
cleanup
|
2021-10-15 17:04:34 -04:00 |
|
Anuken
|
56d291c963
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts:
core/src/mindustry/content/Blocks.java
core/src/mindustry/content/Planets.java
core/src/mindustry/io/SaveFileReader.java
core/src/mindustry/mod/ClassMap.java
core/src/mindustry/type/UnitType.java
core/src/mindustry/world/Block.java
|
2021-10-14 21:00:14 -04:00 |
|
Anuken
|
6b59c1cd83
|
More branch merging
|
2021-10-14 20:58:03 -04:00 |
|
Anuken
|
ef399d349c
|
# Conflicts:
# core/src/mindustry/content/Blocks.java
|
2021-10-14 19:17:50 -04:00 |
|
Anuken
|
082edbff6f
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts:
tools/src/mindustry/tools/Generators.java
|
2021-10-14 19:15:59 -04:00 |
|
Anuken
|
ad1c75d050
|
WIP branch merging
|
2021-10-14 19:15:03 -04:00 |
|
Anuken
|
5e8a3137c1
|
FX cast cleanup
|
2021-10-12 18:25:37 -04:00 |
|
Anuken
|
90d589939a
|
PR cleanup
|
2021-10-12 14:15:28 -04:00 |
|
Ilya246
|
21549d2518
|
Add new fx (#6136)
* Update Fx.java
* Update Fx.java
* Update Fx.java
* Update NetClient.java
* Update Fx.java
|
2021-10-12 14:14:51 -04:00 |
|
Anuken
|
44c47586a7
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
|
2021-10-12 12:36:20 -04:00 |
|