Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,892 Commits 4 Branches 180 Tags
fa06d2c20b4c34decbcaf9d541730ab43672f498
Commit Graph

1655 Commits

Author SHA1 Message Date
buthed010203
fa06d2c20b Fix broken powernode Point2[] config (#6531) 
This was broken. I fixed it.
 2022-01-25 10:38:38 -05:00
Iloveidea
287dc35640 Update LiquidConverter.java (#6507) 2022-01-21 09:46:03 -05:00
Weathercold
4a05c9547a TextSetting (#6503) 
* tile

tile

* > Called right after load()

* TextSetting

* nvm I change the doc instead

* Fixes
 2022-01-18 22:26:24 -05:00
Matthew (or Maya) Peng
795edb2494 Tractor Beam Suction multiplies by timescale twice (#6489) 2022-01-13 15:28:29 -05:00
Matthew (or Maya) Peng
43e857e810 Fix ammo of one item transforming into another. (#6483) 
* Fix ammo transmutation

* Small fixes

* small fix 2

* a

* commit spam aeugh
 2022-01-11 09:29:25 -05:00
Matthew (or Maya) Peng
1d14fa78bf Make ItemEntry's item public (#6474) 2022-01-10 23:38:28 -05:00
Matthew (or Maya) Peng
9825d2f746 Incorrect reset (#6477) 2022-01-08 21:34:12 -05:00
Matthew (or Maya) Peng
339d87ad78 Check the status, not the bullet (#6434) 2021-12-13 21:44:54 -05:00
Matthew (or Maya) Peng
052b47fbe4 remove space from perSecond and perMinute (#6435) 2021-12-13 21:44:10 -05:00
Matthew (or Maya) Peng
8e89b24e5b unprivate countOre (#6410) 2021-12-08 00:02:52 -05:00
Anuken
feba9d677e Fixed #6389 2021-11-29 20:13:59 -05:00
router
4eca2b4b0b Make updateInUnits description actually readable (#6371) 2021-11-25 15:33:21 -05:00
Anuken
07696c7f92 Closes #6327 2021-11-25 11:33:44 -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
MrDuck557
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
Matthew Peng
51730556a5 Batteries can be overdrived. (#6320) 2021-11-08 21:43:00 -05:00
JrTRinny
c96b723aaa more delectable selection pane (#6318) 2021-11-08 18:12:23 -05:00
Matthew Peng
1dd0f67daf recoil = recoilAmount twice (#6312) 2021-11-07 22:33:11 -05:00
Anuken
5fe8ed88a6 Fixed #6305 2021-11-04 22:30:19 -04:00
Anuken
b553f5afc2 Merge remote-tracking branch 'origin/master' 2021-11-04 22:23:36 -04:00
Anuken
9e68b0a72b Fixed #6304 2021-11-04 19:34:28 -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
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
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
8cabae1d46 Display infinity symbol for "unlimited" unit cap 2021-11-01 12:27:00 -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
Zelaux
24810ddbf5 Block classes are now responsible for flipping of blocks in schematics. (#6254) 2021-10-31 09:35:16 -04:00
Anuken
f1d1f935fb Fixed #6264 2021-10-29 22:36:24 -04:00
Anuken
26045904f4 Fixed #6259 2021-10-29 11:29:38 -04:00
Anuken
fc900bec58 Merge remote-tracking branch 'origin/master' 2021-10-28 22:27:26 -04:00
Anuken
850a3cfb4e Fixed #6256 2021-10-28 22:27:22 -04:00
hortiSquash
10f2a7b59c hortiloader hotfix (#6248) 
Added an offset so they cycle through all buildings having the same load
 2021-10-28 10:01:05 -04:00
hortiSquash
59a480cb30 hortiloaders 1.0.3.0 bug fix (#6233) 
* hortiloaders 1.0.3.0 bug fix

it didnt unload from StackConveyors/Storage when they had the same loadfactor as the factory

* unloader fix, using fields
 2021-10-25 18:22:56 -04:00
Anuken
b6acf1af0a Comparator cleanup 2021-10-24 15:18:21 -04:00
hortiSquash
16f4e300a8 fixed the full factory priority bug (#6211) 2021-10-24 15:14:36 -04:00
Anuken
b18b4cdc90 Fixed #6222 2021-10-23 19:59:20 -04:00
Anuken
88d1165909 Fixed #6220 / Fixed #6217 2021-10-23 09:26:30 -04:00
hortiSquash
c9eed5a936 horti and the better unloaders (#6201) 
* hortiloaders 0.9.8.1 seq fix

* tiny fixes
added more comments

* a tiny fix, and rewriting of a comment
 2021-10-22 10:57:16 -04:00
Anuken
5d20f3a89b Merge remote-tracking branch 'origin/master' 2021-10-22 09:04:06 -04:00
Anuken
677e0e6f58 Fixed #6207 2021-10-22 09:04:00 -04:00
JrTRinny
f944d3d579 deselectable content selection UI (#6205) 2021-10-21 12:40:34 -04:00
Anuken
085a974350 Cleanup 2021-10-20 14:34:27 -04:00
Anuken
4436a5ced9 An experiment 2021-10-20 14:30:06 -04:00
Anuken
2469cf0851 Added isPayload utility for buildings 2021-10-19 12:13:29 -04:00
MrDuck557
f2ce32cbb2 LogicDisable (#6191) 
* LogicDisable

* I have read CONTRIBUTING.md

I forgot one space

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-10-18 20:17:57 -04:00
Anuken
7dc492892e Fixed #6190 2021-10-18 16:28:52 -04:00