mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-10 04:40:10 +07:00
Code Issues Packages Projects Releases Wiki Activity
18,606 Commits 4 Branches 160 Tags 2.3 GiB
3378475f6a
Commit Graph

18606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
3378475f6a Closes #6940 2025-02-09 11:49:26 -05:00
Anuken
3246c0c39b Configurable block build time 2025-02-09 11:24:34 -05:00
Anuken
e77708b55b Merge branch 'master' of https://github.com/Anuken/Mindustry 2025-02-09 11:20:04 -05:00
Anuken
925bfad30f Merge branch 'MEEPofFaith-mining-beam-weapon' 2025-02-09 11:19:47 -05:00
Anuken
0b09d0438a I'll do it myself 2025-02-09 11:19:31 -05:00
Anuken
02d56d27db Merge branch 'mining-beam-weapon' of https://github.com/MEEPofFaith/Mindustry into MEEPofFaith-mining-beam-weapon 2025-02-09 11:18:16 -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
Anuken
e57e47617c Closes #10302 2025-02-09 11:15:33 -05:00
Anuken
c3aabdcfc5 Closes #9498 2025-02-09 11:09:11 -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
Anuken
f6e9cffa9c Fixed #10484 2025-02-09 10:00:27 -05:00
MEEPofFaith
3e8a40b1e6 Mention default value 2025-02-08 21:52:31 -08:00
MEEPofFaith
70e9d6d4f8 oops 2025-02-08 21:45:28 -08:00
MEEPofFaith
6eb463f5ed oops 2025-02-08 21:44:56 -08:00
MEEPofFaith
35972a6fd9 oops 2025-02-08 21:44:33 -08:00
MEEPofFaith
78aa3b1848 Move back to UnitType 2025-02-08 21:43:56 -08:00
MEEPofFaith
3561562624 oopsies 2025-02-08 21:41:26 -08:00
Anuken
63568c5b34 Merge branch 'way-zer-pr-readwrite' 2025-02-09 00:40:34 -05:00
Anuken
44cd05f8b6 Privileged read/write fix 2025-02-09 00:40:29 -05:00
Anuken
b0f27c94bc
Merge branch 'master' into pr-readwrite 2025-02-09 00:38:18 -05:00
MEEPofFaith
81b576e8d3 Mine beam wobbles 2025-02-08 21:38:10 -08:00
MEEPofFaith
178f98b6ea Mining beam weapon 2025-02-08 21:33:43 -08:00
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
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