mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 00:17:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,656 Commits 4 Branches 160 Tags 2.3 GiB
0a11482b55
Commit Graph

8656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
c5fffb9ddd
Merge pull request #2579 from DeltaNedas/logicops 
add lua-style integer division with //
 2020-09-17 14:47:17 -04:00
DeltaNedas
ee08fa8f77 add lua-style integer division with // 2020-09-17 17:46:45 +01:00
Anuken
dfb96dcdd9
Merge pull request #2557 from Vortetty/patch-1 
Update servers_be.json
 2020-09-17 11:15:07 -04:00
Anuken
b0bb048c35
Merge branch 'master' into patch-1 2020-09-17 11:14:54 -04:00
MWestfall
d4811a7d04
Update servers_v6.json 
ECAN Moving to V6
 2020-09-17 10:36:48 -04:00
MWestfall
553bc1d1c8
Update servers.json 2020-09-17 10:34:19 -04:00
Anuken
ce2dd89f44 Fixed #2571 2020-09-16 23:34:56 -04:00
Anuken
7b55ce94fe Merge remote-tracking branch 'origin/master' 2020-09-16 18:38:30 -04:00
Anuken
bdf814c9b9 Removed sector data cache system 2020-09-16 18:38:23 -04:00
Anuken
53f5c69d40
Merge pull request #2569 from Mayonez-bat/patch-1 
Update servers_v6.json
 2020-09-16 18:08:32 -04:00
Felix Corvus
e1277da02d
Update bundle_ru.properties 2020-09-17 00:49:02 +03:00
Anuken
030542890e Bugfixes 2020-09-16 16:04:11 -04:00
Mayonez-bat
eb5c5a617b
Update servers_v6.json 
Add pandorum,su:8000
 2020-09-16 20:24:09 +01:00
Anuken
5c98512e4f Bugfixes 2020-09-16 14:53:44 -04:00
Anuken
0847fc9f09 Crash fix 2020-09-16 12:58:26 -04:00
Anuken
47b4da59e0 Fixed #2567 2020-09-16 12:56:32 -04:00
Prosta4okua
d2b8967713
Merge pull request #20 from TheSlaylord/patch-14 
_Ничего личного, можно добавлюсь в список контрибуторов/переводчиков?_
Нет, нельзя.
*делает слияние*
:D
 2020-09-16 18:57:00 +03:00
TheSlaylord
b24c5ea920
Update contributors 2020-09-16 18:48:04 +03:00
TheSlaylord
7dfe973664
Update bundle_ru.properties 2020-09-16 18:46:04 +03:00
Anuken
ddcfd0728d Merge remote-tracking branch 'origin/master' 2020-09-16 11:44:46 -04:00
Anuken
9cfd78ee1f Fixed #2565 2020-09-16 11:44:39 -04:00
Anuken
90978b54da
Merge pull request #2558 from sk7725/patch-16 
[KO] Unit name changes
 2020-09-16 10:50:39 -04:00
Anuken
7e9f5f5dc4
Merge pull request #2562 from Quezler/patch-44 
+ commander
 2020-09-16 10:49:39 -04:00
Anuken
edb776a549
Merge pull request #2521 from YellOw139/patch-1 
Create bundle_ro.properties
 2020-09-16 10:29:07 -04:00
Anuken
bc2d4267ee Merge remote-tracking branch 'origin/master' 2020-09-16 09:57:16 -04:00
Anuken
d015e878c8 Visual fixes 2020-09-16 09:57:12 -04:00
Anuken
bdda8dbd38
Merge pull request #2559 from BasedUser/patch-2 
Update servers_v6.json
 2020-09-16 09:51:12 -04:00
Anuken
b200b198ed
Merge branch 'master' into patch-2 2020-09-16 09:51:05 -04:00
Anuken
5b6da6039f
Merge pull request #2560 from Somka000/patch-5 
Update servers_v6.json
 2020-09-16 09:33:34 -04:00
Anuken
5fbc3b8dd4
Merge pull request #2561 from Somka000/patch-7 
Update servers_be.json
 2020-09-16 09:26:24 -04:00
Anuken
e2a838a715 Fixed #2563 2020-09-16 09:23:57 -04:00
Felix Corvus
41f3fcbe16
Update bundle_ru.properties 2020-09-16 16:01:47 +03:00
Felix Corvus
013995b30d
nicknames fixes 2020-09-16 15:13:25 +03:00
YellOw139
66aacd6ef0
Update bundle_ro.properties 2020-09-16 13:39:28 +03:00
YellOw139
703ad61b72
Update bundle_ro.properties 2020-09-16 13:38:54 +03:00
Patrick 'Quezler' Mounier
e7162004f2
+ commander 2020-09-16 12:04:24 +02:00
Somka000
542492e434
Update servers_be.json 
Move .pl to 6.0 server list
 2020-09-16 08:38:48 +02:00
Petr Gašparík
6547af8009 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-09-16 08:22:45 +02:00
Somka000
b816bc1467
Update servers_v6.json 
Move .pl to 6.0 server list
 2020-09-16 08:20:58 +02:00
YellOw139
9e81460adb
Update bundle_ro.properties 2020-09-16 08:18:01 +03:00
YellOw139
71df10c6d8
Update bundle_ro.properties 2020-09-16 07:43:07 +03:00
BasedUser
de610c839a
Update servers_be.json 2020-09-16 06:59:56 +03:00
BasedUser
24291e595a
Update servers_v6.json 
Move routerchain.ddns.net to v6 server list
 2020-09-16 06:59:09 +03:00
Anuken
3974497c31 Merge remote-tracking branch 'origin/master' 2020-09-15 23:49:47 -04:00
Anuken
462e6733ed Cliff-spam cache fix 2020-09-15 23:49:40 -04:00
Sunny Kim
3407520645
[KO] Unit name changes 
[KO] Unit name changes, based on community reactions.
 2020-09-16 10:15:38 +09:00
Anuken
2877bdf0d6
Update bundle_ko.properties (#2475) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2020-09-15 20:36:18 -04:00
Sunny Kim
c7e4346890
Higher than 5 waves -> Lower than 5 waves (#2444) 
I just noticed this and it bugs me. Also removed "Campaign Achievement:" because almost all achievements are campaign. Also changed wrong words, including the notorious 블럭 -> 블록. Also fixed typo: 2 Waves skipped to 2 Launches skipped.
 2020-09-15 20:36:10 -04:00
Anuken
52ff09d024 Fixed deployment 2020-09-15 20:18:21 -04:00
Anuken
23c56974b2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
 2020-09-15 19:28:57 -04:00