mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-07 01:18:26 +07:00
Code Issues Packages Projects Releases Wiki Activity
16,097 Commits 4 Branches 160 Tags 2.3 GiB
5027b70f5a
Commit Graph

16097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
5027b70f5a Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-14 15:08:27 -05:00
Anuken
0b7c790777 turret status fix 2023-02-14 15:08:24 -05:00
Github Actions
5ac9e9f63c Automatic bundle update 2023-02-13 19:13:48 +00:00
Anuken
b08136e3ea Quell no longer targets flying units 2023-02-13 14:12:53 -05:00
Anuken
ec8262418f Basic unit boost command support 2023-02-11 17:40:57 -05:00
Anuken
946e36c66e Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-09 17:50:46 -05:00
Anuken
00f3518349 Fixed #8277 2023-02-09 17:50:43 -05:00
Volas171
29bf99fe1a
Update servers_v7.json (#8276) 2023-02-09 17:43:11 -05:00
Tentyanuk
e104591dec
Update servers_v7.json (#8271) 
**SRV proved to be really too inefficient and unprofitable!!**

1. Huge delays
2. These records do not work for everyone
 2023-02-09 09:22:58 -05:00
Gureumi
0fd26e68d4
Fix server auto pause when gameover (#8220) 
* Fix server auto pause when gameover

* Update ServerControl.java

* Update ServerControl.java
 2023-02-09 09:21:55 -05:00
WayZer
53f410fee0
Fix Turret bug when cheat (#8273) 
* （C/S) Fix ItemTurret ammo when `cheat`.

* （C/S) Fix `TurretBuild.updateReload` NPE when `cheat`
 2023-02-09 09:20:06 -05:00
FunnyCat
53206e4b31
Update servers_v7.json (#8256) 
Explosive hub deleted
 2023-02-08 22:54:45 -05:00
Tentyanuk
3818bfffb4
Update servers_v7.json (#8260) 
We added DNS v4/v6 with proxy, updated addresses and moved our servers to a more productive host

*P.S Sorry for creating pull requests before this, I was too stupid to realize that this pull request is directed to the order of ping requests, and not to the order of servers in general..*
 2023-02-08 22:54:17 -05:00
Phinner
e6afc6ef0b
Add info section about SRV records in SERVERLIST.md (#8252) 
* update SERVERLIST.md

* aslo setup 💀
 2023-02-08 22:51:25 -05:00
Gureumi
5eb1c1dffc
Remove dead servers v6 (#8262) 2023-02-08 22:50:21 -05:00
Github Actions
66406806b7 Automatic bundle update 2023-02-09 03:49:19 +00:00
Anuken
3a6debfae6 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-08 22:48:33 -05:00
Anuken
a093fa5718 Replaced #8035 2023-02-08 22:48:17 -05:00
Даркнесс#3729
9c1f17fbdd
Add pvpAutoPause rule (#8249) 
* Update Rules.java

* Update NetServer.java
 2023-02-08 22:44:07 -05:00
MEEPofFaith
ce3643f0b3
Make type not required if the template already provides one (#8257) 
Such as with missile units
 2023-02-08 22:35:13 -05:00
MEEPofFaith
f1fb7d8098
Fix modded payload conveyor icons (#8266) 2023-02-08 22:28:44 -05:00
Anuken
3d01eeaf1c Fixed #8251 2023-02-08 22:25:10 -05:00
Github Actions
be39c31865 Automatic bundle update 2023-02-01 20:22:46 +00:00
Phinner
0d2dfadba7
Mod dependency resolution improvements (#7972) 
* soft dependencies + better mod resolution algorithm

* update ModMeta#toString

* var

* add #7962 bugfix

* Use existing code to resolve

* add state text for mod dialog

* bugfix

* fix error text

* remove external resolver class

It's simpler like that :)
 2023-02-01 15:21:42 -05:00
Anuken
2dcab97b6d Merge remote-tracking branch 'origin/master' 2023-02-01 15:20:38 -05:00
Anuken
31cb169002 Random server order 2023-02-01 15:20:34 -05:00
LeTuanVN
c381499c58
Update vi translation (#8225) 
* Update bundle_vi.properties

* Update bundle_vi.properties
 2023-02-01 14:57:09 -05:00
KotMilkMeoWtwo
8577a8cca4
Update servers_v7.json (#8234) 
nya
 2023-02-01 14:55:52 -05:00
Tentyanuk
7a18c4a580
Update servers_v7.json (#8238) 2023-02-01 14:55:39 -05:00
TheRadioactiveBanana
40589eb9ff
Added nuclear pvp server (#8222) 
i somehow forgot to press propose changes doing this yesterday, so i do this again today
 2023-02-01 14:51:47 -05:00
ulwepo
722370b57c
Update servers_v7.json (#8214) 2023-02-01 14:51:36 -05:00
FunnyCat
573672622a
Update servers_v7.json (#8215) 2023-02-01 14:48:26 -05:00
MEEPofFaith
12f747ae1d
Strip colors from mod name as well (#8224) 2023-02-01 14:45:56 -05:00
WayZer
395dc99595
Update servers_v7.json (#8240) 2023-02-01 14:45:28 -05:00
Даркнесс#3729
c945243795
It doesn't work (#8237) 2023-02-01 14:45:00 -05:00
Anuken
c2262cc9cf Fixed #8235 / Fixed #8221 2023-02-01 14:42:50 -05:00
Anuken
411399e96f Fixed #8211 2023-02-01 14:18:29 -05:00
Anuken
f833b9e0ce Fixed #8236 2023-02-01 14:09:16 -05:00
Anuken
9955423e9a Merge remote-tracking branch 'origin/master' 2023-02-01 13:35:11 -05:00
Anuken
58b4265b31 Fixed #8232 2023-02-01 13:35:06 -05:00
Epowerj
671a62aed7
Merge pull request #8242 from osp54/patch-2 
[XCore] Hexed server
 2023-02-01 13:09:46 -05:00
OSP
c94fe9c312
[XCore] Hexed server 2023-01-31 21:07:30 +02:00
Tentyanuk
f46a9730a3
Update SERVERLIST.md (#8205) 2023-01-22 11:03:59 -05:00
Tentyanuk
d45cd7c15e
Banned logic displays on sandbox (#8204) 2023-01-22 09:54:39 -05:00
Anuken
a84d52f5fe
Removed Omnidustry sandbox due to moderation issues (#8203) 2023-01-22 09:26:09 -05:00
Anuken
330d37b7a5 Merge remote-tracking branch 'origin/master' 2023-01-22 08:59:36 -05:00
Anuken
d2792a4e9d Fixed #8202 2023-01-22 08:59:32 -05:00
Kotamus
c50a69d42a
Update servers_v7.json (#8201) 
Crawler arena
 2023-01-21 09:40:26 -05:00
Anuken
ee689d1597 Merge remote-tracking branch 'origin/master' 2023-01-20 09:37:33 -05:00
Anuken
6ef8d64d46 Efficiency fix 2023-01-20 09:37:28 -05:00