Commit Graph

19177 Commits

Author SHA1 Message Date
Anuken
b6195cc31e Merge remote-tracking branch 'origin/master' 2025-07-01 19:38:51 -04:00
Anuken
c035cf00dd Closes #10884 2025-07-01 19:38:44 -04:00
drikodjiqers
1a07b0daef Updated bundle_fil.properties (#10816)
* Updated bundle_fil.properties

fixed some mistakes and added some more translations

* Update bundle_fil.properties

this is a thing?
anyways added some more
2025-07-01 19:27:11 -04:00
DVD27
a61b5b0eae Update bundle_fr.properties (#10866)
* Update bundle_fr.properties

Add some translation, and fix some other

* Update bundle_fr.properties

Change label for casual

* Update bundle_fr.properties

Correct a value, seem uncomprehensible

* Apply suggestions from code review

Accept all suggestions

Co-authored-by: Phinner <62483793+phinner@users.noreply.github.com>

---------

Co-authored-by: Phinner <62483793+phinner@users.noreply.github.com>
2025-07-01 19:26:48 -04:00
Anuken
ecb3984110 Don't update drills when there is nothing to drill 2025-06-30 19:00:49 -04:00
Anuken
06fff3efac Merge branch 'SomeonesShade-balancing-payload_system' 2025-06-30 14:52:08 -04:00
Anuken
4f9fb2d7fb Merge branch 'balancing-payload_system' of https://github.com/SomeonesShade/Mindustry into SomeonesShade-balancing-payload_system 2025-06-30 14:51:58 -04:00
SomeonesShade
80740c0948 Merge branch 'master' into balancing-payload_system 2025-06-30 18:15:08 +08:00
Anuken
0234c448db Incinerator status fix 2025-06-29 19:57:12 -04:00
Anuken
97de3c52bd Merge remote-tracking branch 'origin/master' 2025-06-27 23:57:18 -04:00
Anuken
5d9f519426 Fixed #10974 2025-06-27 23:56:58 -04:00
Phinner
c677b5cb17 Remove CN from servers_v7.json (#10971) 2025-06-27 12:08:03 -04:00
xem8k5
0df2289d40 Update servers_v7.json (#10970) 2025-06-27 12:07:45 -04:00
Anuken
bbc8d77386 Steam achievement for killing a unit with a mass driver 2025-06-26 20:14:42 -04:00
Agzam4
b7cb080f36 Mass driver bullets are destroyed like the blocks with items (#10969)
* Mass driver bullets explosions like the blocks

* Better code style

---------

Co-authored-by: TempUser <temp@mail>
2025-06-26 18:51:16 -04:00
Anuken
34032f63a5 Merge remote-tracking branch 'origin/master' 2025-06-25 14:47:14 -04:00
Anuken
908b0a2dc5 Fixed rare explosion damage freeze 2025-06-25 14:47:05 -04:00
Github Actions
2a47725362 Automatic bundle update 2025-06-23 18:38:08 +00:00
Anuken
9bd1c7d783 Hidden sector submission thread link button 2025-06-23 14:36:29 -04:00
Anuken
40828a9ccc Merge remote-tracking branch 'origin/master' 2025-06-23 12:19:20 -04:00
Anuken
b3cdec91b8 Fixed #10962 2025-06-23 12:19:13 -04:00
Cardillan
289889a685 Small canvas read/write fixes (#10955) 2025-06-21 21:20:43 -04:00
Anuken
d6ee68a371 Merge remote-tracking branch 'origin/master' 2025-06-21 21:18:32 -04:00
Anuken
4f04bf4b11 Fixed #10956 2025-06-21 21:18:25 -04:00
Tegas Aziz
48d09decf5 Update README.md (#10954) 2025-06-21 21:15:57 -04:00
Anuken
7447e1f2bb Fixed #10948 2025-06-19 14:21:42 -04:00
Anuken
78e5ff2636 Another possible sublimate fix 2025-06-18 21:08:11 -04:00
Anuken
f7c72e950c Illuminator rendering optimization 2025-06-18 20:11:06 -04:00
Anuken
90603561ac Merge remote-tracking branch 'origin/master' 2025-06-18 19:14:18 -04:00
Anuken
8569eed795 Closes Anuken/Mindustry-Suggestions/issues/5674 2025-06-18 19:14:10 -04:00
Redstonneur1256
b73c85ff75 Quad marker tweaks (#10787)
* Don't clamp UV on repeat textures

* Cleanup
2025-06-18 19:05:08 -04:00
The4codeblocks
0185b08ca7 canvas read/write + multiplayer overwrite bug fix (#10899)
* stuff

* Update CanvasBlock.java

* canvas read/write

* updated flag

* dispose on every possible closing condition (back/cancel/ok)

* arraycopy

* hide listener

* partial colons

* fix updated and dedupe closing

* typo?
2025-06-17 12:36:42 -04:00
Anuken
7a33de8fe3 Fixed #10942 2025-06-17 12:23:49 -04:00
Anuken
1e3b6b7524 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gradle.properties
2025-06-17 11:20:35 -04:00
Anuken
536f4db5fe Sublimate collision fix 2025-06-17 11:20:21 -04:00
grely
2d14cd2232 Update servers_v7.json | Okay, this looks like crap. (#10941) 2025-06-16 13:27:12 -04:00
grely
7a1279fc30 Update servers_v7.json | replaced ip's (#10935)
* Update servers_v7.json | replaced ip's

* Update servers_v7.json

* Update servers_v7.json
2025-06-16 12:48:12 -04:00
Волшебник
067e24318c Update servers_v7.json (#10937)
For new servers
2025-06-15 20:23:23 -04:00
Redstonneur1256
c27eac9bed Marker outline control (#10931)
* Marker `outline` control

* Text/ShapeText marker outline
2025-06-15 15:28:20 -04:00
Anuken
1465916bed Merge remote-tracking branch 'origin/master' 2025-06-15 12:40:17 -04:00
Anuken
3cffbec92c Don't fill core with hidden items 2025-06-15 12:40:09 -04:00
Jason
d79802836c fix typo (#10934)
Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
2025-06-14 13:27:59 -04:00
Jason
fbf41641d3 Update servers_v7.json (#10929)
Re-added CN events server
2025-06-14 11:44:03 -04:00
Github Actions
77c4f27046 Automatic bundle update 2025-06-14 15:22:35 +00:00
Cardillan
981e954c61 Sense number of graphics operations (#10898)
* Sense number of graphics operations

* int to long
2025-06-14 11:21:18 -04:00
Anuken
96b0544261 Fixed #10927 2025-06-14 10:29:51 -04:00
Anuken
a8700ef441 Merge remote-tracking branch 'origin/master' 2025-06-13 19:02:46 -04:00
Anuken
f4e8325238 Fixed player stuck shooting in certain situations 2025-06-13 19:02:40 -04:00
Alpha
807517e828 Update servers_v7.json (#10903)
Changed domains from:
mindustry.kalpe.games
to
mv7-survival.kalpe.games
2025-06-13 18:18:50 -04:00
abcxyzDustry
339f6fcc9c Update servers_v7.json (#10924)
we negotiated with the mindustry tool programmer, and he agreed to let us merge into one until v8 is actually released, and before leading to the above agreement we used to have a separate group for our server, why did you delete it, hope you agree to approve for us
2025-06-13 18:07:44 -04:00