mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-21 01:37:13 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,400 Commits 4 Branches 160 Tags 2.3 GiB
f9024e5500
Commit Graph

10400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Felix Corvus
8843e49ac8
6 changed lines (@Prosta4okua) 
- hint.desktopMove
- hint.respawn.mobile
- hint.placeDrill
- hint.placeDrill.mobile
- hint.placeConveyor
- hint.placeTurret
 2020-12-01 02:34:27 +03:00
Anuken
a232839cfd
Merge pull request #3616 from AmateurPotion/patch-12 
Korean translation bundle
 2020-11-30 18:30:56 -05:00
Anuken
5c483400e0
Merge pull request #3660 from Xasmedy/patch-1 
Update servers_v6.json
 2020-11-30 18:18:15 -05:00
Anuken
3a05a2b0ef
Merge pull request #3631 from Quick-korkc/patch-13 
Update Contributors
 2020-11-30 18:14:56 -05:00
Anuken
26e90c99d3
Merge branch 'master' into patch-13 2020-11-30 18:14:51 -05:00
Anuken
fe59031fce
Merge pull request #3674 from GioIacca9/patch-12 
v6 Italian bundle
 2020-11-30 18:13:16 -05:00
Anuken
56e326ab1b
Merge pull request #3671 from Nikolass1000/patch-2 
Polish complete translation.
 2020-11-30 18:12:44 -05:00
Anuken
1a3af01b24
Merge pull request #3642 from laohuaji233/patch-42 
Update bundle_zh_CN.properties[Unfinished]
 2020-11-30 18:11:50 -05:00
Anuken
7954d7e4e9
Merge pull request #3618 from L0615T1C5-216AC-9437/patch-2 
Add CN pvp Server to Community Server List
 2020-11-30 18:11:43 -05:00
Anuken
7a0bac95a5
Merge pull request #3615 from Catchears/german-v6 
Final v6 german translation
 2020-11-30 18:11:24 -05:00
Anuken
625486ade9
Merge pull request #3584 from Lapis256/master 
update bundle_ja.properties
 2020-11-30 18:11:06 -05:00
Anuken
6a33f41fb4
Merge pull request #3554 from Nikolass1000/patch-3 
Update contributors
 2020-11-30 18:10:40 -05:00