mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-31 01:44:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,162 Commits 4 Branches 160 Tags 2.3 GiB
5ecd73bdb0
Commit Graph

12816 Commits

Author SHA1 Message Date
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
48cb99774a Added peaks 2022-08-09 15:46:32 -04:00
Anuken
6e11418fa4 Fixed #7331 2022-08-09 09:11:11 -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
Anuken
bae64cb98a Median error fix 2022-08-08 17:34:46 -04:00
Epowerj
f4798f5adc hid a bunch of stuff from the tech tree for now 2022-08-08 15:54:33 -04:00
Anuken
469a49b3d6 Cleanup 2022-08-08 14:27:10 -04:00
BlackDeluxeCat
0802941cb8
Fixed HeatCrafter Consumes Less Liquid (#7288) 2022-08-08 14:24:45 -04:00
Anuken
fae3360dfc Fixed #7327 2022-08-08 14:05:01 -04:00
Anuken
94d13267e8 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-07 22:54:30 -04:00
Anuken
01c3738275 Misc cleanup 2022-08-07 22:54:05 -04:00
彭瑞暄
af503d1a50
Update bundle_zh_TW.properties (#7190) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2022-08-07 21:38:00 -04:00
JniTrRny
6a2c6e3a74
the return of deselectable (#7319) 2022-08-07 13:10:12 -04:00
Anuken
a28601d91c Interplanetary accelerator beta info text 2022-08-06 17:31:21 -04:00
Epowerj
4b9b4f3c0b Progress on marsh 2022-08-06 15:03:36 -04:00
Anuken
39ebc046ad Fixed objectives dialog scaling 2022-08-06 14:06:24 -04:00
Anuken
ecdedf383a Merge remote-tracking branch 'origin/master' 2022-08-06 13:38:35 -04:00
Anuken
32f3190762 Less stacking in objectives dialog 2022-08-06 13:38:31 -04:00
Lucky Clover
e4255755ec
liquidTank should be consistant as well (#7311) 2022-08-06 13:32:13 -04:00
Anuken
9d1c03ccd9 Merge remote-tracking branch 'origin/master' 2022-08-06 13:30:52 -04:00
Anuken
45e5ab8ecc Fixed #7310 2022-08-06 13:30:47 -04:00
SoMall-dumpling
aa5ba1a3aa
Update FlakBulletType.java (#7313) 
fix erekir core unit make flak bullets explode
 2022-08-06 13:29:47 -04:00
Anuken
e9eb713a39 Fixed #7309 2022-08-06 00:12:34 -04:00
Epowerj
33ef30923b Progress on marsh 2022-08-05 19:13:51 -04:00
Epowerj
a127302aae Progress on marsh 2022-08-05 18:26:09 -04:00
Epowerj
605f727f22 Progress on marsh 2022-08-05 18:11:19 -04:00
Epowerj
b1ad070f80 Progress on marsh 2022-08-05 17:34:56 -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
Epowerj
4f652852ec Progress on marsh 2022-08-05 17:04:40 -04:00
Anuken
a833bb09fe Merge remote-tracking branch 'origin/master' 2022-08-05 16:27:28 -04:00
Anuken
36ce1ea2af Faster beryllium drilling with burst drills 2022-08-05 16:27:23 -04:00
Epowerj
aa7576758a Tweaks on basin 2022-08-05 15:52:16 -04:00
Joan Josep
275293e45c
Update bundle_ca.properties (#7301) 
* Update bundle_ca.properties

* Update bundle_ca.properties
 2022-08-05 15:09:05 -04:00
Github Actions
031ca650bd Automatic bundle update 2022-08-05 18:27:32 +00:00
Thomas Widyantoko
e3c4bd86db
[ID] id_ID bundle update (#7175) 
* [ID] various bundle update

+ Mod Browser release, some editor functions, sector four description, and more

* quick bundle update

sector, block, logic descriptions and other fixes
will continue again later my house is being renovated bruh

* finalizing v7 alpha id_ID translation

turrets are now translated, adjusted stats and status to match its function, and stuff

* added heat source to id_ID

...and other new things i guess

* adds new lines from EN bundle to id_ID

includes Neoplasia Reactor and other fixes

also things changed a lot behind the scenes
 2022-08-05 14:26:38 -04:00
Anuken
6a5d7da4ae Fixed #7303 / Fixed #7302 2022-08-05 14:25:37 -04:00
Anuken
8b6d3a67f3 Fixed #7299 2022-08-05 09:39:45 -04:00
Anuken
0f831d598d Fixed #7296 2022-08-05 09:35:04 -04:00
Anuken
11d3b1d973 Fixed #7292 2022-08-04 20:20:46 -04:00
Epowerj
d882dcf395 Marsh is probably testable now once Anuke is done with ground beryllium rebalancing 2022-08-04 19:28:31 -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
Epowerj
1fa34518d6 Progress on marsh 2022-08-04 19:02:11 -04:00
Anuken
62d0d62d22 Fixed squished pump liquid icon 2022-08-04 18:45:51 -04:00
Epowerj
1245ff006f Progress on marsh 2022-08-04 18:45:26 -04:00
Anuken
f9c73c2fdc Merge remote-tracking branch 'origin/master' 2022-08-04 18:43:42 -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
Epowerj
e3566bda28 Progress on marsh 2022-08-04 14:32:05 -04:00
Nunting
a13c8f5c4a
Update bundle_ko.properties (#7285) 2022-08-04 14:06:47 -04:00
Epowerj
d9312bc960 Progress on marsh 2022-08-04 13:51:41 -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
Epowerj
d6a0ce0fce Progress on marsh 2022-08-03 21:09:37 -04:00
Nunting
45f8712fe8
Update bundle_ko.properties (#7262) 2022-08-03 19:36:06 -04:00
MEEPofFaith
ff28daa3a4
FlakDelay (#7281) 2022-08-03 17:08:53 -04:00
Epowerj
8a51ac0bdc More work on marsh 2022-08-03 16:33:21 -04:00
Epowerj
00d6a73c27 Tweaked tech tree and for marsh 2022-08-03 16:33:14 -04:00
Anuken
3138f05cc2 Merge remote-tracking branch 'origin/master' 2022-08-03 16:09:10 -04:00
Anuken
58246747ee Fixed shielded wall being available on Serpulo 2022-08-03 16:09:05 -04:00
SoMall-dumpling
c8257871b9
Update bundle_zh_CN.properties (#7261) 
* Update bundle_zh_CN.properties

The Ultimate Unit Control System Translation

* Update bundle_zh_CN.properties

The Ultimate Flux Reactor

* Update bundle_zh_CN.properties

删除一个多余的空行

* Update bundle_zh_CN.properties

语序调整
 2022-08-03 08:32:20 -04:00
Github Actions
65db43268c Automatic bundle update 2022-08-03 01:27:29 +00:00
Anuken
a54907583b Neoplasia reactor 2022-08-02 21:26:15 -04:00
Epowerj
e2dea0f84e Begin rework of basin 2022-08-02 18:32:26 -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
fa1a5971cf Merge remote-tracking branch 'origin/master' 2022-08-01 20:56:41 -04:00
Anuken
9a95754007 Fixed incorrect scaling with command layout 2022-08-01 20:56:37 -04:00
Github Actions
efb258e9a6 Automatic bundle update 2022-08-02 00:29:14 +00: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
765684a9b0 Fixed #7263 2022-07-31 10:55:33 -04:00
Anuken
83ccd0cf48 Merge remote-tracking branch 'origin/master' 2022-07-31 10:38:00 -04:00
Anuken
1fe988adc2 Fixed unit movement overshoot 2022-07-31 10:37:55 -04:00
Nunting
9c276f362d
Update bundle_ko.properties (#7253) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-07-31 00:50:26 -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
a0c4ed11c6 Merge remote-tracking branch 'origin/master' 2022-07-30 21:59:40 -04:00
Anuken
0debdee40b Fixed more wide water / Unit command JSON support 2022-07-30 21:59:36 -04:00
Github Actions
cf9a7f0c63 Automatic bundle update 2022-07-31 01:03:28 +00: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
RTOmega
a3bdcd175b
TR Bundle Cleanup (#7229) 2022-07-28 15:38:16 -04:00
Github Actions
b55465a4b0 Automatic bundle update 2022-07-28 14:22:45 +00:00
SoMall-dumpling
a263aa781d
Update bundle_zh_CN.properties (#7189) 
* Update bundle_zh_CN.properties

The following updates will focus on better unit names, turret names, map names, and other untranslated stuff.

* Update bundle_zh_CN.properties

four new lines

* Update bundle_zh_CN.properties

Revert rollback, and some missing translations.

* Update bundle_zh_CN.properties

map names

* Update bundle_zh_CN.properties

turret names, arkycite-related translations

* Update bundle_zh_CN.properties

boulders

* Update bundle_zh_CN.properties

命令模式->指挥模式

* Update bundle_zh_CN.properties

敌军基地/敌人基地->敌方基地

* Update bundle_zh_CN.properties

爬行者->爬虫

* Update bundle_zh_CN.properties

重岩叠嶂->风化山脉

* Update bundle_zh_CN.properties

这个\n的位置我实在看不下去了

* Create bundle_zh_CN.properties

恶灵->魔灵

* Update bundle_zh_CN.properties

奇奇怪怪多出来个\n

* Update bundle_zh_CN.properties

相织物->相织布

* Update bundle_zh_CN.properties

给顿号加个空格

* Update bundle_zh_CN.properties

传送带与导管的描述更改。

* Update bundle_zh_CN.properties

+向前

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

友军->己方
友方->己方

* Update bundle_zh_CN.properties

日蚀的炮弹不能翻墙，应该是子弹

* Update bundle_zh_CN.properties

自动重建已摧毁的建筑->自动重建被摧毁的建筑

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

two new lines

* Update bundle_zh_CN.properties

还是改回来。事实上墙的描述是挡下敌方炮弹，但也挡不住抛射炮。所以没有太大必要改前面的东西。（而且shell也是炮弹的意思）
死神，太逊啦

* Update bundle_zh_CN.properties

远距离的->远距

* Update bundle_zh_CN.properties

来--

* Update bundle_zh_CN.properties

已禁用->未启用
更新地图->更新内容

* Update bundle_zh_CN.properties

一些改进。

* Update bundle_zh_CN.properties

没有人会说具备一台炮塔的。
 2022-07-28 10:21:38 -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
Catchears
224cc80b59
update heat source description to match other sources (#7230) 
* update heat source description to match other sources

* correct to large amounts of heat
 2022-07-28 09:39:30 -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
d98f26d35b Erekir unit logic ID order changed 2022-07-22 14:10:46 -04:00
Anuken
0e81d19bd4 Merge remote-tracking branch 'origin/master' 2022-07-22 14:06:40 -04:00
Anuken
8eabe419c5 Heat source warmup fix 2022-07-22 14:06:34 -04:00
Github Actions
43f7384855 Automatic bundle update 2022-07-22 18:00:35 +00: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
1a39bcaef0 Smaller vanilla env page size 2022-07-19 20:43:10 -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
Anuken
f1dc769b1f Fixed #7195 2022-07-19 07:42:58 -04:00
Anuken
e0f874c46f Merge remote-tracking branch 'origin/master' 2022-07-19 07:38:39 -04:00
Anuken
606cdff17d Fixed #7198 2022-07-19 07:38:34 -04:00
Github Actions
b94393f150 Automatic bundle update 2022-07-19 02:16:10 +00:00
Anuken
1c2aca91e4 Merge remote-tracking branch 'origin/master' 2022-07-18 22:14:57 -04:00
Anuken
a6ae178b46 Misc minor fixes 2022-07-18 22:14:53 -04:00
Epowerj
2332d9bee1 Tweaked intersect 2022-07-18 13:41:04 -04:00
Epowerj
a36a87fa83 Added an extra island to lake 2022-07-18 13:37:18 -04:00
Epowerj
1529d4ecc9 Tweaked aegis 2022-07-18 11:22:26 -04:00
Epowerj
fceec59a61 Added more resources to onset 2022-07-18 11:21:13 -04:00
Anuken
2c6b2a6fa9 Fixed #7193 2022-07-18 10:01:24 -04:00
Anuken
7680b4e0c5 Merge remote-tracking branch 'origin/master' 2022-07-17 21:48:37 -04:00
Anuken
4b0bc6fe5c Fixed Serpulo cores being used on Erekir 2022-07-17 21:48:33 -04:00
Github Actions
32871920b2 Automatic bundle update 2022-07-18 00:36:56 +00:00
Anuken
494440a591 Fixed incorrect 'command mode' hint on mobile 2022-07-17 20:35:49 -04:00
Anuken
26fbf4c71e Fixed NaN liquid efficiency 2022-07-17 19:12:57 -04:00
Anuken
1e7219f7d1 Merge remote-tracking branch 'origin/master' 2022-07-17 10:27:31 -04:00
Anuken
ebf9e82146 Crash fixes / Mod browser >=136 filter 2022-07-17 10:27:27 -04:00
Github Actions
ffff3fa351 Automatic bundle update 2022-07-17 13:22:44 +00:00
Lucky Clover
93f12a5544
Update bundle_zh_CN.properties (#7135) 
* Update bundle_zh_CN.properties

* 部分补充

* 光彩统一改成光效

* Update bundle_zh_CN.properties

Thanks @SoMall-dumpling for review

* Suggestions from @xem8k5, @Cry0flu1d and more

* thanks mi2/xerxer

* miner fix

* Corrections from SoMall-dumpling

* Update suggestions from  @nanmenyangde

* liquid翻译讨论确定：液体->流体

* from @nanmenyangde

* suggestion from @SoMall-dumpling & @BlackDeluxeCat
 2022-07-17 09:21:53 -04:00
Goobrr
764ec34ff5
Objective Editor UI Rework, Part 1 (#7179) 
* Objective tile ui

* Fancier connectors

* New ninepatches

* Button styles
 2022-07-17 09:21:31 -04:00
Anuken
c4d5126ac2 Minor bugfixes 2022-07-17 08:48:10 -04:00
Anuken
4fa3f4d8dd Intersect attack fix 2022-07-17 00:18:40 -04:00
Anuken
88e4ca4992 Fixed some portrait layout bugs 2022-07-16 15:30:02 -04:00
Github Actions
4ac7254842 Automatic bundle update 2022-07-16 15:32:30 +00:00
ThatOneBepis
4c80cf90cc
Update bundle_sr.properties (#7181) 2022-07-16 11:31:35 -04:00
Anuken
8383d151a3 fixed release script but it's too late 2022-07-16 11:04:44 -04:00
Anuken
d3210a0831 Misc minor fixes 2022-07-15 20:25:42 -04:00
Anuken
830a771a90 Merge remote-tracking branch 'origin/master' 2022-07-15 19:28:40 -04:00
Anuken
2ec1f9f55d typo 2022-07-15 19:28:35 -04:00
Github Actions
2e7dca06ed Automatic bundle update 2022-07-15 23:27:34 +00: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
Anuken
47e639be28 Fixed more objective bugs 2022-07-15 17:26:43 -04:00
Anuken
9eacbb45d1 glenn what did you do 2022-07-15 17:14:57 -04:00
Anuken
926cf7e0fa Fixed some messed-up objectives 2022-07-15 16:56:34 -04:00
Anuken
9a505753b0 Fixed block break particles not showing 2022-07-15 16:26:48 -04:00
Anuken
98fb7bd41d Merge remote-tracking branch 'origin/master' 2022-07-15 16:18:15 -04:00
Anuken
f1917fea3e Misc formatting 2022-07-15 16:18:11 -04:00
Github Actions
3907a23fb4 Automatic bundle update 2022-07-15 14:42:13 +00:00
GlennFolker
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
3b1c8baca9 Merge remote-tracking branch 'origin/master' 2022-07-15 10:35:57 -04:00
Anuken
ee2ed4c469 Better color picker 2022-07-15 10:35:51 -04:00
null
0711d7075e
Add a drawSelect to shockwave towers (#7172) 
* add hover range display

* absolute buffoon

* so the local one works but that didn't

* newline
 2022-07-15 08:45:05 -04:00
BetaEridani
d72d663219
Update bundle_fi.properties (#7164) 
Swapped the places of two text lines to correct a mistake.
 2022-07-14 23:37:14 -04:00
RlCCJ
5191dc1bd7
Fix: The flying unit has no crash damage (#7173) 2022-07-14 23:36:32 -04:00
Github Actions
bb7f96437c Automatic bundle update 2022-07-15 03:34:36 +00:00
Catchears
e4274c2b49
german erekir & v7 translation (#6869) 
* initial german erekir translation

* first ideas

* Update bundle_de.properties

added missing ones, fixed some typos

* Update bundle_de.properties

* Update bundle_de.properties

* suggested changes

* shawak's changes

* update to 4c3ee57ce9

* update to 3927841f43

* update to 371394df6f

* update to d6539b267c

Co-authored-by: JoeFLYtheCoder <73280709+jdopss@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-14 23:33:26 -04:00
Anuken
25e82d927f Fixed unit legs not resetting properly 2022-07-14 21:56:29 -04:00
Anuken
5ce95d7fc7 Added Android API level logging 2022-07-14 17:33:06 -04:00
Github Actions
521519c8ab Automatic bundle update 2022-07-14 19:45:43 +00:00
Epowerj
6aa9623512 Added a temporary description for four 2022-07-14 15:44:32 -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
Github Actions
07427e68a1 Automatic bundle update 2022-07-14 19:28:44 +00:00
Epowerj
b8d3318d0b Added objectives to split 2022-07-14 15:27:35 -04:00
Epowerj
f149bed64e Tweaked split 2022-07-14 15:11:11 -04:00
Epowerj
9d3bf2d489 Tweaked split 2022-07-14 15:06:57 -04:00
Epowerj
251404f29e Rearranged some transport tech on the tree 2022-07-14 14:54:47 -04:00
Epowerj
43416f90e5 Added description to split 2022-07-14 14:50:00 -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
3a3eb2c63d Progress on split 2022-07-13 15:05:52 -04:00
Epowerj
24e70faf02 Start reworking split 2022-07-12 20:37:17 -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
Anuken
a734f8423c Fixed #7167 2022-07-12 13:50:02 -04:00
Epowerj
352fa4e18f Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 23:08:33 -04:00
Anuken
fc5e40a857 Crash fix 2022-07-11 21:57:53 -04:00
Epowerj
b29b6b38e7 rearranged tech tree 2022-07-11 21:36:31 -04:00
Epowerj
458ab9d639 tweaked atlas 2022-07-11 21:36:15 -04:00
Anuken
42ce453f11 Merge remote-tracking branch 'origin/master' 2022-07-11 18:44:54 -04:00
Anuken
4230e3b8c2 ConsumeGenerator liquidOutput -> outputLiquid 2022-07-11 18:44:49 -04:00
Epowerj
ca18b851a1 Tweaked atlas, set max squad size 2022-07-11 18:44:28 -04:00
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Github Actions
9d4839b26d Automatic bundle update 2022-07-11 22:19:30 +00:00