Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,562 Commits 4 Branches 180 Tags
c38a8c3ef4d10927fe7980b6d4553f3a40335ffb
Commit Graph
1881 Commits
Author SHA1 Message Date
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
xStaBUxandGitHub 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
RTOmegaGitHubAnuken
 		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
Anuken 4b0bc6fe5c Fixed Serpulo cores being used on Erekir 2022-07-17 21:48:33 -04:00
Anuken 4fa3f4d8dd Intersect attack fix 2022-07-17 00:18:40 -04:00
Anuken d3210a0831 Misc minor fixes 2022-07-15 20:25:42 -04:00
Anuken 8d6cac39d0 Fixed #7178 / Maps renamed 2022-07-15 19:26:23 -04:00
Anuken f6093c864f Fixed map-3 waves 2022-07-15 18:57:01 -04:00
GlennFolkerandGitHub 695c19d0b0 Tree-like objective node structure (#7152) 
* overall structure

* overall layout

* field interpreter

* less bloated UI

* scroll pan't

* strip off the 'Marker' suffix

* e

* all (hopefully all...) interpreters finished.

* onset

* two, four

* i don't understand how icon mappings work.

* separate remover and indexer

* some cleanups

* untested mobile support

* contrib

* ok anuke

* fix conflicts 2

* hidden
 2022-07-15 10:41:18 -04:00
Anuken 25e82d927f Fixed unit legs not resetting properly 2022-07-14 21:56:29 -04:00
Anuken cd67e70ada Fixed tests 2022-07-14 15:40:21 -04:00
Anuken 67da71b0f0 Merge branch 'maps' of https://github.com/Anuken/Mindustry 2022-07-14 15:32:33 -04:00
Anuken f32e39fb86 WIP unit tether component 2022-07-14 15:32:23 -04:00
Epowerj b8d3318d0b Added objectives to split 2022-07-14 15:27:35 -04:00
Epowerj 251404f29e Rearranged some transport tech on the tree 2022-07-14 14:54:47 -04:00
Epowerj a68b2fad11 Fixed research tree issue that prevented unlocking split 2022-07-14 14:49:41 -04:00
Anuken 9dce4f36f7 Collaris tweaks 2022-07-14 10:06:15 -04:00
Anuken 62332fbebb WIP chnages to collaris weapon 2022-07-13 22:57:13 -04:00
Epowerj e79763d139 Changed payload build requirements 2022-07-12 20:36:57 -04:00
Epowerj ecc9dd7a7f Made reinforced container cheaper and smaller 2022-07-12 19:03:23 -04:00
Epowerj 352fa4e18f Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 23:08:33 -04:00
Epowerj b29b6b38e7 rearranged tech tree 2022-07-11 21:36:31 -04:00
Anuken 4230e3b8c2 ConsumeGenerator liquidOutput -> outputLiquid 2022-07-11 18:44:49 -04:00
Epowerj 9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
 2022-07-11 17:14:39 -04:00
Anuken 2fd8134700 First phase of generator cleanup 2022-07-11 16:59:07 -04:00
Anuken 411b6d7460 Shockwave tower block 2022-07-11 14:37:57 -04:00
Epowerj 1124f5f369 Fixed issue with level four unlocking early 2022-07-10 17:05:23 -04:00
Anuken 55e78c9dce Minor bugfixes & requirement tweaks 2022-07-10 07:37:01 -04:00
Anuken 311118ae58 Hastily implemented final endgame turret 2022-07-09 00:33:15 -04:00
Epowerj e6502dad75 Changed requirements for split 2022-07-08 18:35:47 -04:00
Anuken 8b0a86e883 oh no 2022-07-08 17:54:05 -04:00
Anuken 3da0486320 Indonesian bundle loading hack 2022-07-08 17:07:49 -04:00
Anuken 2a3a3359fa Misc bugfixes 2022-07-07 09:53:38 -04:00
Epowerj 92e45559cc Added objectives to lake 2022-07-06 21:14:20 -04:00
Anuken 3b083cf7e1 Higher range for large power node 2022-07-06 18:51:26 -04:00