Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-01 18:50:27 +03:00
Code Issues Packages Projects Releases Wiki Activity
21,457 Commits 7 Branches 203 Tags
b3317f3d4d7c9b201d03a39be17bae2bbda90169
Commit Graph
21457 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken b3317f3d4d Fixed #12620 2026-09-09 19:57:43 -04:00
Anuken 63b2069e96 Merge remote-tracking branch 'origin/master' 2026-09-09 18:10:41 -04:00
Anuken 52232dc2ee Fixed print statement field width 2026-09-09 18:10:35 -04:00
Github Actions 64bc6d3ac0 Automatic bundle update 2026-09-09 16:47:29 +00:00
Anuken 124dcc67aa Merge remote-tracking branch 'origin/master' 2026-09-09 12:46:48 -04:00
Anuken 2276f471f2 Merge branch 'logic-editor-autowrap' 
# Conflicts:
#	core/src/mindustry/logic/LStatements.java
 2026-09-09 12:45:27 -04:00
Anuken 2837f2cad2 More layout fixes 2026-09-09 12:43:04 -04:00
Anuken 6407a48973 Major cleanup of layout 2026-09-09 11:20:20 -04:00
Cardillan f02d919b64 Properly compute UTF16 sizes for escapes (#12616) 2026-09-09 10:17:14 -04:00
Anuken 5566674c29 Fixed #12615 2026-09-09 10:15:55 -04:00
Anuken 80a99eb031 More UI fixes 2026-09-09 09:07:37 -04:00
Anuken cfe01850aa UI bugfixes 2026-09-09 08:51:33 -04:00
Anuken 48158883c1 Fixed inconsistent search bar in rules 2026-09-08 23:41:14 -04:00
Anuken d71be5ecb1 Fixed #12613 2026-09-08 17:57:31 -04:00
Anuken 1ba71a14f7 Merge remote-tracking branch 'origin/master' 2026-09-08 10:10:57 -04:00
Anuken 12157feeca Logic \uXXXX escape support 2026-09-08 10:10:48 -04:00
Github Actions 200f4d42be Automatic bundle update 2026-09-08 06:42:43 +00:00
EggleEgg 201f606383 Crucible output scales with attribute boost (#11552) 2026-09-08 02:42:02 -04:00
Anuken cf8b1c6b34 Escape round-trip fix 2026-09-08 02:29:31 -04:00
Anuken 04452e6ba8 Logic parser improvements for quote/escape handling + unit tests 2026-09-08 01:35:36 -04:00
Anuken 9ca00b5935 Merge remote-tracking branch 'origin/master' 2026-09-08 01:01:41 -04:00
Anuken 05999c9759 Pathfinding fixes 2026-09-08 01:01:34 -04:00
Jason d23f113806 update allure to latest commit (#12610) 2026-09-07 22:21:00 -04:00
Anuken cc36b51bad Fixed #12611 2026-09-07 22:20:32 -04:00
Anuken 3787b6308c minor tweaks 2026-09-07 19:32:15 -04:00
Anuken 7e2d57247d minor tweaks 2026-09-07 14:25:41 -04:00
Anuken 80a2eef239 Removed row() 2026-09-07 14:17:48 -04:00
Anuken 16ee499f75 Longer fields, width cap 2026-09-07 13:55:49 -04:00
Anuken a9ff32df12 Merge branch 'master' of https://github.com/Anuken/Mindustry into logic-editor-autowrap 
# Conflicts:
#	gradle.properties
 2026-09-07 13:37:49 -04:00
Anuken 37c1b6ac1e Merge remote-tracking branch 'origin/master' 2026-09-07 13:01:55 -04:00
Anuken 54e5f3bcf6 Reduced standard conveyor to 5 items/sec (https://github.com/Anuken/Mindustry/pull/12369#issuecomment-4984396153) 2026-09-07 13:01:41 -04:00
Vector 2290685999 Update bundle_es.properties (#12455) 
* Update bundle_es.properties

* Update bundle_es.properties

* Atolls tutorial

* Frozen Forest tutorials

Updated Spanish translations for various game mechanics and instructions.

* Scathe ammo

* Update bundle_es.properties

* logic strings

* Update bundle_es.properties

* some settings translations

* Update bundle_es.properties

* Update bundle_es.properties

* there we go

* locale config

* test

* ucontrol test

Updated Spanish translations for various labels and objectives.

* target dummy

* Update bundle_es.properties

* Update bundle_es.properties

sensor and effect translations

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties
 2026-09-07 12:43:56 -04:00
Anuken f3cbb54af5 Merge remote-tracking branch 'origin/master' 2026-09-07 12:41:19 -04:00
Anuken 85446f3284 Fixed unit movement regression caused by #11613 / Alternate unit mining effect (closes #12605) 2026-09-07 12:41:05 -04:00
Jason ba93ccfc3e update Allure to an archive public repo (#12607) 
* update Allure to an archive public repo

* updated SHA

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

---------

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
 2026-09-07 12:35:53 -04:00
EggleEgg a1e7aad19d Bugfix: show random lightning length in corvus stats (#12606) 2026-09-07 12:35:41 -04:00
redloong 9d07ba06ab Update unbindKey translation to '解绑' (#12608) 2026-09-07 12:19:29 -04:00
Anuken 5a0c4bfc41 Texture streaming Android compat fix 2026-09-06 17:03:39 -04:00
Anuken 58ed13fc96 Mining color alternative 2026-09-06 16:19:42 -04:00
Anuken 1f6c9eac65 Fixed wiki crash 2026-09-06 12:23:14 -04:00
Anuken bf3d400ca5 Merge remote-tracking branch 'origin/master' 2026-09-06 10:48:44 -04:00
Anuken e37c2f1ec2 Fixed #12603 2026-09-06 10:48:38 -04:00
Github Actions d95a3ef6aa Automatic bundle update 2026-09-06 14:39:33 +00:00
JniTrRny c2f7bddb0f Update bundle_th.properties (#12599) 
* quick update

* 2much2translate
 2026-09-06 10:38:42 -04:00
Anuken ec656a63eb Merge remote-tracking branch 'origin/master' 2026-09-06 10:38:03 -04:00
Anuken 06f2dc7032 Fixed #12600 2026-09-06 10:37:54 -04:00
summoner 0e5189e1b7 Translation: Update bundle_hu.properties (#12601) 
* Translation: Update bundle_hu.properties

Translate new strings
Fix translation

* Translation: Update bundle_hu.properties

Fixing line wrapping
fix wording
 2026-09-06 10:32:42 -04:00
Cardillan c477c767c5 Make the Back button first in the keybind dialog (#12604) 2026-09-06 10:32:35 -04:00
Anuken c81d0eb025 Merge remote-tracking branch 'origin/master' 2026-09-05 16:14:42 -04:00
Anuken 7494e9a1a8 Update bundle_id_ID (#12580) 2026-09-05 16:14:34 -04:00