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

10263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
slava0135
e6078bd4f6 oopsie x4 2020-11-28 21:49:59 +03:00
YellOw139
340efc3298
Typo 2020-11-28 20:49:33 +02:00
slava0135
b0477394e6 oopsie x3 2020-11-28 21:45:42 +03:00
slava0135
699750762f removing unnecessary stuff 2020-11-28 21:38:50 +03:00
slava0135
ee3348d160 oopsie x2 2020-11-28 21:10:12 +03:00
slava0135
6dc2486ce0 oopsie 2020-11-28 21:06:20 +03:00
slava0135
724a0018b8 unit payload improvements 2020-11-28 20:39:09 +03:00
老滑稽
19e03e665e
Update bundle_zh_CN.properties 2020-11-29 00:59:15 +08:00
slava0135
3b20c68a6f Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-28 19:53:04 +03:00
老滑稽
3712a90f90
Update bundle_zh_CN.properties 2020-11-29 00:35:50 +08:00
Anuken
98206446e6 Merge remote-tracking branch 'origin/master' 2020-11-28 11:31:14 -05:00
Anuken
6e62859d0e Fixed #3644 2020-11-28 11:31:07 -05:00
Felix Corvus
1e8f49e45a
1 line changed (@Prosta4okua) 
indev.campaign
 2020-11-28 19:09:21 +03:00
Felix Corvus
c188e23d06
7 translated lines 
- hint.placeDrill
- hint.placeDrill.mobile
- hint.placeConveyor
- hint.placeConveyor.mobile
- hint.placeTurret
- hint.breaking
- hint.breaking.mobile
 2020-11-28 19:07:02 +03:00
老滑稽
8b5acefdfe
Update bundle_zh_CN.properties 2020-11-29 00:05:24 +08:00
Catchears
cff957feaf
Merge branch 'master' into german-v6 2020-11-28 16:53:33 +01:00
Wiki Updater
4deb8fd626 resolve merge conflict 2020-11-28 16:49:24 +01:00
Anuken
1f1701f1d6
Update README.md 2020-11-28 10:44:14 -05:00
Anuken
e6c99e0c6d
Update README.md 2020-11-28 10:42:50 -05:00
Anuken
e6c15b526a
Merge pull request #3620 from AydenRennaker/patch-8 
Update servers_v6.json
 2020-11-28 09:50:22 -05:00
Anuken
4de516b527
Merge pull request #3639 from LeoSko/patch-2 
Update servers_v6.json
 2020-11-28 09:50:02 -05:00
slava0135
815a483d2c typo in Fires: 
/** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */
 2020-11-28 17:49:39 +03:00
Anuken
2816aeb6e9
Merge pull request #3451 from Angel-24/patch-2 
[Bundle][ES] Translation update
 2020-11-28 09:46:30 -05:00
Anuken
f40e523764
Merge pull request #3567 from CPXMC/patch-6 
Update bundle_zh_CN.properties
 2020-11-28 09:46:23 -05:00
Anuken
8a424111f0 Fixed #3633 2020-11-28 09:43:35 -05:00
Felix Corvus
efeb29f47a
4 changed lines 
- unit.nova.description
- unit.pulsar.description
- unit.quasar.description
- unit.vela.description
 2020-11-28 17:13:59 +03:00
Wiki Updater
7a81fde64e changes from Shawak 2020-11-28 14:36:55 +01:00
Leonid Skorospelov
47922834f9
Update servers_v6.json 
Ranked 1v1 gradually moving to v6
 2020-11-28 14:16:30 +02:00
Nikolass1000
2d66790aab
Complete 2020-11-28 12:18:13 +01:00
AmateurPotion
b7b4dc8f43
Update bundle_ko.properties 
2
 2020-11-28 19:54:37 +09:00
EzLam
69960017d3 wwwhat ? 2020-11-28 17:28:31 +07:00
EzLam
b1a4d51210 That why english is hard. 2020-11-28 17:07:00 +07:00
Wiki Updater
1d8fbf7aa9 final changes 2020-11-28 10:50:35 +01:00
YellOw139
2c0884ed46
Fixes 2020-11-28 11:21:46 +02:00
EzLam
9c54792341 bruh 2020-11-28 12:10:33 +07:00
NgLamVN
56b947fb9e
... 2020-11-28 11:30:35 +07:00
Quick-Korc
eb21ce24b6
Update Contributors 
Already ask Anuke about this
 2020-11-28 06:29:22 +07:00
Anuken
2a6b0fd0ce Fixed vaults not counting withdrawn items 2020-11-27 18:09:47 -05:00
Anuken
47e622dee3 (more) Campaign balancing 2020-11-27 18:07:10 -05:00
Anuken
99125e9218 Merge remote-tracking branch 'origin/master' 2020-11-27 17:37:28 -05:00
Anuken
66918f0322 Campaign balancing 2020-11-27 17:37:22 -05:00
Wiki Updater
6634e6f8a5 ... 
I think that it would be fair to add me into the list of translators and contributors as I've somehow editied over 800 lines of the german translation. If you don't think I should be added to the list, say that in a comment.
 2020-11-27 23:19:56 +01:00
Wiki Updater
525643cb17 unit descriptions 2020-11-27 23:10:58 +01:00
Anuken
b8a2c609cb
Merge pull request #3629 from Catchears/typo 
typo
 2020-11-27 16:19:16 -05:00
Wiki Updater
968277477a typo 2020-11-27 22:18:08 +01:00
Wiki Updater
4fbfb50380 more translations 2020-11-27 21:43:58 +01:00
Anuken
d06b32c20b Added boss to sector damage calculations 2020-11-27 14:18:09 -05:00
Felix Corvus
805412f812
1 new line; 1 line changed 
New:

- hint.guardian

Changed:

- hint.command
 2020-11-27 21:17:23 +03:00
Felix Corvus
de4b88013d
3 new lines 
- sector.extractionOutpost.description
- sector.impact0078.description
- sector.planetaryTerminal.description
 2020-11-27 21:13:08 +03:00
Anuken
525dc0cd7e Added bosses for sectors missing them 2020-11-27 12:35:20 -05:00