Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,544 Commits 4 Branches 180 Tags
15491afe498a4f044415d11f643379beaa5d6ae7
Commit Graph
17544 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ApsZoldat 6dff68e7d9 Texture marker implementation 2023-11-07 22:42:42 +03:00
buthed010203andGitHub 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
PloVezandGitHub 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
summoner001andGitHub 24c2be4994 Update bundle_hu.properties (#9236) 
Minor fixes
 2023-11-04 14:00:32 -04:00
Ilya246andGitHub b4f01742cc overdrivable meltdown (#9234) 2023-11-04 10:56:24 -04:00
ErosAa2andGitHub 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
Ilya246andGitHub b3cddb0d82 uncap fsh shield damage (#9230) 2023-11-03 11:19:49 -04:00
summoner001andGitHub 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
summoner001andGitHub 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
summoner001andGitHub 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
ErosAa2andGitHub 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
Ilya246andGitHub 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
AnukenandGitHub 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
AnukenandGitHub 83c169ae01 Removed v7 server from v6 list 2023-10-31 19:37:48 -04:00
buthed010203andGitHub 179dfc8d56 Update io ips (#9221) 2023-10-31 19:34:14 -04:00
Anuken 5fe4b9a36c alignment, comments 2023-10-31 12:38:55 -04:00
Anuken e1ffce2fd8 Merge remote-tracking branch 'origin/master' 2023-10-31 12:20:23 -04:00
Anuken 1d051b5c16 Add setProp of speed/armor 2023-10-31 12:20:18 -04:00
Github Actions b0612fa33d Automatic bundle update 2023-10-31 15:25:06 +00:00
Anuken 3e80541c2d Merge remote-tracking branch 'origin/master' 2023-10-31 11:24:11 -04:00
Anuken e5047d752d Added dynamic status for custom speed/health/etc 2023-10-31 11:24:03 -04:00
Volas171andGitHub d06df37d02 Update servers_v7.json (#9219) 2023-10-31 10:20:39 -04:00
Anuken 968fa2f9b1 Derelict repair rule 2023-10-30 21:01:04 -04:00
Arksource (ShardDustry [ES]) OwnerandGitHub f2994652e2 Agua (#9217) 
* Funny change

* Update servers_v7.json

* Update bundle_es.properties

Traductions for the bundle_es
By ArkSource

* Update servers_v7.json
 2023-10-30 19:06:53 -04:00
Anuken 9f88d895ad most unfortunate 2023-10-30 15:13:26 -04:00
Anuken f6082225e8 no getArcHash 2023-10-30 15:01:57 -04:00
Anuken 695dad201f includeBuild for Arc 2023-10-30 14:56:40 -04:00
Anuken db60fcd64d Fixed #9216 2023-10-30 09:45:48 -04:00
Anuken e2daf957fb Merge remote-tracking branch 'origin/master' 2023-10-30 09:14:00 -04:00
Anuken 55684e8b98 Ignore .git in mods 2023-10-30 09:13:55 -04:00
NazrinNyaandGitHub 270c7845b8 Update servers_v7.json (#9215) 
* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json
 2023-10-29 13:57:22 -04:00
meiqiuandGitHub 44757f0cb4 Update servers_v7.json (#9214) 2023-10-29 11:19:53 -04:00
meiqiuandGitHub af20ea5605 Update servers_v7.json (#9211) 2023-10-28 18:55:03 -04:00
lemon3357andGitHub 17978f736f Update servers_v7.json (#9204) 2023-10-28 09:32:12 -04:00