mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-16 03:41:55 -07:00
Code Issues Projects Releases Wiki Activity
15996 commits 4 branches 180 tags 2.3 GiB
Commit graph

15996 commits

This branch
This branch
All branches
Author SHA1 Message Date
MEEPofFaith
7455fb21a4
Proper trails for point lasers (#8038) 
* Proper trails for point lasers

* Take current size into account

* fh9weqfjpoepiofjwpiqoefjpoiwjieqpofpjioji

* Web editing moment

* Point laser bullets shouldn't have aa shoot effect

* h
 2023-01-10 12:11:37 -05:00
Anuken
2c3210afce Merge remote-tracking branch 'origin/master' 2023-01-10 11:59:36 -05:00
Anuken
ea9ba60d66 Minor unit balance changes 2023-01-10 11:59:31 -05:00
Explosive corp
130ad59fc4
Update servers_v7.json (#8146) 
Explosive hub and pvp
 2023-01-10 08:45:57 -05:00
Anuken
1417e94bcd Merge remote-tracking branch 'origin/master' 2023-01-09 22:17:27 -05:00
Anuken
3ec2ae797e Ship beryllium cost increase / Scathe discover range nerf 2023-01-09 22:17:20 -05:00
Valeriy
222499d4c6
Thanks Anton! (#8142) 
thats a very stupid mistake
 2023-01-09 22:11:32 -05:00
MEEPofFaith
2a6fcb7983
Region part growing (#7861) 
E x p a n d
 2023-01-09 22:08:40 -05:00
TNT331
05221a8043
Add v7 Serv (#8139) 2023-01-09 21:11:25 -05:00
kotasusmogus
50b4915ff9
Update servers_v7.json (#8138) 
I created survival server
 2023-01-09 21:11:15 -05:00
kotasusmogus
2ef708a586
Update servers_v7.json (#8135) 
I want to add a server
 2023-01-09 12:49:20 -05:00
Github Actions
8212c54446 Automatic bundle update 2023-01-09 17:48:55 +00:00
Romanin
503254bc1a
Update servers_v7.json (#8137) 2023-01-09 12:48:03 -05:00
Prosta4okua
c1b0b22e4c
Ukr translation v7 (#8134) 
* 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

* виправлення

* Update bundle_uk_UA.properties
 2023-01-08 22:55:07 -05:00
Volas171
96f5c0a03a
Update servers_v7.json (#8133) 2023-01-08 22:54:29 -05:00
Anuken
cba1e81f3d More consistent status flash 2023-01-08 14:40:47 -05:00
Anuken
dcc6e9827d Status flash tweaks 2023-01-08 12:29:29 -05:00
Anuken
e27f7c8332 Fixed #8131 2023-01-08 10:24:55 -05:00
Anuken
40aebf0e77 Merge remote-tracking branch 'origin/master' 2023-01-08 10:19:52 -05:00
Anuken
dcf9aa9793 Fixed #8132 2023-01-08 10:19:47 -05:00
Github Actions
45591fab83 Automatic bundle update 2023-01-08 06:24:54 +00:00
Anuken
658ebf4bc5 Merged #8053 2023-01-08 01:23:54 -05:00
Joan Josep
59c2a11824
Update bundle_ca.properties (#7947) 2023-01-08 01:22:32 -05:00
Github Actions
33a57b11f6 Automatic bundle update 2023-01-08 05:18:51 +00:00
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