mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 20:29:06 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,152 Commits 4 Branches 160 Tags 2.3 GiB
7d6428fcf2
Commit Graph

13152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
4fcd873f65 Gallium 2021-11-20 17:59:24 -05:00
Anuken
77fb5a9a24 conflict 2021-11-20 15:07:07 -05:00
Anuken
d87ee0e942 conflict 2021-11-20 15:06:51 -05:00
Anuken
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Lin
aeaba6e111
Update bundle_zh_CN.properties (#6300) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2021-11-20 15:05:55 -05:00
Prosta4okua
0e8a677ecc
Update bundle_uk_UA.properties (#6290) 
* Update bundle_uk_UA.properties

Атака -> Наступ

* Update bundle_uk_UA.properties

конструкції->споруди

* Update bundle_uk_UA.properties

* Приголомшлює -> електризує

* Small fixes

→ -> "->"
елемент -> предмет
Оксино -> Оксиноя, better spelling

* Update bundle_uk_UA.properties
 2021-11-20 15:05:46 -05:00
Anuken
b4cd21752c Merge remote-tracking branch 'origin/master' 2021-11-20 10:58:12 -05:00
Anuken
d1a5198efc Fixed #6351 2021-11-20 10:58:07 -05:00
Anuken
f4c54b20f7 h 2021-11-20 10:56:21 -05:00
Anuken
7690f12682 What the hell is going on with jitpack 2021-11-20 10:32:28 -05:00
Anuken
a39d156d12 Optional beam drill liquid input / Fixed graphite color 2021-11-20 10:15:55 -05:00
Anuken
0d197fa00c I have spent far too much time redrawing this stupid sprite 2021-11-19 21:56:02 -05:00
Anuken
7d849b7ea0 I have spent far too much time redrawing this stupid sprite 2021-11-19 20:32:09 -05:00
devlaq
731fd2900a
Update servers_v6.json (#6348) 2021-11-18 18:28:52 -05:00
Anuken
f3ace3a526 low effort large plasma bore 2021-11-18 16:22:53 -05:00
Anuken
7a73b3bc7a arc 2021-11-18 15:34:07 -05:00
Anuken
275f6eb32f Overflow duct 2021-11-18 14:47:33 -05:00
Anuken
6026beb397 Emanate impl / Rotation lock 2021-11-17 18:02:19 -05:00
Anuken
4d13b8df7a Surge crucible effects 2021-11-17 13:37:51 -05:00
Anuken
4567ee9a13 Test fixes / Building module presence saving 2021-11-17 10:58:36 -05:00
Anuken
29f8ebddb9 Sprite tweaks 2021-11-17 09:42:33 -05:00
Anuken
51626b6233
spelling 2021-11-17 09:41:18 -05:00
hortiSquash
fd1678dbc9
Unloading into plast belts - bug fix (#6347) 
* 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

* unloader - fix cant load

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
 2021-11-17 09:35:36 -05:00
Anuken
f87cd9c643
Do not make formatting PRs. 2021-11-16 23:36:13 -05:00
Anuken
7798bb6702 Fixed packing issues 2021-11-16 23:10:49 -05:00
Anuken
82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken
25f44f86f8 Making DrawBlock more generic 2021-11-16 19:55:13 -05:00
Anuken
8d05b878d7 oxidation chamber implementation 2021-11-16 14:54:23 -05:00
Anuken
67f8cffca0 Liquid total bugfixes 2021-11-16 11:02:42 -05:00
Anuken
eefcce5cf1 Better multi-liquid support / Reinforced pump progress 2021-11-16 10:25:59 -05:00
Anuken
bf1909295e Electrolyzer finalization 2021-11-15 15:17:20 -05:00
Anuken
9663d1153f WIP electrolyzer + liquid fixes 2021-11-15 14:31:52 -05:00
Matthew Peng
4a7774fe5a
Dynamic resupply check (#6338) 2021-11-15 09:27:22 -05:00
Anuken
7103de8454 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-15 08:24:55 -05:00
Anuken
d23813f328 Merge remote-tracking branch 'origin/master' 2021-11-15 08:24:47 -05:00
Anuken
f586fd285c Fixed #6341 2021-11-15 08:24:39 -05:00
Anuken
b99e18478f tweaks 2021-11-15 08:24:16 -05:00
Anuken
7acf53c509 multi-liquids consumers 2021-11-14 23:30:58 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Anuken
70cf55f314 More slag 2021-11-14 10:12:47 -05:00
Rex
a786e93329
Update servers_v6.json (#6332) 2021-11-13 18:55:28 -05:00
Anuken
3a6878ef60 T2 reinforced core unit 2021-11-13 10:40:55 -05:00
Yuri Polyakov
df3901fda2
why (#6330) 
The server is on version v6 is in the list of servers v7.
 2021-11-12 23:29:15 -05:00
Anuken
2f0daa6fc4 Core cleanup / Turret draw class 2021-11-12 20:09:27 -05:00
Anuken
757977b7b9 Misc tweaks 2021-11-12 13:47:22 -05:00
Anuken
8da4e72e77 carbide crucible implementation 2021-11-12 11:07:15 -05:00
Anuken
51301a50cc HeatCrafter 2021-11-11 20:39:43 -05:00
Anuken
a1107eae13 WIP heat reactor system 2021-11-11 18:52:51 -05:00
Anuken
f3b2e4498d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-11-10 14:36:45 -05:00
Rex
bb443e359f
Update servers_v6.json (#6322) 
* Update servers_v6.json

* Update servers_v6.json

* Update servers_v6.json
 2021-11-10 13:37:38 -05:00