Commit Graph

1813 Commits

Author SHA1 Message Date
Anuken
2a062b96ec Changed internal name of sand 2022-08-27 19:39:53 -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
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
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
Epowerj
3b239ee368 Changed sublimate research requirements 2022-08-24 21:56:46 -04:00
Anuken
976f9f43f6 Slightly better titan shoot SFX 2022-08-22 22:06:40 -04:00
Anuken
fcb99103dd Erekir unit SFX 2022-08-22 13:45:35 -04:00
Anuken
450dd90862 Drill/factory/generator noises 2022-08-22 10:27:49 -04:00
Anuken
57c07b7ebb More turret SFX 2022-08-21 23:53:07 -04:00
Anuken
2c28b206b8 Erekir turret SFX (of varying quality) 2022-08-21 20:44:07 -04:00
Anuken
a8900d28f9 Fixed #7401 2022-08-19 20:08:08 -04:00
Anuken
a7f939de4c Misc balance 2022-08-16 09:13:22 -04:00
Anuken
ec8e48f3f5 Metaglass cyclone buff 2022-08-15 17:14:14 -04:00
Anuken
f15a620c45 Allow neoplasm on water/arkycite/etc 2022-08-14 15:39:56 -04:00
Lucky Clover
b3f43dbc03 worldCell.targetable = false (#7345) 2022-08-11 07:23:11 -04:00
Epowerj
648a4b5e61 Tweaked tech tree for peaks 2022-08-09 19:45:51 -04:00
Epowerj
43937db6df Added peaks to tech tree 2022-08-09 15:50:45 -04:00
Epowerj
63cf6f6fb2 Reduced breach tungsten damage 2022-08-09 15:49:51 -04:00
Epowerj
2344cc442b Added peaks to code 2022-08-09 15:47:43 -04:00
Epowerj
901d0106c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-08 17:45:06 -04:00
Epowerj
f4798f5adc hid a bunch of stuff from the tech tree for now 2022-08-08 15:54:33 -04:00
Anuken
a28601d91c Interplanetary accelerator beta info text 2022-08-06 17:31:21 -04:00
Lucky Clover
e4255755ec liquidTank should be consistant as well (#7311) 2022-08-06 13:32:13 -04:00
Anuken
45e5ab8ecc Fixed #7310 2022-08-06 13:30:47 -04:00
Anuken
e9eb713a39 Fixed #7309 2022-08-06 00:12:34 -04:00
Epowerj
dc92222d98 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-05 17:06:47 -04:00
Anuken
36ce1ea2af Faster beryllium drilling with burst drills 2022-08-05 16:27:23 -04:00
Epowerj
f728bd643a Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-04 19:02:22 -04:00
Anuken
bf926d139d Fixed akrycite output 2022-08-04 18:43:38 -04:00
Epowerj
f6b5962997 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2
 Conflicts:
	core/src/mindustry/content/Blocks.java
2022-08-04 14:55:14 -04:00
Anuken
1bb45fe91c Minor bugfixes/cleanup 2022-08-04 13:49:22 -04:00
Anuken
1d8166669b Fixed #7283 2022-08-04 10:14:13 -04:00
Epowerj
00d6a73c27 Tweaked tech tree and for marsh 2022-08-03 16:33:14 -04:00
Anuken
58246747ee Fixed shielded wall being available on Serpulo 2022-08-03 16:09:05 -04:00
Anuken
a54907583b Neoplasia reactor 2022-08-02 21:26:15 -04:00
Epowerj
d77afbea06 Being work on marsh 2022-08-02 18:17:53 -04:00
Anuken
e28d7b8d8d Generator explosion system cleanup 2022-08-02 13:13:37 -04:00
Anuken
2bc000f53c WIP flux reactor 2022-08-01 20:28:07 -04:00
Anuken
55edd53f84 WIP command order system 2022-07-30 21:01:07 -04:00
xStaBUx
0cd80b70b7 Water in cryofluid mixer & cultivator (#7244)
* criofluid mixer, cultivator & spore press liquids fix

water and oil now displayed in cryofluid mixer, cultivator and spore press

* 1

* 2
2022-07-28 09:43:52 -04:00
Anuken
8eabe419c5 Heat source warmup fix 2022-07-22 14:06:34 -04:00
RTOmega
9a3a6c31b3 Adding Block: Heat Source (#6855)
* Update Blocks.java

* ,

* Update Blocks.java

* Add files via upload

* Delete 5618F7BA-F0D0-4FFF-AE6A-185BFEA99F16.png

* Add files via upload

* Add files via upload

* Add files via upload

* Update Blocks.java

* Bundle

* 1m to 10k

* Update bundle.properties

* TR

* 10k to 1k

Co-authored-by: Anuken <arnukren@gmail.com>
2022-07-22 13:59:32 -04:00
Anuken
687d0b4f00 Misc minor bugfixes
at 4 AM
2022-07-22 03:51:24 -04:00
Anuken
90e9d37a9a Fixed #7201 2022-07-19 10:59:07 -04:00
Anuken
a6ae178b46 Misc minor fixes 2022-07-18 22:14:53 -04:00