Commit Graph

15502 Commits

Author SHA1 Message Date
MEEPofFaith
cb99313b26 oop 2025-02-08 20:49:35 -08:00
MEEPofFaith
74596a222c Merge branch 'master' into mod-dependencies 2025-02-08 20:48:39 -08:00
Anuken
7dedf6c488 Misconfigured planet crash fix 2025-02-08 23:41:51 -05:00
Anuken
931f5fd8ec Minor color tweak 2025-02-08 23:38:14 -05:00
Anuken
96b2f14426 Conflicts resolved 2025-02-08 23:37:09 -05:00
Anuken
48afcddf1a Cleanup 2025-02-08 23:35:07 -05:00
Anuken
03c3414305 Merge branch 'port-field' of https://github.com/antsif-a/Mindustry into antsif-a-port-field 2025-02-08 23:26:40 -05:00
Anuken
5cbb358522 Checked button fix 2025-02-08 21:43:34 -05:00
Anuken
5cdee0e765 Allow commanding while planning on mobile 2025-02-08 21:41:36 -05:00
Anuken
a77f64f2d0 Cleanup 2 2025-02-08 21:28:02 -05:00
Anuken
5bb0951422 Merge remote-tracking branch 'origin/master' 2025-02-08 21:22:06 -05:00
Anuken
e7c3c1f898 Cleanup 2025-02-08 21:21:59 -05:00
Github Actions
a36059e99f Automatic bundle update 2025-02-09 02:21:57 +00:00
MEEPofFaith
e9ecb2a576 Hovering over blocks with a selection displays the selection (#10323)
* Selection display

Should this go in building or block?

* Apparently serpulo liquid icons are not square???

* simplify

* simplify further

* Add disabling w/ setting

Probably needs a better name

* Better name

* h
2025-02-08 21:21:09 -05:00
MEEPofFaith
07e573ac42 minRangeChange + draw min range (#7504)
Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-08 20:37:02 -05:00
Anuken
f8ff370dbe Merge branch 'master' into port-field 2025-02-08 19:36:26 -05:00
Anuken
b96191f6d6 Closes #8590 2025-02-08 19:33:23 -05:00
Anuken
ebaf88e80d Fixed logic IDs not loading / Accelerator animation tweaks 2025-02-08 16:04:04 -05:00
Anuken
f8b6600fe7 Closes #5033 2025-02-08 10:48:44 -05:00
Anuken
2868dbadd1 Merge remote-tracking branch 'origin/master' 2025-02-08 10:22:32 -05:00
Anuken
e34c8f58a0 Closes #7473 2025-02-08 10:22:25 -05:00
summoner001
08096c6877 Update bundle_hu.properties (#10481)
Translate new strings.
Fix small consistency.
2025-02-08 10:17:29 -05:00
LiMingyuan
7fe6460b41 Update bundle_zh_CN.properties (#10476)
* 加入我的名字

* 更新 bundle_zh_CN.properties
2025-02-08 10:15:39 -05:00
Cryofluid
868f2bb526 Update bundle_zh_CN.properties (#10477) 2025-02-08 10:15:30 -05:00
Anuken
ce5bca120a Fixed #10475 2025-02-08 10:15:00 -05:00
Anuken
c032a6ebb4 Merge remote-tracking branch 'origin/master' 2025-02-08 00:08:04 -05:00
Anuken
710895fab5 Closes #9664 2025-02-08 00:07:58 -05:00
Github Actions
32ea98eee2 Automatic bundle update 2025-02-08 02:28:04 +00:00
LiMingyuan
1786e530ab Update bundle_zh_CN.properties (#9986)
Co-authored-by: LiMingyuan <109882141+Benny0Li@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-07 21:27:18 -05:00
Anuken
49f68be2cb Closes #6790 2025-02-07 21:19:25 -05:00
Anuken
88cfb10621 Fixed #10474 2025-02-07 20:49:21 -05:00
Anuken
d5bf4f46e8 Console injection fix 2025-02-07 16:55:57 -05:00
kay
1aae8e9368 name 2025-02-08 01:14:47 +07:00
kay
965b221d51 please work 2025-02-08 01:12:32 +07:00
Anuken
c100d8c13c Fixed #10467 2025-02-06 23:58:32 -05:00
Anuken
423d635efe More base generation fixes 2025-02-06 23:11:11 -05:00
Anuken
eaaa4f9bd8 Possible door config fix 2025-02-06 21:05:49 -05:00
Anuken
e630f21aae Base part fixes 2025-02-06 20:44:25 -05:00
Anuken
5fca75734c Closes #9314 2025-02-06 17:15:40 -05:00
Anuken
7fd9c2c8cc Merge remote-tracking branch 'origin/master' 2025-02-06 16:58:46 -05:00
Anuken
393694aa7d Cleanup 2025-02-06 16:58:40 -05:00
Github Actions
e4e9c20d4a Automatic bundle update 2025-02-06 21:58:08 +00:00
MEEPofFaith
ed42bcb4f6 ShieldDamageMultiplier for bullets (#6331)
* ShieldDamageMultiplier + Dynamic damage multipliers

* Add to stats

* That's not right

* merge typo

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-06 16:57:17 -05:00
Anuken
5f1271e659 More base parts from Skeledragon 2025-02-06 16:50:13 -05:00
Anuken
8bd567c401 Closes #7746 2025-02-06 16:49:35 -05:00
酪桦姬
c5c896cee4 Update Outdated Steam Simplified Chinese Description and Achievements (#9271)
* Update Outdated Steam Simplified Chinese Description and Achievements

* Create description.txt

* Delete fastlane/metadata/steam/achievements.vdf

* Update Translation

* Update contributors

* Update short-description.txt

* Update description.txt

* Update achievements.vdt

* Update achievements.vdt

* Update achievements.vdt

* Update description.txt

* Update short-description.txt

* Update description.txt

* Update description.txt

* Update description.txt

这个比较好

---------

Co-authored-by: SoMall-dumpling <57857764+SoMall-dumpling@users.noreply.github.com>
2025-02-06 16:36:13 -05:00
Twcash
03ab78b3a1 crawling (#10110) 2025-02-06 16:35:49 -05:00
Anuken
67ba6e2914 Closes #8520 2025-02-06 16:21:53 -05:00
Anuken
d08d17a309 Cleanup 2025-02-06 15:52:20 -05:00
Ilya246
ba622cb76b Improve router bundle (#6269)
* router

* optimise
2025-02-06 15:51:32 -05:00