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

16122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
d082963167 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_es.properties
 2023-01-08 00:17:52 -05:00
Anuken
e2fa834079 Merge of #7987 2023-01-08 00:16:58 -05:00
Khanx
e6bfc1cee8 Updated spanish translation (#7928) 2023-01-08 00:15:55 -05:00
Somka000
5b35319559 Add server to list (#8009) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2023-01-07 23:42:28 -05:00
Somka000
36513c709d Add server to list (#8009) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2023-01-07 23:42:16 -05:00
Volas171
13bca1b7bd Update servers_v7.json (#8074) 
* Update servers_v7.json

* little space
 2023-01-07 23:41:28 -05:00
MWestfall
b9c85fcaf2 Update servers_v7.json (#7989) 
Add ECAN to v7
 2023-01-07 23:40:42 -05:00
MWestfall
50cc281e24 Update servers_v6.json (#7990) 
Remove ECAN from v6
 2023-01-07 23:38:26 -05:00
Miniontoby
0211732520 Fixed sand-floor translation in Dutch (#8058) 
Changed from 'Donker Zand' which means 'dark sand' to 'Zand' which is just 'sand'
 2023-01-07 23:38:12 -05:00
adamlolgaming
33f6004c81 Update bundle_pl.properties (#8057) 2023-01-07 23:34:18 -05:00
xem8k5
23d3c2dfe7 Update servers_v7.json (#8129) 2023-01-07 22:58:42 -05:00
Mr.S
7cce9fad55 Update servers_v7.json (#8128) 
Server upgrade to V7
 2023-01-07 21:44:56 -05:00
Anuken
2c2d561ea6 Merge remote-tracking branch 'origin/master' 2023-01-07 19:34:40 -05:00
Anuken
62e33effd1 CargoAI target clearing 2023-01-07 19:34:36 -05:00
Mr.S
85229f15c4 Update servers_v6.json (#8082) 
Server upgrade to V7

Co-authored-by: Anuken <arnukren@gmail.com>
 2023-01-07 18:49:20 -05:00
OGalaxy
2f0de58d00 Update servers_v7.json (#8118) 2023-01-07 18:40:41 -05:00
VaporSpace2
6ef21f65b2 updates to GMS server network (#8059) 
adding the new "Generic PvP server" to v7 server list, renamed server network to "generic mindustry"
 2023-01-07 16:22:55 -05:00
Anuken
be8fec55e1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-01-07 16:22:06 -05:00
Anuken
76430c1e68 a 2023-01-07 16:21:03 -05:00
BeDanGames
a4b1d2ca51 Update servers_v7.json (#8127) 2023-01-07 16:20:18 -05:00
Valeriy
51b93205ff SMoA come back (#8064) 
* SMoA come back

* leave from v6

* Fix
 2023-01-07 16:16:34 -05:00
Garen7
832b5e62bf Fixes typo on Payload Mass Drivers (#8090) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2023-01-07 16:14:04 -05:00
ColaHz
c78adb12aa add new server, servers_v7,json (#8106) 
* add new server, servers_v7,json

* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json

Co-authored-by: DHz06 <87813567+DHz06@users.noreply.github.com>
 2023-01-07 15:30:51 -05:00
Xasmedy
019ffe4c5c Added the mindustry.ddns.net HUB. (#7911) 2023-01-07 15:29:51 -05:00
L0615T1C5-216AC-9437
b3d014cd9f Add more ports to cn (#8003) 
* Add more ports to cn

* Update servers_v7.json
 2023-01-07 15:20:26 -05:00
L0615T1C5-216AC-9437
bebc8f0342 Remove ports from cn (#8002) 2023-01-07 15:20:11 -05:00
Anuken
56ed932716 Merge remote-tracking branch 'origin/master' 2023-01-07 15:07:57 -05:00
Anuken
4c09f6dd40 Fixed #8025 2023-01-07 15:07:54 -05:00
Phinner
700e4564a8 Update Xpdustry V7 servers (#7977) 
* update servers

* more...

* Add lobby server
 2023-01-07 14:54:34 -05:00
Anuken
f1e1eb1015 Fixed #8015 2023-01-07 14:54:15 -05:00
Anuken
963b96a1fb Merge remote-tracking branch 'origin/master' 2023-01-07 14:47:14 -05:00
Anuken
87786441ff Fixed #8117 2023-01-07 14:47:10 -05:00
Anuken
05dec4df6a Fixed #8117 2023-01-07 14:46:31 -05:00
MEEPofFaith
a3270debac Fix collideLine (#8037) 2023-01-07 14:46:19 -05:00
Github Actions
cf392d13ed Automatic bundle update 2023-01-07 19:43:14 +00:00
Prosta4okua
574a10e5f8 🍉🍉🍉 Watermelons have deployed. Prepare yourself for new Ukrainian translation for v7 release (#7885) 
* hehe

* Finished translation. Need to proofread. Added 2 missing entries.

* Fixes

* Fixes #2

* Added button Random to translations and fixed error

* Fixes from @1stvaliduser

* fixes

* fixes

* будівль -> будівель
 2023-01-07 14:42:27 -05:00
Anuken
eb410af371 sandbox is now actually sandbox again 2023-01-07 14:41:12 -05:00
Anuken
542bf2b413 Fixed #8084 2023-01-07 14:26:25 -05:00
Anuken
723b10af57 Fixed #7944 2023-01-07 14:18:07 -05:00
Anuken
1394c49e48 Fixed #8008 2023-01-07 14:10:41 -05:00
Anuken
d8ecdff698 Merge remote-tracking branch 'origin/master' 2023-01-07 14:01:33 -05:00
Anuken
2a71f4620e Fixed #7962 2023-01-07 14:01:28 -05:00
Slotterleet
fe99c7da62 Update bundle_ru.properties (#7973) 2023-01-07 14:00:32 -05:00
Anuken
0b00747f29 Merge remote-tracking branch 'origin/master' 2023-01-07 13:53:07 -05:00
Anuken
ae4a41cd0b Fixed #8042 2023-01-07 13:53:03 -05:00
GlennFolker
93f630bb69 Make custom Env flag reliably possible (#8019) 
* Make custom Env flag reliably possible

* screw you

* "compatibility" for mods that don't use add()
 2023-01-07 13:48:28 -05:00
Anuken
d7d5ba7510 Fixed #8060 2023-01-07 13:44:34 -05:00
Anuken
e846084942 Merge remote-tracking branch 'origin/master' 2023-01-07 13:42:48 -05:00
Anuken
a15b887e5c Fixed #8011 2023-01-07 13:42:43 -05:00
Github Actions
4e51586b3b Automatic bundle update 2023-01-07 18:23:43 +00:00