Commit graph

18898 commits

Author SHA1 Message Date
SeuEarth
b9c900490e
Update Korean translation (#10653)
* Update bundle_ko.properties

* Update description.txt

* Add files via upload

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
2025-04-21 09:33:43 -04:00
MonoChronos
36df5cb79e
Update bundle_fil.properties (#10669)
a
2025-04-21 09:33:25 -04:00
Haerbin23456
de350ea2c7
fix(tile): correct loop variable from i to j in nearby check (#10701)
In TilePreChangeEvent handling, the inner loop used `i` instead of `j` when checking nearby tiles, which could lead to incorrect nearSolid flag updates. This fixes the variable naming conflict.
2025-04-21 09:32:26 -04:00
ity
e401fa38a4
Fix simplified Chinese translation (#10694)
Fix Simplified Chinese translation

Fix simplified Chinese translation

Fix simplified Chinese translation

Fix simplified Chinese translation

Fix simplified Chinese translation

Fix simplified Chinese translation
2025-04-20 22:06:18 -04:00
Anuken
f1f610079d Removed tar fields requirement from plastanium compressor 2025-04-20 22:00:56 -04:00
Anuken
aa0c140123 Fixed origin power link connections 2025-04-20 22:00:41 -04:00
Anuken
5fce09c66e Fixed #10697 2025-04-20 15:43:38 -04:00
Anuken
a0e7dccc9c followAimSpeed for bullets 2025-04-20 11:54:21 -04:00
Anuken
0292285e78 Merge remote-tracking branch 'origin/master' 2025-04-19 22:39:32 -04:00
Anuken
a8571592bb Fungal pass description fix 2025-04-19 22:39:25 -04:00
Github Actions
067293717d Automatic bundle update 2025-04-20 00:42:16 +00:00
ity
467a64023c
Update bundle_zh_CN.properties (#10690) 2025-04-19 20:40:54 -04:00
EggleEgg
1f193780f4
Misc erekir turret rebalance (#10676)
* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* h

* h

* h

* dont mind me

* h

* h
2025-04-19 12:58:19 -04:00
Anuken
502cdf0b55 Merge remote-tracking branch 'origin/master' 2025-04-19 11:09:00 -04:00
Anuken
dc9d7d1b87 Fixed #10686 2025-04-19 11:08:51 -04:00
The4codeblocks
757188b270
named colors in %<color> (#10682)
* named colors in %<color>

* bad copying + needs closing bracket

* fix formatt

* some other (now fixed) bug gave me trouble, now I can remove this

* shouldn't need access to Pal now
2025-04-19 11:03:22 -04:00
Anuken
b07acb3ce1 Fixed #10687 2025-04-19 10:58:34 -04:00
Anuken
f8fdb541f7 Merge remote-tracking branch 'origin/master' 2025-04-19 00:46:28 -04:00
Anuken
65146f9a11 Reduced liquid transport explosiveness to mostly pre-capacity-increase levels 2025-04-19 00:46:17 -04:00
Github Actions
9964d84ed9 Automatic bundle update 2025-04-18 14:07:13 +00:00
Cardillan
c3e2bcf2e7
Adds LAccess.bufferUsage, fixes wrong property names for displayWidth and displayHeight (#10679)
* Adds LAccess.bufferUsage - sensable property returning number of unprocessed commands in the graphics buffer of a display.
Fixes wrong property keys (lacess.* -> laccess.*) of the recently added displayWidth and displayHeight properties.

* Revert unnecessary bundle updates
2025-04-18 10:05:56 -04:00
The4codeblocks
a394084f37
fix clipSize for overhanging canvases (#10678)
(should've included it in the other PR.....)
2025-04-18 09:29:39 -04:00
Github Actions
71e844c6fb Automatic bundle update 2025-04-17 23:24:59 +00:00
Anuken
93645aeeb7 Fixed Sea Port unit production 2025-04-17 19:23:48 -04:00
Anuken
151930de6d Fixed incorrect condition 2025-04-17 16:31:01 -04:00
Anuken
264d13f827 Closes Anuken/Mindustry-Suggestions/issues/5537, partially implements Anuken/Mindustry-Suggestions/issues/5535 2025-04-17 16:28:56 -04:00
Anuken
233acfa6f5 Fixed #10671 2025-04-17 15:47:24 -04:00
Anuken
20425fde14 Merge remote-tracking branch 'origin/master' 2025-04-17 14:38:52 -04:00
Anuken
c4a54ec103 Crash fix, minor duct bridge cost reduction 2025-04-17 14:38:39 -04:00
The4codeblocks
222e3436b3
fix clipSize for overhanging displays (#10673)
* fix clipSize for overhanging displays

* Update contributors
2025-04-17 12:22:34 -04:00
Anuken
defa3a5887 Merge remote-tracking branch 'origin/master' 2025-04-16 18:48:50 -04:00
Anuken
1bf2e8d818 Minor tiled display cost reduction 2025-04-16 18:48:43 -04:00
EggleEgg
9e84fc3167
Disperse ammo rebalance (#10670)
* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* Update Blocks.java

* Almost missed the interaction
2025-04-16 17:21:26 -04:00
Anuken
bf0142d8c4 Merge remote-tracking branch 'origin/master' 2025-04-16 16:51:03 -04:00
Anuken
1838a8ee12 Merge branch 'tiled-logic-displays' of https://github.com/Anuken/Mindustry 2025-04-16 16:50:52 -04:00
buthed010203
7d707a431f
Fix contains checking wrong variable (#10668) 2025-04-16 15:07:33 -04:00
Anuken
9cadf06c92 Minor optimization 2025-04-16 13:06:15 -04:00
Anuken
9db19fafe7 Fixed legacy launch pads in extraction outpost 2025-04-16 10:22:43 -04:00
Anuken
3249d042d1 Merge remote-tracking branch 'origin/master' 2025-04-16 00:19:09 -04:00
Anuken
f994d2929f Fungal pass added to T2 unit requirements 2025-04-16 00:18:46 -04:00
EggleEgg
3892416993
Scathe ammo rebalance (#10660)
* Update Blocks.java

* Update Blocks.java
2025-04-16 00:08:35 -04:00
WMF
39834f21db
ServerControl was broken, yet again (#10661) 2025-04-15 15:42:45 -04:00
Anuken
b45afe1f4c comment 2025-04-15 15:39:28 -04:00
Anuken
cc4c18211b Merge remote-tracking branch 'origin/tiled-logic-displays' into tiled-logic-displays 2025-04-15 12:16:22 -04:00
Anuken
841ea4f78e Retain display contents when merging 2025-04-15 12:16:09 -04:00
Github Actions
056f56db95 Automatic bundle update 2025-04-15 03:23:38 +00:00
Anuken
e2ae2e4f71 Tiled background for tiled logic display 2025-04-14 23:20:29 -04:00
Anuken
1a00264902 Merge branch 'master' of https://github.com/Anuken/Mindustry into tileable-logic-displays
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/logicids.dat
2025-04-14 22:50:47 -04:00
Anuken
666c68edb1 Fixed #10656 2025-04-14 20:36:07 -04:00
Anuken
bfeb8ccc38 Fixed command mode button not showing up after toggling editor blocks on mobile 2025-04-14 20:02:01 -04:00