Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,582 Commits 4 Branches 180 Tags
6eb463f5ed294d5678e647839b026662441f6cd7
Commit Graph

6433 Commits

Author SHA1 Message Date
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
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
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
Anuken
f8ff370dbe Merge branch 'master' into port-field 2025-02-08 19:36:26 -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
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
kay
1aae8e9368 name 2025-02-08 01:14:47 +07:00
Anuken
423d635efe More base generation fixes 2025-02-06 23:11:11 -05:00
Anuken
e630f21aae Base part fixes 2025-02-06 20:44:25 -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
Github Actions
89ae26e6b5 Automatic bundle update 2025-02-06 19:28:33 +00:00
Anuken
588faad6f9 Rule for extra core no-build radius per-team 2025-02-06 14:27:35 -05:00
Github Actions
7aa70aee15 Automatic bundle update 2025-02-06 18:32:49 +00:00
ApsZoldat
dcddabf8c1 Rules dialog changes (#9792) 
* Info buttons on mobile

* Better banned content dialogs

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-06 13:32:02 -05:00
Nikrea2
4680687369 Update bundle_it.properties (#8109) 
Translated line 16
Translated line 151,152
Translated line 631, 632
Fixed a typo on line 635 ("rilevaato" > "rilevato")
Fixed a typo on line 659 ("possiediate" > "possediate")
Fixed a typo on line 696 ("abandona" > "abbandona")
Fixed a typo on line 1011 ("Animazionw" > "Animazione")
Translated "cyanogen" to "cianogeno"
Fixed a typo on line 1739 ("trascinadalla" >  "trascina dalla")
Fixed a typo on line 1744 ("Attivita" > "Attiva")

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-06 12:54:53 -05:00
Github Actions
0d89807da1 Automatic bundle update 2025-02-06 17:19:19 +00:00
Anuken
3ec6a74c1f Merge 2025-02-06 12:17:56 -05:00
Github Actions
dc8babfcee Automatic bundle update 2025-02-06 16:51:14 +00:00
Berros007
52fc616c96 Update bundle_cs.properties (#9625) 
Last translate - Erekir

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-06 11:50:18 -05:00
Github Actions
2f52178e3c Automatic bundle update 2025-02-06 16:45:10 +00:00
1.797693e308
017e7c472e Add files via upload (#9852) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-06 11:44:16 -05:00
Anuken
8aa1a9dbed Merge remote-tracking branch 'origin/master' 2025-02-06 11:34:58 -05:00
Anuken
3edbec5275 Closes #9956 2025-02-06 11:34:52 -05:00
galqawala
4f96cd35f2 Fi translation improvements (#10337) 
* Update bundle_fi.properties stat.bullet plural

* Update bundle_fi.properties sector descriptions (mostly)

* Update bundle_fi.properties objective

mission of the world -> mission of the area

* Update bundle_fi.properties no more "polku"

I wouldn't use "polku" for "campaign" or "path". Polku is more like a trail. I replaced then with "reitti" (route) and "kampanja" (campaign).
 2025-02-06 11:32:00 -05:00
Github Actions
7fbcfe2520 Automatic bundle update 2025-02-06 16:31:29 +00:00
Anuken
9a60275652 Closes #10014 2025-02-06 11:30:34 -05:00
Github Actions
8ed4f80043 Automatic bundle update 2025-02-06 00:33:03 +00:00
DinoWattz
c5d3e50e71 Update bundle_pt_BR.properties (#9096) 
* Update bundle_pt_BR.properties

Missing words and grammar fixes

* Update bundle_pt_BR.properties-fix

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-05 19:32:18 -05:00
Github Actions
2711d87206 Automatic bundle update 2025-02-06 00:09:31 +00:00
ninathedev
760075216b Update bundle_fil.properties (#10164) 
not yet finished

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-05 19:08:38 -05:00
Github Actions
14cf68b1d6 Automatic bundle update 2025-02-06 00:07:30 +00:00
TheThatFSFC
0691ee4a0c Update bundle_ru.properties (#10144) 
* Update bundle_ru.properties

Now everything is good!

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-05 19:06:43 -05:00
Teamblur
d030724292 Update bundle_et.properties (#9468) 
Added new translations and updated old ones with better wording and grammar.
 2025-02-05 19:03:08 -05:00
Github Actions
c670f6c5e3 Automatic bundle update 2025-02-06 00:01:34 +00:00
Feather83
38cba7a223 Update bundle_bg.properties (#9045) 
Reviewing the older text and translating anything new or left-out.

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-05 19:00:47 -05:00
Wiktor Perskawiec
f825e17be0 Update pl translation (#9831) 2025-02-05 18:56:40 -05:00
Github Actions
48bf8aa078 Automatic bundle update 2025-02-05 23:55:20 +00:00