Commit Graph

10251 Commits

Author SHA1 Message Date
Anuken
bd049d4c8d Minor liquid current tweaks 2022-09-02 14:39:26 -04:00
router
5e5b8711a3 Update Pump.java (#7500) 2022-09-02 08:58:31 -04:00
Anuken
2b6a7eac45 Fixed #7501 2022-09-02 08:57:57 -04:00
Anuken
e699e199ea Merge remote-tracking branch 'origin/master' 2022-09-02 08:35:00 -04:00
Anuken
ceb5c832bd Fixed armored duct blending 2022-09-02 08:34:53 -04:00
Epowerj
8b629b9b8b Merge remote-tracking branch 'origin/master' 2022-09-01 20:56:42 -04:00
Epowerj
c1775bf16b Tweaked tech tree for caldera 2022-09-01 20:56:14 -04:00
Epowerj
2bbcf601aa Tweaked research costs for caldera unlocks 2022-09-01 20:56:06 -04:00
MEEPofFaith
e9d3adfef3 Options for SectorPreset overriding plant launch fields. (#7478)
* Preset overriding loadouts

* a

* You know I should really learn what this actually does
2022-09-01 20:47:53 -04:00
Anuken
b854b0ca22 Better item selection UI 2022-09-01 17:49:29 -04:00
Anuken
61295bc89c Slightly longer data timeout 2022-09-01 16:49:17 -04:00
Anuken
bc1ff011af parens 2022-09-01 10:49:41 -04:00
Anuken
2d47ff893b Misc fixes 2022-09-01 08:57:43 -04:00
Anuken
56856c8166 Merge remote-tracking branch 'origin/master' 2022-09-01 08:46:36 -04:00
Anuken
5ecd73bdb0 Fixed #7495 2022-09-01 08:46:31 -04:00
Epowerj
be2160c9df Tech tree updates for caldera 2022-08-31 18:56:27 -04:00
Epowerj
7e6ba4a98e Added caldera to the campaign 2022-08-31 18:15:56 -04:00
Anuken
fb24953dc2 Added support for non-reactive liquids 2022-08-31 08:08:07 -04:00
Anuken
8f4251db3a Merge remote-tracking branch 'origin/master' 2022-08-30 21:17:44 -04:00
Anuken
4cd78aad91 Fixed #7484 2022-08-30 21:17:39 -04:00
Epowerj
a0cc74891a Merge branch 'map1' 2022-08-30 15:53:09 -04:00
Epowerj
26dc90e5a2 Hold back slag heater unlock until [4] 2022-08-30 14:56:58 -04:00
Epowerj
953b43e041 Tweaks to afflict research cost 2022-08-30 14:52:37 -04:00
Epowerj
9dbdb05ede Rearranged tech tree for turrets 2022-08-30 14:43:47 -04:00
Epowerj
19ca24825c Tweaks to surge block research costs 2022-08-30 14:05:05 -04:00
Epowerj
9996f3b6f5 Set a capture wave for ravine 2022-08-29 20:06:27 -04:00
Anuken
2f6ef4cefe Merge remote-tracking branch 'origin/master' 2022-08-29 18:57:27 -04:00
Anuken
55c54b34f9 Fixed #7477 2022-08-29 18:57:20 -04:00
Epowerj
715dfb16ca Adjusted tech tree for ravine 2022-08-29 18:46:34 -04:00
Epowerj
697e6d503f Added ravine to campaign list 2022-08-29 17:44:19 -04:00
MEEPofFaith
2703c0cbc4 alwaysShooting (#7475) 2022-08-29 17:23:20 -04:00
Anuken
0d3c27dd59 Minor bundle tweaks 2022-08-29 14:26:29 -04:00
Anuken
e4fe73b332 Minor balance tweak 2022-08-29 13:40:15 -04:00
Anuken
d7f4b15d3d WIP descriptions 2022-08-29 12:08:12 -04:00
Anuken
d5b34f0b73 Fixed #7469 2022-08-28 16:08:09 -04:00
Anuken
8453c52353 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-27 19:39:58 -04:00
Anuken
2a062b96ec Changed internal name of sand 2022-08-27 19:39:53 -04:00
router
91440e7055 drill mined item sensing (#7460)
* add drill sensing

* PROPERLY
2022-08-27 11:18:14 -04:00
Mythril382
32c8167b7c drawSelect for RepairTower (#7447) 2022-08-26 08:07:59 -04:00
Anuken
82bb4607db Fixed basin spawn timer 2022-08-25 19:47:55 -04:00
Anuken
3f8d4c5459 Merge remote-tracking branch 'origin/master' 2022-08-25 15:09:26 -04:00
Anuken
8dca512b37 Minor sound tweaks 2022-08-25 15:09:21 -04:00
xStaBUx
47d335b629 Better Discord dialog (#7445) 2022-08-25 14:46:49 -04:00
Epowerj
9f7d2b180e Merge branch 'maps_phase_2' 2022-08-25 01:15:59 -04:00
Anuken
276a59b874 Fixed #7441 2022-08-25 00:49:11 -04:00
Epowerj
c6ec64cde2 Changed ship refabricator research cost 2022-08-25 00:02:49 -04:00
Epowerj
07d7eda4c8 Chemical combustion chamber buff 2022-08-24 22:08:43 -04:00
Anuken
7a8155965a Merge remote-tracking branch 'origin/master' 2022-08-24 22:08:15 -04:00
Anuken
550d76e372 Minor shockwave tower buff 2022-08-24 22:08:10 -04:00
Epowerj
a2dbe20885 Made citadel core locked behind peaks for now 2022-08-24 21:57:36 -04:00