Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,357 Commits 4 Branches 180 Tags
ac4d57013df9651c53a6a038d66841482738cb46
Commit Graph
17357 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AnukenandGitHub 44f7c726b5 Revert #9294 2023-11-27 06:05:57 -05:00
OSPandGitHub 8d04a6820d Update servers_v7.json (#9318) 2023-11-27 09:51:47 +00:00
abcxyzDustryandGitHub f9d39ad31a Update servers_v7.json (#9315) 2023-11-25 12:54:05 -05:00
TheRadioactiveBananaandGitHub 589b8d9d37 Eradication Mindustry Merge (#9310) 
Anuke finally gave the go ahead
 2023-11-24 02:46:19 -05:00
Anuken fbf8b2bff1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-23 19:04:19 -05:00
Anuken 130336bff0 arc 2023-11-23 19:04:17 -05:00
ElixiasandGitHub 9af7a864bd f (#9309) 2023-11-23 23:59:14 +00:00
Anuken 31eee11bf5 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-23 14:25:07 -05:00
Anuken d2956d1f2c ConnectFilter API now public 2023-11-23 14:24:59 -05:00
karlo292andGitHub 1feeef7aef Update servers_v7.json (#9307) 2023-11-23 13:35:26 -05:00
Anuken f5424ea59b Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-11-23 06:29:38 -05:00
Anuken 4076a146b1 Reject invalid tile configs 2023-11-23 06:28:57 -05:00
Hahaa13andGitHub f4741e0e59 Back back vndustry (#9297) 
* Update servers_v7.json

* Update servers_v7.json

* Back :))
 2023-11-23 06:25:36 -05:00
ElectronGitHubElectron
 		3fcaf8f916 Update servers_v7.json (#9294) 
Co-authored-by: Electron <135461023+Electorn215@users.noreply.github.com>
 2023-11-23 09:59:32 +00:00
abcxyzDustryandGitHub 726ba2af31 Update servers_v7.json (#9304) 2023-11-22 17:06:05 -05:00
ApsZoldat aa018b314d World processor markers: remove toggleVisibility, swap makemarker's type and id arguments for instruction consistency 2023-11-22 22:33:05 +03:00
112HackandGitHub 8bb6acfacb Update servers_v7.json (#9303) 2023-11-22 13:24:45 +00:00
Anuken b189bfdf44 Closes Anuken/Mindustry-Suggestions/issues/4780 (dumping neoplasm from tanks) 2023-11-19 19:09:15 -05:00
Anuken afc2e15c51 Fixed #9298 2023-11-19 10:55:42 -05:00
Arksource (ShardDustry [ES]) OwnerandGitHub 0787cbbb5f Agua 3, 20% more water (#9295) 
* Funny change

* Update servers_v7.json

* Update bundle_es.properties

Traductions for the bundle_es
By ArkSource

* Update servers_v7.json

* Agua prt 2

* Update servers_v7.json

* Update servers_v7.json
 2023-11-18 20:54:20 -05:00
Anuken efce844e4e Merge remote-tracking branch 'origin/master' 2023-11-18 11:25:38 -05:00
Anuken 46b88092db Re-enabled mod unit tests 2023-11-18 11:25:31 -05:00
abcxyzDustryandGitHub bdbf168797 Update servers_v7.json (#9293) 2023-11-18 11:11:21 -05:00
DarknessandGitHub 6200f08cd8 Remove Darkdustry from the Global Server List (#9289) 
The time has come. It's been more than two years since we started Mindurka, which was later renamed to Darkdustry. It was an amazing time and an amazing experience to maintain the server, to create plugins and gamemodes, to discuss mindustry with all of you. But It's enough. The server is getting constantly DDoSed, the host dies all the time and I have no motivation to develop anything related to Mindustry. 
Goodbye. And I hope, we'll meet again.
 2023-11-18 08:37:40 -05:00
Ilya246andGitHub 533c5a8afb fix shield arc ability (#9290) 
* fix shield arc ability

* Update ShieldArcAbility.java
 2023-11-18 08:35:10 -05:00
CuteMiao XuwenandGitHub 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
abcxyzDustryandGitHub e5b3488a05 Update servers_v7.json (#9286) 2023-11-17 08:18:48 -05:00
SemetrixandGitHub 53967d4d70 Fix format, it was breaking my thing (#9283) 2023-11-16 11:01:42 -05:00
GureumiandGitHub 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
abcxyzDustryandGitHub 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
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
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
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