Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,231 Commits 4 Branches 180 Tags
77ddbd027a406911dd2431dee144fe6232c6f3a7
Commit Graph

9775 Commits

Author SHA1 Message Date
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
46f8838d1a Fixed #7284 2022-08-04 10:23:49 -04:00
Anuken
1d8166669b Fixed #7283 2022-08-04 10:14:13 -04:00
Anuken
db8e7675c8 Merge remote-tracking branch 'origin/master' 2022-08-03 23:44:10 -04:00
Anuken
243a672a5b Disabled NetworkIO entity writing 2022-08-03 23:44:07 -04:00
MEEPofFaith
ff28daa3a4 FlakDelay (#7281) 2022-08-03 17:08:53 -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
9a95754007 Fixed incorrect scaling with command layout 2022-08-01 20:56:37 -04:00
Anuken
2bc000f53c WIP flux reactor 2022-08-01 20:28:07 -04:00
Anuken
36ecb45fb4 Minor UI style tweaks 2022-07-31 13:59:31 -04:00
Anuken
3d0a1868c6 Merge remote-tracking branch 'origin/master' 2022-07-31 11:43:26 -04:00
Anuken
427100c61d Fixed commanded unit UI refresh 2022-07-31 11:43:23 -04:00
Joan Josep
d029c85ec5 Add Catalan to available languages and start its localisation. (#7076) 
* Add Catalan to available languages and start its localisation.

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update Catalan.properties

* Update Catalan.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundles_ca.properties

* Update bundles_ca.properties

* Update bundle_ca.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-31 10:57:00 -04:00
Anuken
1fe988adc2 Fixed unit movement overshoot 2022-07-31 10:37:55 -04:00
Anuken
3d64047a91 Fixed Quad Repair AI 2022-07-31 00:30:37 -04:00
Anuken
ce0a8de25b Fixed certain units having useless mine command 2022-07-31 00:16:30 -04:00
Anuken
a87aa75adb More misc cleanup 2022-07-30 23:06:59 -04:00
Anuken
7df2a7ad43 Fixed #7260 2022-07-30 23:03:54 -04:00
Anuken
0debdee40b Fixed more wide water / Unit command JSON support 2022-07-30 21:59:36 -04:00
Anuken
55edd53f84 WIP command order system 2022-07-30 21:01:07 -04:00
Anuken
a326e36bbe Merge remote-tracking branch 'origin/master' 2022-07-30 10:05:06 -04:00
Anuken
b9753204da Fixed #7256 2022-07-30 10:05:01 -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
BlackDeluxeCat
df1df66c6c Update FilterOption.java (#7248) 2022-07-28 09:42:52 -04:00
RlCCJ
311cd86e47 Why is it here? (#7240) 
BlockProducer already has buildSpeed.
 2022-07-28 09:42:33 -04:00
BalaM314
d18579b59a Allow printflushing to null (#7243) 
* Allow `printflush`ing to null

* Dumb
 2022-07-28 09:41:31 -04:00
hortiSquash
02c4e905a5 More Optimized Unloaders (Serpulo) (#7249) 
* Update Unloader.java

* some comments

* deleted highUnloadPriority
 2022-07-28 09:41:11 -04:00
Anuken
c1971cb5b1 Fixed #7241 2022-07-28 09:30:19 -04:00
Anuken
5fb7c2a916 Fixed #7239 2022-07-28 09:26:28 -04:00
Anuken
fa3bd6dbc6 Fixed #7227 2022-07-23 13:15:54 -04:00
Anuken
ca04c85b92 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-23 13:09:17 -04:00
Anuken
50530e7534 Improved drillable stat display 2022-07-23 13:08:51 -04:00
RlCCJ
4ba91b56b5 Restrict the ipt (#7226) 2022-07-23 13:04:17 -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
rly4498
f16894592f onShoot on StatusFieldAbility (#7221) 
* onShoot on StatusFieldAbility

allows for more JSON gaming

* hmm
 2022-07-22 13:43:37 -04:00
Anuken
00d86e81a4 completely unfinished class that I might finish later 2022-07-22 13:04:31 -04:00
Anuken
3b0729b64e Fixed #7222 2022-07-22 04:48:02 -04:00
Anuken
687d0b4f00 Misc minor bugfixes 
at 4 AM
 2022-07-22 03:51:24 -04:00
Anuken
5ae204dd22 Fixed #7218 2022-07-21 21:23:02 -04:00
Anuken
1476c4dacd Fixed #7213 2022-07-21 07:56:09 -04:00
Anuken
25a1d125c8 Fixed #7207 2022-07-20 15:58:24 -04:00
Anuken
4fbad2356d Mobile boosting unit fix 2022-07-19 11:34:44 -04:00
Anuken
90e9d37a9a Fixed #7201 2022-07-19 10:59:07 -04:00