Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,326 Commits 4 Branches 180 Tags
8126e970f3574f760c4c083ea5efeabed262a7ac
Commit Graph

16326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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) v141.3 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
eSK8er
0095e89673 Update servers_v7.json (#8145) 2023-01-19 00:34:13 -05:00
SachaTending
55d97ea202 add tendhost(not running) [reopened] (#8147) 2023-01-18 11:49:22 -05:00
Anuken
85b8868d2b Fixed #8194 2023-01-18 10:41:39 -05:00
Anuken
65e92ab6fc Merge remote-tracking branch 'origin/master' 2023-01-17 18:50:49 -05:00
Anuken
478baf2532 Fixed #8192 2023-01-17 18:50:44 -05:00
Joan Josep
0750348cb1 Update bundle_ca.properties (#8190) 2023-01-17 18:49:20 -05:00
UnCaughT
db6cbc5cc3 Update servers_v7.json (#8189) 
HexPvP IP Change
 2023-01-17 00:18:09 -05:00
Anuken
b4359c0489 Merge remote-tracking branch 'origin/master' 2023-01-16 15:28:45 -05:00
Anuken
977192bc54 Fixed #8187 2023-01-16 15:28:40 -05:00
南门阳德
d54b557a9f Revert #8176 (#8186) 
Liquid turrets are used to give buff like wet but not do the damage. The ammo change is not appropriate.
 2023-01-16 11:07:00 -05:00
Anuken
f6c97f4ff6 Fixed #8185 2023-01-16 11:06:34 -05:00
Anuken
66f4118896 Fixed #8184 2023-01-15 15:19:13 -05:00
Anuken
4a8f8c4ecf Merge remote-tracking branch 'origin/master' 2023-01-15 08:51:57 -05:00
Anuken
6d7c207b95 Fixed drawing of assembler payloads 2023-01-15 08:51:51 -05:00
DinnerWool
597bd31a0c Update servers_v7.json (#8183) 2023-01-15 08:42:59 -05:00
Knochi
98157f2852 Never use „tun“ in German language (#8179) 2023-01-14 14:41:14 -05:00
MEEPofFaith
5e324e71d4 Hitscan fix 2 (#8175) 
* Revert "Reverting #8037"

Re-implement #8037

* Properly count collisions

Fix #8170
 2023-01-14 10:05:30 -05:00
Anuken
3159ce6707 Merge remote-tracking branch 'origin/master' 2023-01-13 19:34:52 -05:00
Anuken
9b033532c8 Fixed #8177 2023-01-13 19:34:48 -05:00
Даркнесс#3729
0678592d59 Fix cheaty item and liquid turrets (#8176) 
* Update Turret.java

* Update TractorBeamTurret.java

* Update TractorBeamTurret.java

* Update ItemTurret.java

* Update LiquidTurret.java
 2023-01-13 16:51:36 -05:00
Anuken
00d6b0d483 Merge remote-tracking branch 'origin/master' v141.2 2023-01-13 09:59:05 -05:00