Commit Graph

17081 Commits

Author SHA1 Message Date
Ilya246
533c5a8afb fix shield arc ability (#9290)
* fix shield arc ability

* Update ShieldArcAbility.java
2023-11-18 08:35:10 -05:00
CuteMiao Xuwen
c3134bfb2f Update servers_v7.json (#9288) 2023-11-18 00:15:30 -05:00
Anuken
5d1ec319bc BulletType delayFrags workaround 2023-11-17 19:12:56 -05:00
Anuken
60c05587a7 Merge remote-tracking branch 'origin/master' 2023-11-17 18:47:59 -05:00
Anuken
4c33eed833 RailBulletType pierceCap 2023-11-17 18:47:52 -05:00
abcxyzDustry
e5b3488a05 Update servers_v7.json (#9286) 2023-11-17 08:18:48 -05:00
Semetrix
53967d4d70 Fix format, it was breaking my thing (#9283) 2023-11-16 11:01:42 -05:00
Gureumi
1c96da3d67 Update servers_v7.json (#9282) 2023-11-15 00:08:27 -05:00
Anuken
ba6d2fc9e5 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-14 21:38:30 -05:00
Anuken
70132436db arc 2023-11-14 21:38:26 -05:00
abcxyzDustry
0c801b5c32 Update servers_v7.json (#9280) 2023-11-14 21:33:36 -05:00
Anuken
299457cea5 Merge remote-tracking branch 'origin/master' 2023-11-14 20:08:22 -05:00
Anuken
1a763a5db3 Beam nodes now display graph status 2023-11-14 20:08:13 -05:00
Darkness
d138aa7568 Update Blocks.java (#9278) 2023-11-14 10:27:51 -05:00
abcxyzDustry
d780ee0434 Update servers_v7.json (#9276) 2023-11-13 12:38:07 -05:00
BalaM314
dd9927d72d Correctly read item capacity in linked vaults (#9273) 2023-11-13 02:10:45 -05:00
Anuken
a836a64b5b Merge remote-tracking branch 'origin/master' 2023-11-12 21:55:21 -05:00
Anuken
06bacab710 Crash fix 2023-11-12 21:55:16 -05:00
Phinner
d2595543f9 Update French translations (#9140)
* chore: Synchronize lines

* chore: Remove empty space in bundle.properties

* chore: Translate to baguette

* Fixes for baguette language translations (#3)

* fix fpr translate to bagette language

---------

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

* chore: Smolchange

* chore: Apply @VizardAlpha suggestions

---------

Co-authored-by: ZetaMap <56844734+ZetaMap@users.noreply.github.com>
2023-11-12 21:19:45 -05:00
Hahaa13
4c15e0e0fc Good Bye VnDustry (#9268)
* Update servers_v7.json

* Update servers_v7.json
2023-11-12 09:49:20 -05:00
Anuken
84eb35ec83 Merge remote-tracking branch 'origin/master' 2023-11-12 09:49:12 -05:00
Anuken
8282a1e1bb Fixed #9269 2023-11-12 09:49:07 -05:00
Arksource (ShardDustry [ES]) Owner
e317a0da9e Agua part 2 (#9266)
* Funny change

* Update servers_v7.json

* Update bundle_es.properties

Traductions for the bundle_es
By ArkSource

* Update servers_v7.json

* Agua prt 2
2023-11-11 20:48:15 -05:00
ApsZoldat
c4dc095adb Minor ban/unban instruction and join dialog changes (#9249)
* Make PlacementFragment update after world processor's ban/unban instructions, add buttons in community server list to add server as remote

* Small world processor ban/unban optimization
2023-11-11 09:55:01 -05:00
OSP
fbd0675f75 someone forgot to place comma 💀 (#9263) 2023-11-11 09:36:22 -05:00
XuwenMeimei
71beeae32a Update servers_v7.json (#9262) 2023-11-11 01:46:18 -05:00
Anuken
2ab3ad0330 Merge remote-tracking branch 'origin/master' 2023-11-10 02:00:20 -05:00
Anuken
9bf23bfcc8 Fixed #9260 2023-11-10 02:00:15 -05:00
KotMilkMeoWtwo
0da4f763b3 Update servers_v7.json (#9258)
I'm sorry, I made a mistake in the domain
2023-11-08 17:18:30 -05:00
Anuken
66b8a6f939 Reverted fix for #9257 2023-11-08 10:12:35 -05:00
Anuken
bc6434bb64 Merge remote-tracking branch 'origin/master' 2023-11-08 09:02:27 -05:00
Anuken
7f805f1712 Fixed #9257 2023-11-08 09:02:20 -05:00
StalkerBaran
afc97ebeda Update servers_v7.json (#9256)
Update "MeowIsland" IP servers (Dont ask about "minecraft" in IP names, I using host for minecraft and its working on mindustry(no jokes plz, I know... its stupid... but its working))
2023-11-08 08:56:12 -05:00
Anuken
e7a0d05895 Update servers_v7.json 2023-11-08 08:47:40 -05:00
Gerald Elder-Vass
498bf079ec Move Surge Alloy in ErekirTechTree to the correct position (#9253)
Surge Alloy can be first obtained on the "Ravine" map.
Thorium can be first obtained on the "Caldera" map.
The "Ravine" map must be unlocked and completed before the "Caldera" map can be accessed.
Since Surge Alloy isn't required to produce Thorium (and vice versa), they should appear at the same level of the tech tree, under Tungsten.

Signed-off-by: Gerald Elder-Vass <geraldev@hotmail.co.uk>
2023-11-07 22:44:22 -05:00
The1Crux
5c50356fb2 Update servers_v7.json (#9255)
Crux's Revelations servers addition
2023-11-07 22:38:53 -05:00
TheRadioactiveBanana
8f97625fa1 Eradication Mindustry IP change (#9241) 2023-11-07 21:41:13 -05:00
KotMilkMeoWtwo
d53ac76461 Update servers_v7.json (#9243)
I changed the host ip.
2023-11-07 16:13:50 -05:00
buthed010203
e4eadbbb7f jlfhuyksft (#9251) 2023-11-06 20:54:58 -05:00
Anuken
884482e9b6 Fixed #9248 2023-11-06 13:29:40 -05:00
Anuken
8f4c21799c Merge remote-tracking branch 'origin/master' 2023-11-06 08:59:40 -05:00
Anuken
c0ed5b48f7 Fixed #9247 2023-11-06 08:59:33 -05:00
PloVez
f0963ef302 Update bundle_ru.properties (#9244)
I've translated the settinG
2023-11-05 19:09:23 -05:00
Anuken
cdb6e3f85b Merge remote-tracking branch 'origin/master' 2023-11-04 17:38:56 -04:00
Anuken
6b2229ffb9 Fixed #9239 2023-11-04 17:38:50 -04:00
summoner001
24c2be4994 Update bundle_hu.properties (#9236)
Minor fixes
2023-11-04 14:00:32 -04:00
Ilya246
b4f01742cc overdrivable meltdown (#9234) 2023-11-04 10:56:24 -04:00
ErosAa2
e02bb988c6 Slight adjusment (#9231) 2023-11-04 09:12:21 -04:00
Anuken
318ff1b5ad Merge remote-tracking branch 'origin/master' 2023-11-03 18:56:10 -04:00
Anuken
2aaa861755 Fixed #9224 2023-11-03 18:56:02 -04:00