Commit Graph

6614 Commits

Author SHA1 Message Date
Anuken
8efd62e668 PR cleanup 2025-02-10 17:03:46 -05:00
Anuken
5a56825801 Merge branch 'mod-dependencies' of https://github.com/MEEPofFaith/Mindustry into MEEPofFaith-mod-dependencies 2025-02-10 16:31:56 -05:00
Github Actions
46018a57b6 Automatic bundle update 2025-02-10 21:30:24 +00:00
ivan71kmayshan27
0d96a68e84 Allow configuration of minimum and maximum camera distance in main game screen (#7603)
* Variable min and max zoom

* Variable min and max zoom

* Variable min and max zoom

---------

Co-authored-by: ivan <ikamyshan@evolution.com>
Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-10 16:09:35 -05:00
Anuken
fec91eb157 Merge branch 'balancing_burst-drill-optional-multiplier' of https://github.com/SomeonesShade/Mindustry into SomeonesShade-balancing_burst-drill-optional-multiplier 2025-02-10 15:51:47 -05:00
Github Actions
a7482f78ef Automatic bundle update 2025-02-10 19:25:38 +00:00
Anuken
7a6222aa18 Revert "Allow markers to be used as light sources (#9733)" (#10490)
This reverts commit 8626082068.
2025-02-10 14:24:46 -05:00
Anuken
a3987fde71 More base schematics 2025-02-10 14:00:44 -05:00
Anuken
90dc291b66 Unit assembler shader fix 2025-02-09 22:12:59 -05:00
summoner001
e7e1e1f786 Update bundle_hu.properties (#10487)
* Update bundle_hu.properties

Fix consistency of the word lekérés/lekérdezés (fetch)
Sorry no more bundlehu fixes today. This is the last one for this translation.

* Update bundle_hu.properties

Translating new strings
2025-02-09 21:51:24 -05:00
Github Actions
9f2997982d Automatic bundle update 2025-02-09 17:11:32 +00:00
Redstonneur1256
8626082068 Allow markers to be used as light sources (#9733)
* Allow markers to be used as light sources

* Better light source markers

* Move PointMarker drawLight to LightMarker

* Add a rule for unit lights

* Optimize marker rendering

* Update core/assets/bundles/bundle.properties

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-09 12:10:45 -05:00
summoner001
f664aeae9b Update bundle_hu.properties (#10486)
Translate new strings. (Sorry, but I just noticed that there were several changes in the bundle. These had escaped my attention until now.)
Fix minor consistency and misspells.
2025-02-09 11:15:49 -05:00
summoner001
f6f4ad1afb Update bundle_hu.properties (#10485)
Update bundle_hu.properties
Translating new string.
Follow the changes of the english bundle:
  -rewording
  -icon changes
Minor consistency fix
2025-02-09 10:02:16 -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
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
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
SomeonesShade
1579a3b068 Merge branch 'Anuken:master' into balancing_burst-drill-optional-multiplier 2025-02-08 16:28:05 +08: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