Commit Graph

17115 Commits

Author SHA1 Message Date
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
Ilya246
b3cddb0d82
uncap fsh shield damage (#9230) 2023-11-03 11:19:49 -04:00
summoner001
fb53ea735d
Update bundle_hu.properties (#9229)
Fix minor translation.
hint.derelict = .... updated
Ready to merge
2023-11-03 09:34:14 -04:00
Anuken
f606589173 Merge remote-tracking branch 'origin/master' 2023-11-02 22:46:22 -04:00
Anuken
5b5c5d0365 Fixed off-by-one team sprite in editor 2023-11-02 22:46:15 -04:00
summoner001
e98c112378
Update bundle_hu.properties (#9227)
The last one. Sorry! :( Ready to merge.
2023-11-02 11:45:08 -04:00
Github Actions
9eaf9ddddd Automatic bundle update 2023-11-02 15:03:05 +00:00
summoner001
e139baf858
Update bundle_hu.properties - The finishing touches (#9207)
* Update bundle_hu.properties - The finishing touches

Correction, completion and correction of errors in the Hungarian translation.

Sorry for the many commits, this is the first time I've done this.

This is the final corrections. If you find any problem, I will repair it asap.

* Update bundle_hu.properties

Filling in a missing translation

* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation

* Update bundle_hu.properties

Correction, completion and correction of errors in the Hungarian translation

delete unnecessary spaces

* Update bundle_hu.properties

Minor fixes

* Update bundle_hu.properties

minor fixes
fixing typos

* Update bundle_hu.properties

minor fixes

* Update bundle_hu.properties

new translations

1263 - rules.derelictrepair = Allow Derelict Block Repair

Minor fixes

* Update bundle_hu.properties

more fixes

* Update bundle_hu.properties

Minor fixes

* Update bundle_hu.properties

fixes

* Update bundle_hu.properties

fixes

* Update bundle_hu.properties

fixes

* Update bundle_hu.properties

minor fixing
2023-11-02 11:02:26 -04:00
ErosAa2
7b686d56a8
Scepter buff (#9226)
* Update UnitTypes.java

* Update UnitTypes.java

* nevermind
2023-11-02 09:01:59 -04:00
Github Actions
1cdbb562f8 Automatic bundle update 2023-11-02 12:59:20 +00:00
Ilya246
6014f2353a
foreshadow overhaul (#9223)
* overhaul foreshadow

* whar ?
2023-11-02 08:58:26 -04:00
Anuken
e15a4e6bdf Merge remote-tracking branch 'origin/master' 2023-11-01 19:13:32 -04:00
Anuken
ad6c9a5029 Fixed basin tank doors 2023-11-01 19:13:26 -04:00
Anuken
dd7cd827b9
Removed Omega network (see description)
Multiple staff members of the Omega network have been DDOSing other server networks. It's been pretty obvious for a while, but enough is enough.

No, I will not re-add the network. Don't bother commenting or PMing me on Discord.
2023-11-01 14:44:00 -04:00
Anuken
9c10a09438 Simplification 2023-11-01 12:23:48 -04:00
Anuken
90487f4120 Merge remote-tracking branch 'origin/master' 2023-10-31 23:59:41 -04:00
Anuken
67e35af718 Fixed #8917 2023-10-31 23:59:34 -04:00