Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,038 Commits 4 Branches 180 Tags
0a046f8fa5abe4fb1797f802ce5fb7f91c330e85
Commit Graph

19038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MEEPofFaith
848249a6dd Consistent engine whites (#10482) 2025-02-09 00:32:34 -05:00
MEEPofFaith
d7589ca97c Make mining beam drawing consistent with build beam drawing 2025-02-08 21:29:30 -08:00
MEEPofFaith
f724e5639f BuildWeapon call super 
idk if it matters if name is null, but just in case
 2025-02-08 21:18:02 -08:00
Anuken
4183a2a485 Minor chat formatting improvements for desktop typing 2025-02-09 00:11:26 -05:00
MEEPofFaith
e8a4ecc61e Formatting Icons (#10359) 
* formatIcons

* Smarter end check

I think it's smarter?

* unecessary

* oop

* Update UI.java

* Just don't check for adjacent colons.

The hasUnicodeStr already checks for validity

* Copy from I18NBundle

* Revert "Copy from I18NBundle"

This reverts commit ac660fcd9f.

* If get and format refer to parent, then just set the existing bundle as parent

* Test with Ground Zero objectives

* Update MBundle.java

* That didn't work

* Slip the method into reasonable places like objectives and chat

* Check for Icons as well

* More testing with objective text

* Apply to hints

* Optimized formatIcons

No longer scans through every character

* TIME UPDATE THE BUNDLES YIPPEEEEEEEEEEE

* residual

* Apply to message blocks

* IntelliJ lied

* Suggestions

* Format before sending
 2025-02-09 00:05:43 -05:00
Anuken
aaf335d06c Closes #9903 2025-02-09 00:03:05 -05:00
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
19998b7e7f Merge branch 'nullotte-master' 2025-02-08 23:37:15 -05:00
Anuken
96b2f14426 Conflicts resolved 2025-02-08 23:37:09 -05:00
Anuken
aba9041fce Merge branch 'antsif-a-port-field' 2025-02-08 23:35:23 -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
SomeonesShade
1579a3b068 Merge branch 'Anuken:master' into balancing_burst-drill-optional-multiplier 2025-02-08 16:28:05 +08: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
28283b45e4 Merge remote-tracking branch 'origin/master' 2025-02-07 16:56:05 -05:00
Anuken
d5bf4f46e8 Console injection fix 2025-02-07 16:55:57 -05:00
a-big-fish-fish
b35e3207fc Update servers_v7.json (#10469) 2025-02-07 15:15:23 -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