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
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