mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 17:28:14 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,983 Commits 4 Branches 160 Tags 2.3 GiB
34e74834fd
Commit Graph

12983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
34e74834fd Arc furnace recipe fix 2021-11-09 12:49:25 -05:00
Anuken
73f3fe31da Aegis core 2021-11-09 10:41:42 -05:00
Anuken
1f98383535 EEEEEEEEEEEEEENERGYYYYYYYYYY 2021-11-08 22:21:04 -05:00
Anuken
5f3b3ea559 H 2021-11-08 16:11:55 -05:00
Anuken
8964caf2aa Conduit bridge fixes 2021-11-08 16:09:43 -05:00
Anuken
dffe90acff Directional liquid bridge 2021-11-08 12:06:55 -05:00
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
ed302d978c sprites 2021-11-05 19:50:47 -04:00
Anuken
059dc4b3bc Directional duct unloader 2021-11-05 19:45:27 -04:00
Anuken
52a88e7301 removed unused sprites 2021-11-05 16:41: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
c43ca32b7d cleanup 2021-11-04 19:33:38 -04:00
Anuken
3a70a26b93 Fixed 'spark' name conflict 2021-11-04 16:20:39 -04:00
Anuken
0effae1cd7 sprites 2021-11-04 15:42:25 -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
Matthew Peng
7884bbd299
stack conveyor looks weird on payload conveyors (#6295) 2021-11-03 13:37:02 -04:00
Matthew Peng
996193ea69
payloadRotation field (#6294) 2021-11-03 13:34:42 -04:00
Matthew Peng
3574b982ab
misspelling (#6291) 2021-11-02 22:03:47 -04:00
Matthew Peng
a438be7fcd
when and why was this hardcoded (#6289) 2021-11-02 20:22:07 -04:00
Anuken
38f7d2dcd0 tungsten 2021-11-02 14:49:05 -04:00
Anuken
00f03d793f Bugfixes 2021-11-02 12:52:59 -04:00
Anuken
18f28ef224 Full BuildTower impl 2021-11-02 11:47:35 -04:00
Valeriy
921c113375
Moving to v7 (#6285) 2021-11-02 11:27:14 -04:00
Valeriy
a7cd8c8ef3
Removing to v7 (#6284) 2021-11-02 11:27:09 -04:00
Darkness#3729
77044db39f
Remove v6 servers from v7 serverlist (#6286) 2021-11-02 11:26:57 -04:00
Anuken
bd30fee404 I guess people need to be yelled at for bad schematics 2021-11-02 10:39:22 -04:00
Anuken
00293d022c progress 2021-11-02 10:39:05 -04:00
Anuken
b418afed63 Added WorldLabel entity for better server-side labels 2021-11-02 10:03:44 -04:00
Anuken
99d30b6351 Fixed #6287 2021-11-02 09:04:37 -04:00
Anuken
cffd355045 BuildTurret save queue 2021-11-02 00:37:14 -04:00
Anuken
c4dc7e91f3 Merge remote-tracking branch 'origin/master' 2021-11-02 00:24:33 -04:00
Anuken
48b9bbc317 Less thruster rotation 2021-11-02 00:24:28 -04:00
Anuken
f108791379 BuildTurret AI, efficiency 2021-11-02 00:23:32 -04:00
Anuken
6fb2b3e920 WIP build tower 2021-11-02 00:13:25 -04:00
Anuken
00bea730e0 Cleanup 2021-11-01 21:18:00 -04:00
hortiSquash
134ef9e00e
hortiloaders hotfix randomness (#6283) 
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
 2021-11-01 17:34:40 -04:00
Anuken
f5c09845ae Fixed #6282 2021-11-01 15:29:07 -04:00
Anuken
a2d7f21518 block visibility tweaks 2021-11-01 15:26:30 -04:00
Anuken
72e3461745 indent 2021-11-01 15:15:13 -04:00
Anuken
8cabae1d46 Display infinity symbol for "unlimited" unit cap 2021-11-01 12:27:00 -04:00
Anuken
fbc140e99d sprites 2021-11-01 12:23:44 -04:00
Anuken
5e249e50dd Beam tower 2021-11-01 11:46:32 -04:00
Anuken
779bab0344 Merge remote-tracking branch 'origin/master' 2021-11-01 09:41:39 -04:00