Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,926 Commits 4 Branches 180 Tags
b83c76f728ac1eeb84cc0a5e33cb1ce13ece7e9f
Commit Graph
1248 Commits
Author SHA1 Message Date
Anuken b83c76f728 Improved liquid bridge throughput 2021-01-25 16:16:38 -05:00
Anuken f16990edcb Reconstructors: Accept unit dropped payload when disabled 2021-01-24 20:20:03 -05:00
FrederickDoeringGitHubfrederick_efd
 		13896589c2 Made disabling payload conveyors output from routers more reliable. (#4433) 
Prevented reconstructors from being roughted to when disabled.

Co-authored-by: frederick_efd <frederick.doering@nordson.com>
 2021-01-24 20:18:09 -05:00
Anuken f9c33453f2 Merge remote-tracking branch 'origin/master' 2021-01-23 10:33:10 -05:00
Anuken ad4650f408 Fixed #4420 / Fixed #4418 / Fixed #4416 2021-01-23 10:33:06 -05:00
Joshua FanandGitHub 8ca08a0f14 Make schematics build insulated blocks first, power nodes last (#4414) 
* Make schematics build insulated blocks first, power nodes last

* Add schematicPriority property to sort by

* Assign schematicPriority of 10 to power diode
 2021-01-23 10:28:26 -05:00
Anuken 027d080c55 Fixed #4403 2021-01-21 16:10:16 -05:00
Anuken bf8f059c25 Merge remote-tracking branch 'origin/master' 2021-01-21 14:45:51 -05:00
Anuken a73165353f Fixed #4402 2021-01-21 14:45:43 -05:00
genNAowlGitHubLeonwang4234
 		988791f18d Let Logic set (and read) Illuminator Color (#4374) 
* illluminator color logic control

* remove sense

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
 2021-01-21 09:30:36 -05:00
Patrick 'Quezler' MounierandGitHub 1fb608220f Make impact reactor warmup sensable as heat (#4399) 
* Make impact reactor warmup sensable as heat

* Update ImpactReactor.java
 2021-01-21 09:30:25 -05:00
Anuken 75d2b0fb69 Fixed #4393 / Fixed #4398 2021-01-21 08:48:36 -05:00
Anuken fa8d43bbc9 Misc cleanup 2021-01-19 19:55:21 -05:00
Anuken e3f388692f Misc cleanup & fixes 2021-01-19 15:13:41 -05:00
Anuken d06a74e7a2 Fixed #4376 2021-01-19 09:58:41 -05:00
Anuken 25b22b4f93 Duplicate IP prevention / Removed overflow inventories 2021-01-18 20:17:59 -05:00
Anuken 4aa2d9097f Merge remote-tracking branch 'origin/master' 2021-01-18 18:04:21 -05:00
Anuken 82f8e78ec8 Fixed various rounding errors in database 2021-01-18 18:04:16 -05:00
genNAowlGitHubLeonwang4234
 		18a382b07a Draw Conveyor Items under Blocks (#4372) 
* Draw Conveyor Items under Blocks

* Remove new layer in favor of subtraction

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
 2021-01-18 17:34:17 -05:00
Anuken 83a4f56679 Fixed #4368 2021-01-18 17:23:16 -05:00
Anuken 634d9d1a40 Fixed #4357 / Fixed #4349 / Fixed #4345 / Fixed #4343 2021-01-17 15:31:22 -05:00
Anuken f9adcfeed1 Ground units: Avoid stepping onto dangerous/deep floor 2021-01-17 09:21:11 -05:00
Anuken 02ef633529 Removed redundant parens 2021-01-15 17:10:38 -05:00
Patrick 'Quezler' MounierandGitHub f3b1ef02e3 Scale impact reactor warmup time with boost (#4317) 2021-01-15 17:09:39 -05:00
Anuken 2d3a9b605a Fixed #4337 / Fixed #4336 2021-01-15 17:09:12 -05:00
Anuken 718a40d742 More pattern matching 2021-01-15 16:04:26 -05:00
Anuken 650d47991e Formatting 2021-01-15 12:43:37 -05:00
Anuken 6ec76409ef Fixed #4335 2021-01-15 12:38:42 -05:00
Anuken 136c8cfcd2 Cleanup + Generic cross rendering 2021-01-15 11:34:33 -05:00
Anuken 593a7b060c Fixed #4334 2021-01-15 10:04:56 -05:00
Anuken 32070a37f7 Fixed #4325 2021-01-14 11:26:16 -05:00
MEEP of FaithandGitHub c6b60a2620 shootLength for other turrets that aren't PointDefenceTurrets (#4312) 2021-01-12 09:39:27 -05:00
Patrick 'Quezler' MounierandGitHub e83cfe6cab Display unit cap modifier for core blocks (#4163) 
* Display unit cap modifier for core blocks

* Move maxUnits stat from crafting to general

* Omit string formatting
 2021-01-11 14:30:58 -05:00
Anuken 912ea94828 Merge remote-tracking branch 'origin/master' 2021-01-11 10:14:28 -05:00
Anuken 6417073a82 Corrected parallax target check 2021-01-11 10:14:23 -05:00
BlueWolfandGitHub 994194452d fix a comment typo (#4307) 2021-01-11 10:13:28 -05:00
Anuken c716c16746 Fixed #4305 / Fixed #4309 2021-01-11 10:11:31 -05:00
Slava0135andGitHub 2927348a6c power info fixes (#4303) 
* power info fixes

* a better solution

* one little detail
 2021-01-10 15:46:29 -05:00
Anuken 0a5a301573 Save building enabled state 2021-01-09 22:13:41 -05:00
Anuken 21fd20ea5b Targetp support for allied targets 2021-01-09 10:31:44 -05:00
Anuken 2f83ba7f5c Logic battery control + Slight swarmer range buff 2021-01-08 12:22:32 -05:00
Anuken f231849a42 UnitCreateEvent / UnitDeployEvent split 2021-01-07 10:08:28 -05:00
Patrick 'Quezler' MounierandGitHub f4bf8fd998 Add boost bars to overdrive projectors (#4255) 
* Add boost bars to overdrive projectors

* Add bar.boost to bundle

* Intelij lied to me
 2021-01-05 15:32:43 -05:00
VozDuhGitHubAnuken
 		5516435619 Custom Launch Pad Pod Textures (#4203) 
* Custom Launch Pad Pod Textures

* Facepalm

* Fix

* Fix

* Fix

Co-authored-by: Anuken <arnukren@gmail.com>

* Fix

Anuke!

Co-authored-by: Anuken <arnukren@gmail.com>
 2021-01-05 15:17:18 -05:00
Patrick 'Quezler' MounierandGitHub fdf08ed51d Highlight all linked inventories on core selection (#4256) 
* Highlight all linked inventories on core selection

* Loop cores instead of storage blocks
 2021-01-05 10:43:36 -05:00
Anuken 69eb8faf67 Fixed #4261 / Basic rotation shine effect 2021-01-04 17:22:18 -05:00
Anuken 961331c832 Minor turret targeting fix 2021-01-04 11:06:11 -05:00
Anuken 5712190dab cleanup 2021-01-03 18:01:44 -05:00
Anuken af636f74fc Core incineration tweaks 2021-01-03 16:52:54 -05:00
Patrick 'Quezler' MounierandGitHub 0cfdacdd28 Allow for core incineration via rules (#4242) 2021-01-03 16:48:25 -05:00