mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-10 04:40:10 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,412 Commits 4 Branches 160 Tags 2.3 GiB
6027fff543
Commit Graph

10412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
305e2642ba Minor bugfixes 2020-12-01 12:48:26 -05:00
Anuken
cb95059c3e
Merge pull request #3699 from Somka000/patch-10 
Update servers_v6.json
 2020-12-01 11:40:00 -05:00
Somka000
20aa2384ea
Update servers_v6.json 
Sorry for second PR but domain is broke
 2020-12-01 17:13:16 +01:00
Anuken
c5574d3ae0
Merge pull request #3683 from Recessive/patch-6 
Update servers_v6.json
 2020-12-01 10:26:57 -05:00
Recessive
45b43e7772
Update servers_v6.json 
Added assimilation to {AA} server listing
 2020-12-02 02:20:04 +11:00
Anuken
a461c184be
Merge pull request #3691 from FruityPear/patch-4 
Update server to v6
 2020-12-01 09:48:46 -05:00
FruityPear
00e1cf7e9d
Update server to v6 
Also renaming domain from attack.pearkin.net
 2020-12-01 09:46:18 -05:00
Anuken
86887f2ec1
Merge pull request #3689 from Somka000/patch-9 
Update servers_v6.json
 2020-12-01 09:44:28 -05:00
Somka000
bff0c2e6f3
Update servers_v6.json 
New .pl server
 2020-12-01 15:42:48 +01:00
Anuken
fcaf1e49cb Merge remote-tracking branch 'origin/master' 2020-12-01 09:39:34 -05:00
Anuken
448fef980b Community server fetch logging 2020-12-01 09:39:30 -05:00
Anuken
7832b6cafd
Merge pull request #3688 from fuzzbuck/patch-5 
mindustry.io from servers.json -> servers_v6.json
 2020-12-01 09:31:05 -05:00
fuzzbuck
3a259d0001 Update servers_v6.json 2020-12-01 15:26:14 +01:00
Anuken
11168efffa
Merge pull request #3524 from NgLamVN/master 
Vietnamese translations
 2020-12-01 09:24:22 -05:00
fuzzbuck
367da94e34
Update servers.json 
no longer uses v5
 2020-12-01 15:24:11 +01:00
Anuken
f8bce3cea0
Merge pull request #3687 from AmateurPotion/patch-13 
Korean Translate Typo fix
 2020-12-01 09:24:06 -05:00
EzLam
daed19e79b . 2020-12-01 21:12:35 +07:00
EzLam
0e565f00ff Merge branch 'master' of https://github.com/NgLamVN/Mindustry 2020-12-01 21:12:16 +07:00
EzLam
d4ab674b1c Whyy ?? 2020-12-01 21:11:19 +07:00
Ngọc Lam
884abb54e6
Nooooooo 
NOOOOOOOOOOO
 2020-12-01 20:57:59 +07:00
EzLam
026d3ef9ab Fix some typos 2020-12-01 20:53:25 +07:00
EzLam
0abf333168 Done. 2020-12-01 20:50:29 +07:00
EzLam
a124c2a2b4 rEaLdY fOr rEvIeW... 2020-12-01 20:46:54 +07:00
AmateurPotion
a43957a1fa
Update bundle_ko.properties 
Sorry. I think my mind ran away from home.
 2020-12-01 22:44:03 +09:00
AmateurPotion
d0f3e413c6
Update bundle_ko.properties 2020-12-01 22:42:07 +09:00
AmateurPotion
469d5945b2
Typo 2020-12-01 22:40:41 +09:00
Anuken
c00228f960 Merge remote-tracking branch 'origin/master' 2020-12-01 08:39:21 -05:00
Anuken
ee28f4564b Final bugfixes 2020-12-01 08:39:16 -05:00
EzLam
5a8d0071df Yep. 2020-12-01 20:19:35 +07:00
Anuken
4c7b86196c
Merge pull request #3681 from PetrGasparik/v118 
[Bundle][cs] Czech translation - finishing touches for v6
 2020-12-01 08:10:06 -05:00
Anuken
b946fd6a3b
Merge pull request #3682 from GioIacca9/patch-13 
fixes
 2020-12-01 08:09:49 -05:00
EzLam
6f139641da 85% complete. 2020-12-01 17:12:58 +07:00
Ngọc Lam
c413be3ce0
Thanks for your help @JINODK 
Update from lines 1286 to 1490
 2020-12-01 17:02:35 +07:00
Ngọc Lam
19a804db91
Update bundle_vi.properties 2020-12-01 17:01:24 +07:00
JINODK
f6d35822fb
Update from lines 1286 to 1490 
"How to break your hand in 3 hours" in a nutshell 🥴
 2020-12-01 16:56:29 +07:00
EzLam
8f1f015f3d Update contributors 2020-12-01 16:43:39 +07:00
EzLam
ed1b3ba608 Block.name.lol 2020-12-01 16:40:35 +07:00
Recessive
f3831eb9c5
Update servers_v6.json 
Add {AA} V6 Plague to the server listing
 2020-12-01 19:39:42 +11:00
Patrick 'Quezler' Mounier
1ed2b2eb2e
Update core/src/mindustry/world/blocks/experimental/BlockForge.java 2020-12-01 09:28:22 +01:00
GioIacca9
039f5ef8db
fixes 2020-12-01 08:27:39 +01:00
EzLam
be6b294087 Bruh. 2020-12-01 14:02:31 +07:00
Petr Gašparík
0ab593b7a5 Czech translation - finishing touches for v6 2020-12-01 08:00:26 +01:00
EzLam
67c35e12ae We dont need to translate this. 2020-12-01 13:36:18 +07:00
Ngọc Lam
7acc5e0858
72% complete 2020-12-01 13:16:45 +07:00
Prosta4okua
0553cafbe9
Update bundle_uk_UA.properties 2020-12-01 03:04:30 +02:00
Prosta4okua
9d78459d7d
Підготовка до виходу 6.0 ч.1 2020-12-01 02:31:46 +02:00
Anuken
c0c5257ed8 пропустит 
ь
 2020-11-30 19:14:03 -05:00
Anuken
a476e3cf19 Merge remote-tracking branch 'origin/master' 2020-11-30 18:58:25 -05:00
Anuken
4c777fba5c Achievement fixes 2020-11-30 18:58:20 -05:00
Anuken
fe4497a4da
Merge pull request #3541 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-11-30 18:50:03 -05:00