Commit Graph

17055 Commits

Author SHA1 Message Date
2ab3ad0330 Merge remote-tracking branch 'origin/master' 2023-11-10 02:00:20 -05:00
9bf23bfcc8 Fixed #9260 2023-11-10 02:00:15 -05:00
0da4f763b3 Update servers_v7.json (#9258)
I'm sorry, I made a mistake in the domain
2023-11-08 17:18:30 -05:00
66b8a6f939 Reverted fix for #9257 2023-11-08 10:12:35 -05:00
bc6434bb64 Merge remote-tracking branch 'origin/master' 2023-11-08 09:02:27 -05:00
7f805f1712 Fixed #9257 2023-11-08 09:02:20 -05:00
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
e7a0d05895 Update servers_v7.json 2023-11-08 08:47:40 -05:00
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
5c50356fb2 Update servers_v7.json (#9255)
Crux's Revelations servers addition
2023-11-07 22:38:53 -05:00
8f97625fa1 Eradication Mindustry IP change (#9241) 2023-11-07 21:41:13 -05:00
d53ac76461 Update servers_v7.json (#9243)
I changed the host ip.
2023-11-07 16:13:50 -05:00
e4eadbbb7f jlfhuyksft (#9251) 2023-11-06 20:54:58 -05:00
884482e9b6 Fixed #9248 2023-11-06 13:29:40 -05:00
8f4c21799c Merge remote-tracking branch 'origin/master' 2023-11-06 08:59:40 -05:00
c0ed5b48f7 Fixed #9247 2023-11-06 08:59:33 -05:00
f0963ef302 Update bundle_ru.properties (#9244)
I've translated the settinG
2023-11-05 19:09:23 -05:00
cdb6e3f85b Merge remote-tracking branch 'origin/master' 2023-11-04 17:38:56 -04:00
6b2229ffb9 Fixed #9239 2023-11-04 17:38:50 -04:00
24c2be4994 Update bundle_hu.properties (#9236)
Minor fixes
2023-11-04 14:00:32 -04:00
b4f01742cc overdrivable meltdown (#9234) 2023-11-04 10:56:24 -04:00
e02bb988c6 Slight adjusment (#9231) 2023-11-04 09:12:21 -04:00
318ff1b5ad Merge remote-tracking branch 'origin/master' 2023-11-03 18:56:10 -04:00
2aaa861755 Fixed #9224 2023-11-03 18:56:02 -04:00
b3cddb0d82 uncap fsh shield damage (#9230) 2023-11-03 11:19:49 -04:00
fb53ea735d Update bundle_hu.properties (#9229)
Fix minor translation.
hint.derelict = .... updated
Ready to merge
2023-11-03 09:34:14 -04:00
f606589173 Merge remote-tracking branch 'origin/master' 2023-11-02 22:46:22 -04:00
5b5c5d0365 Fixed off-by-one team sprite in editor 2023-11-02 22:46:15 -04:00
e98c112378 Update bundle_hu.properties (#9227)
The last one. Sorry! :( Ready to merge.
2023-11-02 11:45:08 -04:00
9eaf9ddddd Automatic bundle update 2023-11-02 15:03:05 +00:00
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
7b686d56a8 Scepter buff (#9226)
* Update UnitTypes.java

* Update UnitTypes.java

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

* whar ?
2023-11-02 08:58:26 -04:00
e15a4e6bdf Merge remote-tracking branch 'origin/master' 2023-11-01 19:13:32 -04:00
ad6c9a5029 Fixed basin tank doors 2023-11-01 19:13:26 -04:00
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
9c10a09438 Simplification 2023-11-01 12:23:48 -04:00
90487f4120 Merge remote-tracking branch 'origin/master' 2023-10-31 23:59:41 -04:00
67e35af718 Fixed #8917 2023-10-31 23:59:34 -04:00
83c169ae01 Removed v7 server from v6 list 2023-10-31 19:37:48 -04:00
179dfc8d56 Update io ips (#9221) 2023-10-31 19:34:14 -04:00
5fe4b9a36c alignment, comments 2023-10-31 12:38:55 -04:00
e1ffce2fd8 Merge remote-tracking branch 'origin/master' 2023-10-31 12:20:23 -04:00
1d051b5c16 Add setProp of speed/armor 2023-10-31 12:20:18 -04:00
b0612fa33d Automatic bundle update 2023-10-31 15:25:06 +00:00
3e80541c2d Merge remote-tracking branch 'origin/master' 2023-10-31 11:24:11 -04:00
e5047d752d Added dynamic status for custom speed/health/etc 2023-10-31 11:24:03 -04:00
d06df37d02 Update servers_v7.json (#9219) 2023-10-31 10:20:39 -04:00
968fa2f9b1 Derelict repair rule 2023-10-30 21:01:04 -04:00