mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 17:28:14 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,391 Commits 4 Branches 160 Tags 2.3 GiB
cb3b43cc48
Commit Graph

8817 Commits

Author SHA1 Message Date
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
Thomas Widyantoko
cf16983b34
another new lines and fixes 
legacy research, Guardian = Penjaga, Purpose = Kegunaan, reconnecting, etc.
 2020-11-27 11:34:53 +07:00
Lapis
0d4c28daf2
Update bundle_ja.properties 2020-11-27 13:27:09 +09:00
Anuken
e39eceee28 Allow research even if sector was attacked after capture 2020-11-26 21:48:45 -05:00
Anuken
869c329fbf Fixed Nuclear Complex gen / Increased damage simulation harshness 2020-11-26 21:29:22 -05:00
Anuken
c8b425116e Fixed Impact0078 ore gen / Misc campaign fixes 2020-11-26 20:46:17 -05:00
Felix Corvus
fe2daa9327
2 changed lines 
- sector.biomassFacility.description
- sector.windsweptIslands.description
 2020-11-27 04:25:09 +03:00
Felix Corvus
aeaeb87fbb
2 new lines 
- sector.biomassFacility.description
- sector.windsweptIslands.description
 2020-11-27 04:21:22 +03:00
Anuken
0a290d2e10 Auto-rebuilding of broken attack sector blocks on restart 2020-11-26 20:19:13 -05:00
Anuken
9863cbc991 Disabled unit explosion team damage 2020-11-26 19:30:49 -05:00
Anuken
91c50ae126 Disabled explosion fires for item flammability <= 1 
coming soon: spore bombing?
 2020-11-26 19:25:26 -05:00
Felix Corvus
ef62bb49bc
5 new lines; 1 line changed; 1 line removed 
New:

- available
- research.legacy
- research.load
- research.discard
- reconnecting

Changed:

- indev.campaign

Removed:

- indev.popup
 2020-11-27 03:13:28 +03:00
Anuken
dae46ceb6d Campaign bugfixes / Balancing 2020-11-26 18:53:20 -05:00
Anuken
6b3919e8f7 Added Call#setItem 2020-11-26 16:49:01 -05:00
Wiki Updater
ed89a70cbc hints + sector descriptions in german 2020-11-26 21:39:14 +01:00
Anuken
1d8ec9abd9 Campaign bugfixes 2020-11-26 15:31:58 -05:00
Anuken
84474040c0 Fungal Pass map fixes 2020-11-26 14:24:35 -05:00
YellOw139
ef63c5073a
Legacy prompts 2020-11-26 21:11:55 +02:00
Anuken
3fe4ae38b6 Misc cleanup 2020-11-26 12:53:19 -05:00
Petr Gašparík
0b515395e8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-26 17:48:24 +01:00
AmateurPotion
22116314c5
1st translation bundle 
Please do not merge yet. Not all translated.
 2020-11-27 01:32:31 +09:00
Wiki Updater
35da950986 german translation 2020-11-26 16:41:46 +01:00
Anuken
465219540c Added prompt for loading legacy research data 2020-11-26 10:22:01 -05:00
Angel_24
d1563ee55e
Merge branch 'master' into patch-2 2020-11-26 10:43:13 +01:00
EzLam
49f4b1fd67 Merge branch 'master' of https://github.com/NgLamVN/Mindustry 2020-11-26 15:47:55 +07:00
EzLam
ba6d40cc22 to be continued ... 2020-11-26 15:47:30 +07:00
NgLamVN
dc15c9a7e4
To be continued ... 2020-11-26 15:42:27 +07:00
EzLam
27e22a84d3 to be continued ... 2020-11-26 15:40:35 +07:00
Petr Gašparík
33c3d587dd Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-26 09:11:09 +01:00
Angel_24
fa3a19d766
Update bundle_es.properties 2020-11-26 08:52:46 +01:00
Angel_24
0d4add667f
Update bundle_es.properties 2020-11-26 08:49:44 +01:00
Angel_24
7f214f1343
Update bundle_es.properties 2020-11-26 08:47:11 +01:00
Anuken
e1ddf115e0 Merged turret types 2020-11-25 20:41:38 -05:00
Anuken
56f1d0548e Merge remote-tracking branch 'origin/master' 2020-11-25 20:23:24 -05:00
Anuken
38471d68d7 Fixed Salt Flats being deadlocked 2020-11-25 20:23:17 -05:00
Sunny Kim
dd9c3fc8d6
Update bundle_ko.properties 2020-11-26 10:01:15 +09:00
Sunny Kim
a70e29127b
[KO]quick patch 2020-11-26 09:59:07 +09:00
Anuken
6be2b6021b
Merge pull request #3603 from skykatik/patch-12 
Some typos
 2020-11-25 18:28:30 -05:00
Skat
488147759a Some typos 2020-11-26 02:04:08 +03:00
Anuken
9a7d359626
Merge pull request #3579 from Quezler/patch-68 
Remove stray newline
 2020-11-25 17:49:40 -05:00
Anuken
0437d50a5c
Merge pull request #3598 from summetdev/patch-8 
Remove unused imports
 2020-11-25 17:49:24 -05:00
Angel_24
245e5d515a
Update contributors 2020-11-25 23:22:17 +01:00
Leonwang4234
2b8c11c451 projectors blockgroup 2020-11-25 14:19:56 -08:00
Anuken
58acc0a970 Merge remote-tracking branch 'origin/master' 2020-11-25 15:42:56 -05:00
Anuken
c874089f27 Bugfixes 2020-11-25 15:42:51 -05:00
YellOw139
91b05e4789
Reconnecting 2020-11-25 22:29:32 +02:00
Angel_24
1cc73a4077
Finished Spanish Translation, for now... 2020-11-25 21:26:24 +01:00
Antsiferov Andrew
4ac26d86f5
Remove unused imports 2020-11-25 20:04:32 +00:00
Angel_24
a693289867
Update bundle_es.properties 2020-11-25 20:57:32 +01:00
Wiki Updater
51790e0bf9 fix ai schematics with power weapons and steam gens 2020-11-25 19:52:36 +01:00
Petr Gašparík
fd80cbcae5 Update up to b002d8b 2020-11-25 18:42:20 +01:00
Petr Gašparík
45bb6fa2ee Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-25 18:20:42 +01:00
Anuken
40b67349d9 Fixed quotes 2020-11-25 11:56:10 -05:00
Anuken
735cb74483 Merge remote-tracking branch 'origin/master' 2020-11-25 11:15:50 -05:00
Anuken
bc55e43def Fixed #3591 2020-11-25 11:15:46 -05:00
Anuken
084d7e8355
Merge pull request #3583 from Quezler/patch-69 
automatic reconnect
 2020-11-25 11:14:04 -05:00
Patrick 'Quezler' Mounier
f26b3358ef
Update core/src/mindustry/ui/dialogs/JoinDialog.java 
Co-authored-by: Anuken <arnukren@gmail.com>
 2020-11-25 17:08:03 +01:00
Patrick 'Quezler' Mounier
3d6390a76a
Set the ping to null when canceling manually as well 2020-11-25 16:51:57 +01:00
Patrick 'Quezler' Mounier
ff20928bec
Anukify reconnect logic 2020-11-25 16:49:36 +01:00
Anuken
8418770bbf Merge remote-tracking branch 'origin/master' 2020-11-25 10:15:22 -05:00
Anuken
eaa7b04c3d Fixed CI / Fixed exponentially increasing broken blocks 2020-11-25 10:15:14 -05:00
Angel_24
1467a3a7fd
Update bundle_es.properties 2020-11-25 14:59:07 +01:00
EzLam
f5023aa846 Update bundle_vi.properties 2020-11-25 19:22:28 +07:00
EzLam
d10fd8e738 fix typos. 2020-11-25 17:46:38 +07:00
lapis256
8ca833f753 update bundle_ja.properties 2020-11-25 18:50:44 +09:00
Patrick 'Quezler' Mounier
b002d8b446
Update bundle.properties 2020-11-25 10:42:13 +01:00
Patrick 'Quezler' Mounier
f5e06cca54
Update NetClient.java 2020-11-25 10:41:41 +01:00
Patrick 'Quezler' Mounier
642b877ab0
Update JoinDialog.java 2020-11-25 10:40:42 +01:00
Angel_24
2a618a6600
Update bundle_es.properties 2020-11-25 10:36:48 +01:00
Angel_24
fa48f1b2e0
Merge branch 'master' into patch-2 2020-11-25 10:26:11 +01:00
Angel_24
69063e9dc5
Update contributors 2020-11-25 10:23:07 +01:00
NgLamVN
c2bedc0210
Update 2020-11-25 16:09:41 +07:00
EzLam
103f5a65b6 LOL I forgot to do that :v 2020-11-25 15:42:30 +07:00
YellOw139
e0f2c2f46f
Sector descriptions: additions and revisions 
Romanian is gonna hit stable soon.
 2020-11-25 10:40:02 +02:00
Patrick 'Quezler' Mounier
8ee3f2b2e6
Remove stray newline 2020-11-25 09:38:04 +01:00
EzLam
7697a21003 ... 2020-11-25 15:36:45 +07:00
Patrick 'Quezler' Mounier
40bf0741f0
Remove unused import 2020-11-25 09:36:12 +01:00
Quick-Korc
43fea03996
New hint translate and other 2020-11-25 15:24:35 +07:00
Nikolass1000
87da58df69
Update bundle_pl.properties 2020-11-25 09:19:35 +01:00
EzLam
72a453654e ... 2020-11-25 14:56:15 +07:00
EzLam
25c31c5250 Update to lastest main bundle. 2020-11-25 14:30:53 +07:00
Thomas Widyantoko
fac1bccda1
various fixes 2020-11-25 14:16:00 +07:00
Anuken
6633b07fb2
Merge pull request #3561 from Volas171/patch-2 
Update contributors
 2020-11-24 18:55:00 -05:00
Quick-Korc
b285165818
New Sector description Translation 2020-11-25 06:31:16 +07:00
Volas171
e65971db47
h 2020-11-24 18:30:59 -05:00
Anuken
5fd66d38bb Fixed #3573 2020-11-24 18:15:40 -05:00
Anuken
15f33b45c7 Salt Flats should probably require additive reconstructors 2020-11-24 18:12:45 -05:00
Anuken
17e66f1008 Final campaign tweaks 2020-11-24 17:17:55 -05:00
Anuken
bcaf5e4c3d Campaign balance / Smarter power node placement 2020-11-24 16:33:36 -05:00
YellOw139
ea653bf5c3
Finished (for now) 2020-11-24 20:48:40 +02:00
Anuken
6fd36d97f0 Balancing 2020-11-24 12:53:55 -05:00
Anuken
61bec243dc Campaign balance 2020-11-24 12:35:04 -05:00
Anuken
7d43856735 Bugfixes 2020-11-24 10:23:28 -05:00
CPXMC
9f8e1b93f1
Update bundle_zh_CN.properties 
单位，方块，物品的简介翻译交给你们了（滑稽
 2020-11-24 22:02:28 +08:00
Anuken
058b2ddfce Fixed #3565 2020-11-24 09:00:34 -05:00
YellOw139
7a59c7bc24
translation checkpoint 2020-11-24 13:22:42 +02:00
Angel_24
38f4154d18
Update bundle_es.properties 2020-11-24 10:47:35 +01:00
Angel_24
7ffbb93ba7
Update contributors 2020-11-24 10:30:33 +01:00
Angel_24
8004b6ce1d
Update bundle_es.properties 2020-11-24 09:39:08 +01:00
EzLam
77ba760a94 Update to lastest main bundle :) 2020-11-24 15:36:37 +07:00
Skat
12d045c631
[Typo] comiting changes* 2020-11-24 09:34:29 +03:00
Volas171
97254a6672
Update contributors 2020-11-23 22:27:08 -05:00
Anuken
2282cb89b1 Fixed sector damage calculations / Campaign balance 2020-11-23 18:09:20 -05:00
Anuken
06929ee8f3 Fixed boss hint not disappearing 2020-11-23 15:47:15 -05:00
Anuken
ec19381c4e Fixed campaign bases having ridiculous wall tiers 2020-11-23 15:41:10 -05:00
Felix Corvus
2144ac57c4
1 line changed 
sectors.survives
 2020-11-23 22:58:24 +03:00
Angel_24
7c79ee469e
Update contributors 2020-11-23 20:11:27 +01:00
Angel_24
741e6b55b0
Update contributors 2020-11-23 20:09:33 +01:00
Angel_24
6f75116197
Update bundle_es.properties 2020-11-23 20:06:37 +01:00
Anuken
4a52392ce9 Added hint about guards & armor 2020-11-23 13:09:42 -05:00
Nikolass1000
45b355508d
Update contributors 2020-11-23 18:56:06 +01:00
simba-fs
1cfa5db611
modify zh-TW translation 2020-11-23 23:48:37 +08:00
Anuken
dcbe06229c Campaign fixes & balance 2020-11-23 10:36:41 -05:00
Petr Gašparík
ab66247f8a Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-23 15:39:39 +01:00
Felix Corvus
6c87035a72
9 translated lines 
- hint.skip
- hint.desktopMove
- hint.zoom
- hint.mine
- hint.desktopShoot
- hint.depositItems
- hint.respawn
- hint.respawn.mobile
- hint.desktopPause
 2020-11-23 17:37:03 +03:00
Anuken
075be1a862 Fixed #3540 / Fixed #3544 / Fixed #3542 2020-11-23 09:12:36 -05:00
Petr Gašparík
370fd149cd Czech translation for future v117 2020-11-23 14:47:08 +01:00
Quick-Korc
849dd7e2eb
Hint translate 2020-11-23 20:32:22 +07:00
Angel_24
143be734c5
Update bundle_es.properties 2020-11-23 14:13:23 +01:00
YellOw139
23c33d87c1
Update bundle_ro.properties 
This is not ready, hence will be a draft. ea377c6f16 still unfinished. Do not merge as-is. It is unfinished and untested.

This is a rushed submission. I did not want to lose my progress; don't have time to finish it right now.
 2020-11-23 14:56:18 +02:00
Thomas Widyantoko
01a68c210c
rearranging 2020-11-23 19:31:01 +07:00
EzLam
fe01282421 re-trans 2020-11-23 18:06:06 +07:00
EzLam
226ff9aa03 re trans 2020-11-23 17:33:18 +07:00
Angel_24
ad6a3bf150
Update bundle_es.properties 2020-11-23 11:29:07 +01:00