mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-24 18:05:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,702 Commits 4 Branches 160 Tags 2.3 GiB
9f8fce72d3
Commit Graph

9075 Commits

Author SHA1 Message Date
Joshua Fan
58c1718d01 Detect double-tap 2020-12-05 22:07:09 -08:00
Anuken
29fe5dab06 Allow client research 2020-12-05 21:24:27 -05:00
Anuken
f9024e5500 Consider sectors with bases unlocked 2020-12-05 21:14:10 -05:00
Anuken
f9cfc8a2b8 Fixed #3812 / Fixed #3813 2020-12-05 20:48:56 -05:00
Anuken
d61bb66418 Fixed capture wave being set to 0 in some situations 2020-12-05 18:03:21 -05:00
Anuken
b0f62f25e6 No suggested mods 2020-12-05 17:53:49 -05:00
Anuken
bdbc9b865b Fixed distort artifacts 2020-12-05 17:50:29 -05:00
Prosta4okua
21c97571e0
Update bundle_uk_UA.properties 2020-12-06 00:45:30 +02:00
Prosta4okua
8e92be9037
Update bundle_uk_UA.properties 2020-12-06 00:42:18 +02:00
Anuken
f6428b8857 Fixed #3808 2020-12-05 16:40:54 -05:00
Anuken
cb3b43cc48 Disabled cursor scaling 2020-12-05 14:23:29 -05:00
Anuken
587c63fc92 Merge remote-tracking branch 'origin/master' 2020-12-05 14:16:06 -05:00
Anuken
97fa8057ba Fixed #3805 2020-12-05 14:16:02 -05:00
Anuken
6a2bb7b01f
Merge pull request #3794 from sharlotte-mobile/patch-1 
ko hotfix
 2020-12-05 11:05:55 -05:00
Anuken
edbced6642 Fixed #3798 2020-12-05 10:58:30 -05:00
Anuken
8c0477f6bd Fixed #3795 2020-12-05 10:30:46 -05:00
Angel_24
4e00c4b015
Update bundle_es.properties 2020-12-05 14:06:20 +01:00
Sharlotte
42f0364319
ko hotfix 
translate all missing values
removed over-translated values
and do Uniform some terms, correction of typos.
 2020-12-05 20:10:03 +09:00
Joshua Fan
6ececea004 Enable double-click to play sector 2020-12-05 00:58:56 -08:00
Anuken
6570d23512 Fixed #3786 2020-12-04 19:24:09 -05:00
Anuken
7ec3ab5a17 Fixed #3784 2020-12-04 18:55:37 -05:00
Anuken
bac4bb8c8f Heighten export cap when production is negative 2020-12-04 15:20:15 -05:00
YellOw139
5ac1c32652
coreIncinerate 2020-12-04 22:19:56 +02:00
Anuken
dec5a2aaaf Minor campaign tweaks 2020-12-04 15:07:35 -05:00
Anuken
5c3ae425ae Display locked sectors / Core incinerate hint 2020-12-04 11:31:27 -05:00
Anuken
744b1b2037 Looking into test failure 2020-12-04 10:56:47 -05:00
Anuken
a313ca8a26 Checking if tests fail 2020-12-04 10:44:39 -05:00
Anuken
bc70c08820 Fixed #3756 2020-12-04 10:25:41 -05:00
Diegator04
70c6cd2e87
Complete bundle_it 
I compared the **@GioIacca9's bundle** with mine so I was able to notice **mistakes** and **missing translations** which I corrected. We worked together and we discussed about a suitable words and phrases in italian. Furthermore I added the **first version** of _unit's names_, we'll improve them in the future.
 2020-12-04 13:55:22 +01:00
Angel_24
a8a629c5ef
Update bundle_es.properties 2020-12-04 11:24:25 +01:00
Angel_24
8e6dd98a5a
Update bundle_es.properties 2020-12-04 10:44:15 +01:00
YellOw139
39b8627a60
[Bundle][RO] Translation Update 
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit 48c8357ff7
- Abilities should now be clear enough. Less of a mess.
- Typo fixes & various other improvements
 2020-12-04 09:32:35 +02:00
Anuken
a451ad895c Slight sei buff 2020-12-03 20:29:58 -05:00
Anuken
d13b69c36f Sort community servers by ping 2020-12-03 16:49:30 -05:00
Angel_24
2af988d71f
Update bundle_es.properties 
Just one more little tweak
 2020-12-03 19:51:51 +01:00
Angel_24
63318f9b67
Update bundle_es.properties 
Minnor changes
 2020-12-03 19:47:00 +01:00
Angel_24
7f032edd6f
Update bundle_es.properties 
added servers disclaimer
 2020-12-03 19:37:12 +01:00
Angel_24
aff5b8bed6
Update bundle_es.properties 
New hints translated
 2020-12-03 19:28:01 +01:00
VitLogArx
22a50eec60
Update bundle_be.properties 
Partially updated belarusian translation. Fixed some mistakes.
 2020-12-03 21:00:41 +03:00
Anuken
51b4078288 Clean tests before running 2020-12-03 11:05:02 -05:00
Anuken
9fa2691b02 Fixed campaign idle boss spoofing 2020-12-03 10:05:52 -05:00
Nikolass1000
df418c5a7d
Small fix 2020-12-03 10:49:58 +01:00
Anuken
78c8c57649 Made water unlocked again 2020-12-02 18:01:46 -05:00
Anuken
e19c857d74 Possible crash fix 2020-12-02 16:08:53 -05:00
Anuken
b18f418c61 Reduced easy sector difficulty 2020-12-02 14:48:42 -05:00
Anuken
12ee38476c Minor build fix 2020-12-02 14:35:03 -05:00
Anuken
48c8357ff7 Added community server disclaimer 2020-12-02 14:32:51 -05:00
Anuken
a0702559f3 Fixed #3725 2020-12-02 14:14:42 -05:00
Anuken
a333fa3722 Added more hints 2020-12-02 13:40:49 -05:00
Anuken
5284750c6a Merge remote-tracking branch 'origin/master' 2020-12-02 13:02:35 -05:00
Anuken
9c616fd03b Possible fix for notched insets 2020-12-02 13:02:27 -05:00
Patrick 'Quezler' Mounier
2e586c4403
Update ConstructBlock.java 2020-12-02 18:54:46 +01:00
Patrick 'Quezler' Mounier
129f21e3a9
Update Boulder.java 2020-12-02 18:01:40 +01:00
Patrick 'Quezler' Mounier
435f15a450
Update ConstructBlock.java 2020-12-02 18:00:50 +01:00
Patrick 'Quezler' Mounier
3eac8cb6ad
Update Boulder.java 2020-12-02 17:59:20 +01:00
Patrick 'Quezler' Mounier
ea96bf2675
Update Block.java 2020-12-02 17:58:58 +01:00
Patrick 'Quezler' Mounier
e4c3664cc6
Update ConstructBlock.java 2020-12-02 16:36:07 +01:00
Patrick 'Quezler' Mounier
664cd6a3a0
Update ConstructBlock.java 2020-12-02 16:26:22 +01:00
Anuken
c26a9bd123
Merge pull request #3715 from Quezler/patch-75 
Keep items inside reconstructor when construction booped
 2020-12-02 10:05:51 -05:00
Anuken
395f7193ea Merge remote-tracking branch 'origin/master' 2020-12-02 09:56:06 -05:00
Anuken
775e17a726 Fixed #3709 2020-12-02 09:56:02 -05:00
Anuken
900ec8db6a
Merge pull request #3717 from Quezler/patch-76 
Fixes massdriver typo
 2020-12-02 09:54:37 -05:00
Anuken
e23a7c213c
Merge pull request #3710 from joshuaptfan/master 
Spellcheck English Steam achievements
 2020-12-02 09:53:46 -05:00
Patrick 'Quezler' Mounier
b64df565a4
Update MassDriver.java 2020-12-02 14:09:19 +01:00
Patrick 'Quezler' Mounier
382e27e1e4
Populate prevBuild when deconstructting 2020-12-02 12:02:49 +01:00
Patrick 'Quezler' Mounier
0dd95e736d
Add items back to reconstructor if it overwrote itself 2020-12-02 12:01:21 +01:00
MEEP of Faith
380c9ab113
Why is this protected in the first place? 2020-12-01 22:17:32 -08:00
joshuaptfan
1028ade80d Fix Poly unit description 2020-12-01 21:07:44 -08:00
Anuken
430538ea7e Possible fix for "unsupported combination of formats" error 2020-12-01 18:17:57 -05:00
Anuken
ee966d1198 Removed requirements for optional inputs of blocks 2020-12-01 18:02:20 -05:00
Anuken
076363ac87
Merge pull request #3651 from Prosta4okua/patch-1 
[Bundle][uk_UA]Update translation
 2020-12-01 16:53:47 -05:00
Anuken
327442f6fe
Merge pull request #3676 from Quezler/patch-74 
Fix BlockForge progress bar & recenter payload
 2020-12-01 16:53:13 -05:00
Anuken
c03400ccbc
Merge pull request #3622 from genNAowl/distributors-come-on 
Allow Distributors to Replace Conveyors
 2020-12-01 16:46:09 -05:00
Anuken
a5ad45ff30 Fixed #3706 2020-12-01 15:57:20 -05:00
Anuken
f8a859620d
Merge pull request #3669 from Quezler/patch-73 
per anuke's request
 2020-12-01 14:02:03 -05:00
Anuken
30107db81e Fixed #3702 2020-12-01 13:01:38 -05:00
Anuken
305e2642ba Minor bugfixes 2020-12-01 12:48:26 -05:00
Anuken
448fef980b Community server fetch logging 2020-12-01 09:39:30 -05:00
Anuken
11168efffa
Merge pull request #3524 from NgLamVN/master 
Vietnamese translations
 2020-12-01 09:24:22 -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
EzLam
6f139641da 85% complete. 2020-12-01 17:12:58 +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
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
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
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
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
38f722e0b6
Merge branch 'master' into patch-3 2020-11-30 18:10:28 -05:00
Anuken
9c773f48ee
Merge pull request #3548 from simba-fs/master 
modify zh-TW translation
 2020-11-30 18:10:07 -05:00
Anuken
d142777fca
Merge pull request #3547 from PetrGasparik/v117 
[Bundle][cs] Czech translation ready for 6.0
 2020-11-30 18:09:57 -05:00
Anuken
2332595f2d
Merge pull request #3545 from YellOw139/patch-1 
[Bundle][RO] Translation Update
 2020-11-30 18:09:36 -05:00
Anuken
cdb1003133
Merge pull request #3443 from DaGamerFiles/patch-4 
[Bundle][ID] Updated translation
 2020-11-30 18:09:14 -05:00
Vanguard
ca2dabe769
КОММИТ МНЕ В РОУТЕР 2020-12-01 02:07:36 +03:00
Felix Corvus
0c1817eb12 2 changed lines; 9 translated lines 
Changed:

- hint.placeTurret
- hint.breaking.mobile

Translated:

- hint.research
- hint.research.mobile
- hint.unitControl
- hint.unitControl.mobile
- hint.launch
- hint.launch.mobile
- hint.schematicSelect
- hint.conveyorPathfind
- hint.conveyorPathfind.mobile
 2020-12-01 01:50:10 +03:00
Anuken
c0c8235e3d Merge remote-tracking branch 'origin/master' 2020-11-30 17:49:24 -05:00
Anuken
d868ff81bf Dependency resolution fix 2020-11-30 17:49:20 -05:00
Anuken
16f64a90a8
Merge pull request #3675 from Remint32/patch-4 
typo
 2020-11-30 17:32:08 -05:00
Felix Corvus
8dae9babab
not typo 2020-12-01 01:27:34 +03:00
Anuken
d33cea6003 Merge remote-tracking branch 'origin/master' 2020-11-30 17:12:33 -05:00
Anuken
9870098457 Updated Steam meta / Fixed #3673 2020-11-30 17:12:29 -05:00
Patrick 'Quezler' Mounier
4102c380d2
Update BlockForge.java 2020-11-30 22:47:26 +01:00
Felix Corvus
44204db2bb
typo 2020-12-01 00:30:52 +03:00
GioIacca9
a87e58db93
v6 Italian bundle 2020-11-30 22:16:13 +01:00
Petr Gašparík
082a43da35 Czech translation up to date with final beta 2020-11-30 21:35:14 +01:00
Petr Gašparík
ca35b113f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-30 21:29:13 +01:00
Nikolass1000
f23e63decf
Polish complete translation. 2020-11-30 19:44:51 +01:00
Anuken
c09b1e0d6e
Merge pull request #3562 from skykatik/patch-10 
[Typo] comiting changes
 2020-11-30 12:58:55 -05:00
Anuken
3b9f775f82
Merge pull request #3535 from Nikolass1000/patch-2 
Update bundle_pl.properties
 2020-11-30 12:56:59 -05:00
Anuken
af122a76a4 Merge remote-tracking branch 'origin/master' 2020-11-30 12:52:15 -05:00
Anuken
5c89fa2d2b Achievement cleanup 2020-11-30 12:52:10 -05:00
Patrick 'Quezler' Mounier
bbee3ae9cd
Update BuildingComp.java 2020-11-30 18:36:57 +01:00
Anuken
e76dee8cbe
Merge pull request #3665 from Quezler/patch-72 
Fix configuring buildings with blocks
 2020-11-30 12:32:46 -05:00
AmateurPotion
dd4b130c7a
Update bundle_ko.properties 2020-12-01 01:41:21 +09:00
Anuken
639702ae1a Fixed unit tests 2020-11-30 11:12:09 -05:00
Patrick 'Quezler' Mounier
9df4eac2f8
Update BuildingComp.java 2020-11-30 16:36:10 +01:00
Anuken
18b0cd4e99 Merge remote-tracking branch 'origin/master' 2020-11-30 10:15:58 -05:00
Anuken
371a14af87 Inlined Time.time 2020-11-30 10:15:22 -05:00
AmateurPotion
051a3a07c3
Update bundle_ko.properties 
Real Final
 2020-11-30 22:59:38 +09:00
AmateurPotion
a4a8470064
Update bundle_ko.properties 2020-11-30 22:42:08 +09:00
Patrick 'Quezler' Mounier
5ba99ecb42
Fixed #3661 2020-11-30 14:21:18 +01:00
EzLam
f67f09934e Description. 2020-11-30 18:50:16 +07:00
EzLam
149ce3bccf "Game Over": It doesnt mean you lose the game. 2020-11-30 17:20:05 +07:00
YellOw139
fb580326b2
Easier reading for the monolingual 2020-11-30 11:53:52 +02:00
EzLam
00a25f31b8 Description ... 2020-11-30 16:48:23 +07:00
Ngọc Lam
e535f94832
Update. 2020-11-30 15:58:43 +07:00
老滑稽
4f3e353b75
Update bundle_zh_CN.properties 2020-11-30 12:45:27 +08:00
Anuken
c41dfa46aa Fixed #3657 2020-11-29 19:41:10 -05:00
Anuken
ba9bc472e8 Merge remote-tracking branch 'origin/master' 2020-11-29 16:34:35 -05:00
Anuken
a7c18fc598 Fixed #3656 2020-11-29 16:34:31 -05:00
Anuken
67169a2ffc
Merge pull request #3655 from Quezler/patch-70 
display the repair field healed effect at the healed unit(s)
 2020-11-29 13:59:57 -05:00
Anuken
2a9f362e15 Fixed #3654 2020-11-29 13:59:09 -05:00
Patrick 'Quezler' Mounier
80f027471c
Update RepairFieldAbility.java 2020-11-29 19:35:49 +01:00
Anuken
682c1692df Compilation fix 2020-11-29 12:15:22 -05:00
lapis256
da97d1e1eb update bundle_ja.properties 2020-11-30 02:14:53 +09:00
Anuken
979e39f588 Added unit to BlockBuildBeginEvent 2020-11-29 12:14:46 -05:00
lapis256
4fb97b60a9 update bundle_ja.properties 2020-11-30 01:54:43 +09:00
Anuken
29be8176c1 Fixed some crashes 2020-11-29 11:08:12 -05:00
老滑稽
d322de8686
Update bundle_zh_CN.properties 2020-11-29 23:55:37 +08:00
Anuken
e3f2966db3 Nevermind, reverting to beta for last pre-release 2020-11-29 10:37:07 -05:00
Anuken
8f186a16b3 Build beginPlace+Break access tracking / Instant rotation 2020-11-29 10:12:24 -05:00
老滑稽
532aa88dca
Update bundle_zh_CN.properties 2020-11-29 23:00:45 +08:00
Anuken
9a3b21d77a Fixed #3650 2020-11-29 09:54:52 -05:00
老滑稽
b488cd8dff
Update bundle_zh_CN.properties 2020-11-29 22:48:14 +08:00
Prosta4okua
06faa368cc
Update bundle_uk_UA.properties 2020-11-29 14:06:41 +02:00
AmateurPotion
118b438519
Update bundle_ko.properties 2020-11-29 19:10:50 +09:00
AmateurPotion
a7a3b94caf
Update bundle_ko.properties 2020-11-29 19:07:39 +09:00
AmateurPotion
a1c26a610c
Update bundle_ko.properties 2020-11-29 18:57:34 +09:00
EzLam
8f58f40b1a Ready for review ? 2020-11-29 16:53:22 +07:00
AmateurPotion
856a8c11aa
Update bundle_ko.properties 2020-11-29 18:40:04 +09:00
EzLam
7bab4d67e1 vietnamese is harder. 2020-11-29 16:30:38 +07:00
EzLam
3a2514e937 That why English is HARD. 2020-11-29 16:18:33 +07:00
Anuken
23fc86fac1 Updated wiki links 2020-11-28 23:59:56 -05:00
Anuken
3d6fd8a351 De-abstracted weather 2020-11-28 23:23:39 -05:00
Ngọc Lam
66b540988b
happy birthday to me :) 2020-11-29 11:02:00 +07:00
Anuken
3c51d82a1a Fixed #3648 2020-11-28 22:45:36 -05:00
老滑稽
d6c5eb121c
Update bundle_zh_CN.properties 2020-11-29 11:03:36 +08:00
Anuken
b63501b1c7 Core overfill bugfix 2020-11-28 21:51:26 -05:00
老滑稽
25015a61ae
Update bundle_zh_CN.properties 2020-11-29 10:36:28 +08:00
EzLam
c2d808b921 happy birthday to me ._. 2020-11-29 08:51:55 +07:00
Anuken
810238d0f9 Cleanup 2020-11-28 20:30:43 -05:00
Anuken
bb16d1c613 Removed Abstract block classes for better code inspection 2020-11-28 19:12:27 -05:00
Anuken
b8cb17c0c5 Campaign production fixes 2020-11-28 15:08:53 -05:00
YellOw139
f4c6870ee9
And so ability.unitspawn works thanks new wiki 2020-11-28 21:18:00 +02:00
Anuken
9ca3cd49b8 Merge remote-tracking branch 'origin/master' 2020-11-28 13:57:23 -05:00
Anuken
e6544b73db Switching modifier from beta to release 2020-11-28 13:57:19 -05:00
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
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
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
Leonwang4234
4cda52caf7 size >= other.size 2020-11-27 21:15:33 -08: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
Anuken
8b6fc7f3ac Fixed #3628 2020-11-27 12:27:56 -05:00
Anuken
8dd66fb942 Campaign tweaks 2020-11-27 11:56:01 -05:00
Angel_24
7e5c69a107
Update bundle_es.properties 2020-11-27 13:07:38 +01:00
EzLam
f7170dc39a Fix some typos. 2020-11-27 17:41:49 +07:00
Angel_24
40dd3d5677
Update bundle_es.properties 2020-11-27 10:07:38 +01:00
NgLamVN
3aabfaf14b
60% Complete. 2020-11-27 15:28:21 +07:00
EzLam
2cc0ae3d81 What "unit" mean ?? 2020-11-27 15:24:55 +07:00
Leonwang4234
ab8a381ad9 Lol how did it compile without the @Override 2020-11-26 23:33:18 -08:00
Leonwang4234
ced6369b25 Update Router.java 2020-11-26 23:28:05 -08:00
Thomas Widyantoko
c545e03852
legacy research discard fix 2020-11-27 11:47:05 +07:00