Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,689 Commits 4 Branches 180 Tags
ba2191a18671738910c8f651f842b4a1c81749ee
Commit Graph
17689 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DarknessandGitHub d138aa7568 Update Blocks.java (#9278) 2023-11-14 10:27:51 -05:00
ApsZoldat c434e18f8f Add drawing layers to markers 2023-11-13 23:25:44 +03:00
abcxyzDustryandGitHub d780ee0434 Update servers_v7.json (#9276) 2023-11-13 12:38:07 -05:00
BalaM314andGitHub 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
PhinnerGitHubZetaMap
 		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
Anuken 997702b9de progress 2023-11-12 12:34:03 -05:00
Hahaa13andGitHub 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]) OwnerandGitHub 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
Anuken 381fd12aad Still terrible 2023-11-11 19:59:14 -05:00
Anuken af7598dcc6 Actually functional, but terrible 2023-11-11 14:20:48 -05:00
Anuken cacfe06362 progress 2023-11-11 12:28:10 -05:00
Anuken 0cf27034cf progress 2023-11-11 11:26:42 -05:00
Anuken 5a14302d68 progress 2023-11-11 10:41:53 -05:00
ApsZoldatandGitHub 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
OSPandGitHub fbd0675f75 someone forgot to place comma 💀 (#9263) 2023-11-11 09:36:22 -05:00
XuwenMeimeiandGitHub 71beeae32a Update servers_v7.json (#9262) 2023-11-11 01:46:18 -05:00
Anuken 24b7d99a69 progress 2023-11-10 13:48:41 -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
Anuken 69e2f6b93b progress 2023-11-10 01:57:04 -05:00
Anuken 358a9ca98b progress 2023-11-09 09:49:50 -05:00
KotMilkMeoWtwoandGitHub 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 70e112e884 Moving new pathfinding to a new thread 2023-11-08 13:20:07 -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
StalkerBaranandGitHub 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
AnukenandGitHub e7a0d05895 Update servers_v7.json 2023-11-08 08:47:40 -05:00
Anuken be44e283d8 progress 2023-11-08 08:42:48 -05:00
Gerald Elder-VassandGitHub 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
The1CruxandGitHub 5c50356fb2 Update servers_v7.json (#9255) 
Crux's Revelations servers addition
 2023-11-07 22:38:53 -05:00
TheRadioactiveBananaandGitHub 8f97625fa1 Eradication Mindustry IP change (#9241) 2023-11-07 21:41:13 -05:00
KotMilkMeoWtwoandGitHub d53ac76461 Update servers_v7.json (#9243) 
I changed the host ip.
 2023-11-07 16:13:50 -05:00
ApsZoldat 6dff68e7d9 Texture marker implementation 2023-11-07 22:42:42 +03:00
Anuken 65d0b6adcc progress 2023-11-07 10:56:17 -05:00
Anuken 0186c35a1a Flowfield tests 2023-11-07 00:11:44 -05:00
Anuken a17dcbca5a Heuristic fixed 2023-11-06 23:02:26 -05:00
Anuken d6d9a52ef9 It works, but badly 2023-11-06 22:51:47 -05:00
buthed010203andGitHub e4eadbbb7f jlfhuyksft (#9251) 2023-11-06 20:54:58 -05:00
Anuken cfb0ea1c8c Cluster A* progress 2023-11-06 19:21:29 -05:00
Anuken 2bcf5bf684 Better connection storage 2023-11-06 15:41:27 -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