Commit Graph

18649 Commits

Author SHA1 Message Date
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
Anuken
084e97ceab Merge branch 'code-explorer786-logic-jumps' 2025-02-10 15:51:17 -05:00
Anuken
9a9e4611cd Logic jump PR cleanup 2025-02-10 15:51:02 -05:00
Anuken
27bc2918fd Uncomment flaky test 2025-02-10 14:52:40 -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
c32b304c78 Sync core units with spawner block database tab 2025-02-10 13:50:27 -05:00
patatayui
5f8f0140a2
Allow conveyors/ducts to use duct/conveyor bridges (#10179)
* Allow conveyors/ducts to use duct/conveyor bridges

* Apply suggestions from code review

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-10 11:04:14 -05:00
KochiyaUenehaaa
73bde0d3af
fixed RepairTower (#10489)
* fixed RepairTower

* oops
2025-02-10 10:46:24 -05:00
Anuken
90dc291b66 Unit assembler shader fix 2025-02-09 22:12:59 -05:00
nullevoy
8ee02562c3
Make assembler plans support items and liquids, allow changing sap bullet regions (#9413)
* make assembler plans support items and liquids, allow changing sap bullet regions

* leftover copypaste

* hhhhhhhhhhhhhhh

* may want to add this as well

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-02-09 21:53:52 -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
Anuken
d20f9ebb17 Support for sector presets without unlock requirements 2025-02-09 15:52:30 -05:00
Anuken
f77803dffc Merge remote-tracking branch 'origin/master' 2025-02-09 13:05:59 -05:00
Anuken
8ee00e0c3a Fixed broken team palettes 2025-02-09 13:05:51 -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
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