Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,083 Commits 4 Branches 180 Tags
d7adacd932303691280500b79730440f88420d2a
Commit Graph
13083 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
AnukenandGitHub 51626b6233 spelling 2021-11-17 09:41:18 -05:00
hortiSquashGitHubcitrusMarmelade
 		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
AnukenandGitHub 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 PengandGitHub 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
RexandGitHub 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 PolyakovandGitHub 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
RexandGitHub 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
Anuken c87bc11ad2 Core: Acropolis 2021-11-10 09:38:18 -05:00
Anuken da87726176 Core: Citadel 2021-11-09 20:20:44 -05:00
MrDuck557GitHubLele567
 		1c4e6b77b4 DestroyBullet (#6311) 
* DestroyBullet

* one space

* review

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-09 18:10:28 -05:00
Anuken 501a65e9a3 reorganization 2021-11-09 12:57:14 -05:00
Anuken 34e74834fd Arc furnace recipe fix 2021-11-09 12:49:25 -05:00
LawrenceLin2333andGitHub 68f8668162 Fix the memory leak when light rendering is disabled (#6321) 2021-11-09 11:10:18 -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
Matthew PengandGitHub 51730556a5 Batteries can be overdrived. (#6320) 2021-11-08 21:43:00 -05:00
GoobrrandGitHub c2b5e4b82b Show internal names (#6317) 
* internal names

* enableConsole

* how did this get left out
 2021-11-08 19:25:17 -05:00
JrTRinnyandGitHub c96b723aaa more delectable selection pane (#6318) 2021-11-08 18:12:23 -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 af7c11c4b7 Merge remote-tracking branch 'origin/master' 2021-11-08 08:56:32 -05:00
Anuken 656bb34b68 Fixed #6314 2021-11-08 08:56:26 -05:00
Anuken d72de24942 WIP liquid blocks 2021-11-08 08:56:12 -05:00
Matthew PengandGitHub 1dd0f67daf recoil = recoilAmount twice (#6312) 2021-11-07 22:33:11 -05:00