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

16045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
4d77a6d475 Merge remote-tracking branch 'origin/master' 2023-01-07 11:36:52 -05:00
Anuken
64a9377006 #8040 but better 2023-01-07 11:36:48 -05:00
Garen7
c20d7f2b4f Fixes the damage modifier not working sometimes (#8124) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 11:30:49 -05:00
Garen7
b57cde7148 Fixes polies helping the enemy team in pvp (#8056) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 11:29:46 -05:00
buthed010203
a5fd29e56d Fix crash when toString returns null value (#8067) 
* Fix crash when toString returns null value

* Return a string from NullUnit toString

* Begone redundancy

* Unwrap before null check to ensure non-nullability
 2023-01-07 11:28:01 -05:00
Anuken
c0b819ec9b Fixed #7952 2023-01-07 11:27:15 -05:00
Anuken
30e36d5640 Merge remote-tracking branch 'origin/master' 2023-01-07 11:24:02 -05:00
Anuken
0582ba1c47 Oct now has an octagon shield 2023-01-07 11:23:55 -05:00
Epowerj
141902d012 Merge pull request #8085 from xem8k5/patch-24 
Update v7 Server list // server lists cleaned up
 2022-12-29 01:08:02 -05:00
xem8k5
fd5b8a32a1 Update servers_v7.json 2022-12-25 17:27:38 +08:00
Epowerj
fc91cf6d44 Merge pull request #7957 from Brandons404/master 
Update v7 Server list | changed hosts for one of my servers
 2022-12-23 18:51:00 -05:00
Epowerj
a5de521e6e Merge pull request #7991 from Darkness6030/patch-1 
darkdustry.tk -> darkdustry.net
 2022-12-22 02:35:43 -05:00
Anuken
243c50be02 Faster entity removal 2022-12-14 16:58:58 -05:00
Даркнесс#3729
c601114a43 darkdustry.tk -> darkdustry.net 
Also added a new gamemode: https://github.com/xzxadixzx/hex-industry
 2022-11-24 20:48:10 +03:00
Recessive
0fcab7db62 Added AA Plague to V7 server list (#7913) 
Will update the server to V7 once the PR is accepted. For now I'll leave it as V6 so the few players who haven't updated have something to play
 2022-11-20 00:16:20 -05:00
Brandons404
b89a5ff3b5 changed hosts for one of my servers 2022-11-19 12:07:15 -06:00
Epowerj
1180764dab Fixed some weird issues on stronghold 2022-11-16 14:40:47 -05:00
Anuken
7f292b14a7 Merge remote-tracking branch 'origin/master' 2022-11-13 13:26:23 -05:00
Anuken
f7f3d5bde3 Revert hold time 2022-11-13 13:26:19 -05:00
Github Actions
f400ccc66a Automatic bundle update 2022-11-13 16:14:54 +00:00
Anuken
3a4a37cf0c Fixed mod version requirement text missing 2022-11-13 11:14:04 -05:00
Anuken
42af4e6b7e Merge remote-tracking branch 'origin/master' 2022-11-13 10:26:45 -05:00
Anuken
f4e90bfb6b Crash fix 2022-11-13 10:26:40 -05:00
Github Actions
4f912f25ee Automatic bundle update v140.4 2022-11-13 15:05:50 +00:00
Slotterleet
3ca68e426c [RU] Fixed typos and new translations (#7897) 
* [RU] Fixed typos and new translations

* One. Single. Typo.

* New Onset objective
 2022-11-13 10:05:14 -05:00
Joan Josep
20f8fd79ff Update bundle_ca.properties (#7907) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-13 10:04:54 -05:00
VaporSpace2
a101f21de0 remove Generic survival sever from v6 server list (#7903) 
updated server to v7
 2022-11-13 09:59:29 -05:00
VaporSpace2
509760eeb1 add generic survival server to v7 server list (#7904) 
process of updating generic survival server
 2022-11-13 09:59:22 -05:00
OpalSoPL
d4a7b49233 Update bundle_pl.properties (#7891) 
small change in translation (line 1811 only)
 2022-11-13 09:58:51 -05:00
Nunting
0db2e40e27 Update bundle_ko.properties (#7889) 2022-11-13 09:58:44 -05:00
SoMall-dumpling
6a8fe28e70 Update bundle_zh_CN.properties (#7888) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-11-13 09:58:34 -05:00
Angel-24
23067674c9 Update bundle_es.properties (#7848) 2022-11-13 09:58:24 -05:00
Volas171
7b3f5d3848 Update servers_v7.json (#7905) 2022-11-13 09:58:18 -05:00
Anuken
b422e041f4 Fixed #7906 2022-11-13 09:57:09 -05:00
Anuken
80046ba505 Fixed #7884 2022-11-13 09:53:18 -05:00
Anuken
7e0a6798be Merge remote-tracking branch 'origin/master' 2022-11-13 09:49:47 -05:00
Anuken
afcb187c53 Fixed #7887 2022-11-13 09:49:42 -05:00
Github Actions
883ecb97d0 Automatic bundle update 2022-11-13 14:36:41 +00:00
Anuken
4c51b97667 Fixed #7893 / Fixed #7902 2022-11-13 09:35:48 -05:00
Anuken
7d695784d1 Merge remote-tracking branch 'origin/master' 2022-11-11 15:08:42 -05:00
Anuken
59ca257cca Fixed #7874 2022-11-11 15:08:38 -05:00
Volas171
4a78478ab2 Update servers_v7.json (#7880) 2022-11-11 14:14:17 -05:00
Volas171
557647e0bd Update servers_v7.json (#7879) 2022-11-11 13:35:52 -05:00
Drylian
a79557b917 Update servers_v7.json (#7876) 
Add alternight server
 2022-11-11 13:30:22 -05:00
Drylian
ae0e78e012 Update servers_v6.json (#7875) 
remove alternight v6
 2022-11-11 13:30:06 -05:00
Bill Arndt
899e32eeed Update servers_v6.json (#7877) 
now that v7 is released, v6 Eviction server will be permanently retired.
 2022-11-11 13:29:49 -05:00
Volas171
c3732e51f7 Update servers_v6.json (#7878) 2022-11-11 13:29:43 -05:00
Phinner
30eda697fa Update servers_v7.json (#7873) 
* Update servers_v7.json

I come back from the deads, with an extra server.

* The forbidden comma
 2022-11-11 11:27:13 -05:00
Epowerj
bf9d61ce3a Updated onset description 2022-11-11 10:26:49 -05:00
Anuken
fd911539ee Merge remote-tracking branch 'origin/master' 2022-11-11 09:53:08 -05:00