mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-31 01:44:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,162 Commits 4 Branches 160 Tags 2.3 GiB
5ecd73bdb0
Commit Graph

5483 Commits

Author SHA1 Message Date
Anuken
d3210a0831 Misc minor fixes 2022-07-15 20:25:42 -04:00
Anuken
830a771a90 Merge remote-tracking branch 'origin/master' 2022-07-15 19:28:40 -04:00
Anuken
2ec1f9f55d typo 2022-07-15 19:28:35 -04:00
Github Actions
2e7dca06ed Automatic bundle update 2022-07-15 23:27:34 +00:00
Anuken
8d6cac39d0 Fixed #7178 / Maps renamed 2022-07-15 19:26:23 -04:00
Anuken
f6093c864f Fixed map-3 waves 2022-07-15 18:57:01 -04:00
Anuken
9eacbb45d1 glenn what did you do 2022-07-15 17:14:57 -04:00
Anuken
926cf7e0fa Fixed some messed-up objectives 2022-07-15 16:56:34 -04:00
Github Actions
3907a23fb4 Automatic bundle update 2022-07-15 14:42:13 +00:00
GlennFolker
695c19d0b0
Tree-like objective node structure (#7152) 
* overall structure

* overall layout

* field interpreter

* less bloated UI

* scroll pan't

* strip off the 'Marker' suffix

* e

* all (hopefully all...) interpreters finished.

* onset

* two, four

* i don't understand how icon mappings work.

* separate remover and indexer

* some cleanups

* untested mobile support

* contrib

* ok anuke

* fix conflicts 2

* hidden
 2022-07-15 10:41:18 -04:00
BetaEridani
d72d663219
Update bundle_fi.properties (#7164) 
Swapped the places of two text lines to correct a mistake.
 2022-07-14 23:37:14 -04:00
Github Actions
bb7f96437c Automatic bundle update 2022-07-15 03:34:36 +00:00
Catchears
e4274c2b49
german erekir & v7 translation (#6869) 
* initial german erekir translation

* first ideas

* Update bundle_de.properties

added missing ones, fixed some typos

* Update bundle_de.properties

* Update bundle_de.properties

* suggested changes

* shawak's changes

* update to 4c3ee57ce9

* update to 3927841f43

* update to 371394df6f

* update to d6539b267c

Co-authored-by: JoeFLYtheCoder <73280709+jdopss@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-14 23:33:26 -04:00
Github Actions
521519c8ab Automatic bundle update 2022-07-14 19:45:43 +00:00
Epowerj
6aa9623512 Added a temporary description for four 2022-07-14 15:44:32 -04:00
Github Actions
07427e68a1 Automatic bundle update 2022-07-14 19:28:44 +00:00
Epowerj
f149bed64e Tweaked split 2022-07-14 15:11:11 -04:00
Epowerj
9d3bf2d489 Tweaked split 2022-07-14 15:06:57 -04:00
Epowerj
43416f90e5 Added description to split 2022-07-14 14:50:00 -04:00
Epowerj
3a3eb2c63d Progress on split 2022-07-13 15:05:52 -04:00
Epowerj
24e70faf02 Start reworking split 2022-07-12 20:37:17 -04:00
Epowerj
458ab9d639 tweaked atlas 2022-07-11 21:36:15 -04:00
Epowerj
ca18b851a1 Tweaked atlas, set max squad size 2022-07-11 18:44:28 -04:00
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Github Actions
9d4839b26d Automatic bundle update 2022-07-11 22:19:30 +00:00
Anuken
72b36d97bd RTS max squad size 2022-07-11 18:18:22 -04:00
Github Actions
a7db6d86ff Automatic bundle update 2022-07-11 21:16:23 +00:00
Epowerj
7aea85668b forgot period lol 2022-07-11 17:15:11 -04:00
Epowerj
9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
 2022-07-11 17:14:39 -04:00
Epowerj
735d81e42b Typo 2022-07-11 17:03:55 -04:00
Epowerj
4746cdbb6b Added description to atlas 2022-07-11 17:02:22 -04:00
Github Actions
788e63cf28 Automatic bundle update 2022-07-11 18:39:05 +00:00
Anuken
c9f24692c5 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-11 14:38:00 -04:00
Anuken
411b6d7460 Shockwave tower block 2022-07-11 14:37:57 -04:00
BetaEridani
49122729af
Update bundle_fi.properties (#7163) 
Fixed some minor typos + translated names of the two new turrets.
 2022-07-11 06:44:58 -04:00
Github Actions
28aad7313e Automatic bundle update 2022-07-10 14:14:47 +00:00
BetaEridani
6b542ef494
Update bundle_fi.properties (#7142) 
Translated bundle_fi.properties entirely to finnish. Also fixed some grammar.
 2022-07-10 10:13:38 -04:00
Github Actions
4bc0ce9338 Automatic bundle update 2022-07-09 20:32:32 +00:00
Jerzozwierz
1e7bd3e8f4
Big update to bundle_pl (#7159) 
Big changes to bundle_pl. Huge cleanup. The changes were consulted with translators such as Somka HybridDeathPrime. They had no objections. Polish chat had no objections. All changes were made mainly by me, ۲▁⊕ᶬṉ๏൩⁷ ©, pożeracz cukierków#2648, p0gn'1_#1415, [PL] Stalker TurTur#7069.
 2022-07-09 16:31:18 -04:00
Github Actions
cbc4c0d3b2 Automatic bundle update 2022-07-09 04:34:18 +00:00
Anuken
311118ae58 Hastily implemented final endgame turret 2022-07-09 00:33:15 -04:00
Epowerj
5d852085c2 Tweaked three 2022-07-08 18:35:56 -04:00
Anuken
3da0486320 Indonesian bundle loading hack 2022-07-08 17:07:49 -04:00
Github Actions
0182e61803 Automatic bundle update 2022-07-07 21:04:47 +00:00
Epowerj
32d586617d tweaked sector three 2022-07-07 17:03:30 -04:00
Epowerj
c2a9c77510 Added a sector description for three 2022-07-07 16:57:12 -04:00
Github Actions
42cd5ee12e Automatic bundle update 2022-07-07 02:10:21 +00:00
1stvaliduser
bfd41c34a4
Update bundle_uk_UA.properties (#7138) 
* Update bundle_uk_UA.properties

Yesn't

* Update bundle_uk_UA.properties

Yay new update)
 2022-07-06 22:09:27 -04:00
JniTrRny
1d9fb1147b
Update bundle_th.properties (#7137) 2022-07-06 22:09:17 -04:00
Github Actions
5ea8538e0f Automatic bundle update 2022-07-07 01:29:48 +00:00
Epowerj
624960e1c2 Tweaked lake yellow tiles 2022-07-06 21:28:46 -04:00
Epowerj
e0658fdd2d Added accents to lake description 2022-07-06 21:14:07 -04:00
Epowerj
3ef2b2f27e Tweaked lake starter base 2022-07-06 20:33:52 -04:00
Epowerj
97a2f66fcb Added a description for lake 2022-07-06 20:33:37 -04:00
Epowerj
7bc943a862 Tweaked Two's enemy base 2022-07-06 20:13:15 -04:00
Epowerj
6ed64e6504 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-06 18:01:05 -04:00
Epowerj
25d92c680b Fixed small issue with wall placement in two 2022-07-06 17:08:40 -04:00
Epowerj
daffc73d0c Fixed issue with missing objectives on two 2022-07-06 16:52:08 -04:00
Epowerj
c6c2b85c29 Changed split's waves to not be infinite for now 2022-07-06 14:52:14 -04:00
Github Actions
5e45b64ee1 Automatic bundle update 2022-07-06 17:00:37 +00:00
Anuken
d6539b267c Bundle reorganization 2022-07-06 12:59:26 -04:00
Anuken
69a26900fe Don't draw shape parts at 0 rad/stroke 2022-07-05 20:15:34 -04:00
Epowerj
3e393b80d6 Added some maps and moved tech tree around. 
Not tested yet.
 2022-07-05 18:46:59 -04:00
Github Actions
85321d7465 Automatic bundle update 2022-07-05 22:42:07 +00:00
MEEPofFaith
45bc4dcb00
Underflow duct (#6957) 
* Underflow Gate

I'm not sure why ClassMap decided to import OverflowDuct instead of using the full path when being generated.

* Better top sprite

Also fix base asymmetry

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-05 18:41:13 -04:00
Github Actions
d00b6cbcc6 Automatic bundle update 2022-07-05 19:05:25 +00:00
彭瑞暄
e6426d89e3
Update bundle_zh_TW.properties (#7128) 2022-07-05 15:04:27 -04:00
MSB
99f6f2c00d
Update bundle_nl.properties (#7129) 2022-07-05 15:04:12 -04:00
Github Actions
de27ce89a7 Automatic bundle update 2022-07-05 18:59:58 +00:00
ThatOneBepis
f880843dfd
it here (#7130) 2022-07-05 14:59:02 -04:00
Anuken
5ce61b863b New WIP turret 2022-07-04 20:23:05 -04:00
Lucky Clover
cdbe1a9123
revert the most vehemently OPPOSED zh-CN translation (#7112) 2022-07-03 14:49:24 -04:00
Github Actions
adb000d1c8 Automatic bundle update 2022-07-03 18:48:42 +00:00
Alex25820
6323c926f8
Update bundle_sv.properties (#7077) 
* Update bundle_sv.properties

* Update contributors

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-03 14:47:26 -04:00
Github Actions
aea5097dfc Automatic bundle update 2022-07-03 18:46:05 +00:00
Damian
36e50d81cc
Update at bundle_pl.properties (#7116) 
Pneumatic drill not drill pneumatic, new descriptions for some units and a bunch of corrections.
 2022-07-03 14:44:59 -04:00
1stvaliduser
64dc854bdd
Update bundle_uk_UA.properties(small changes) (#7118) 
* Update bundle_uk_UA.properties

A lot of stuff

* :)

* Update bundle_uk_UA.properties

Small changes

* Update bundle_uk_UA.properties

Oops

* Update bundle_uk_UA.properties
 2022-07-03 14:17:52 -04:00
Somka000
40dd80b95a
Wall in mindustry is not a wall in a house (#7111) 2022-07-02 20:21:59 -04:00
Github Actions
bcb3a3bbed Automatic bundle update 2022-07-02 21:38:05 +00:00
Damian
773232bcb9
Update at bundle_pl.properties (#7110) 
Names for new content, new descriptions and corrections. Merged with not accepted update from over a week ago.
 2022-07-02 17:37:11 -04:00
Angel-24
895122848c
[ES] update bundle_es.properties (#7034) 
* [ES] update bundle_es.properties

Translated the latest automatic bundle updates and reviewing a few changes from the previous commit.

* Revisión junto a RexHm

* Update bundle_es.properties

P

* Update bundle_es.properties

* Volas171 translations.

* Update bundle_es.properties

Just realized how world processors works. I was considering to update this block's names, but referring to "world" as "integrado" somehow alludes that these blocks cannot be damaged or broken, so I decided to keep their names anyways. I'd bet they're actually fine. :P
 2022-07-02 10:26:08 -04:00
Nunting
6974e5bbe6
Update bundle_ko.properties (#7105) 2022-07-02 10:17:58 -04:00
xem8k5
dd3f507b97
Update bundle_zh_CN.properties (#7107) 2022-07-02 10:17:50 -04:00
Github Actions
97d077df84 Automatic bundle update 2022-07-01 16:52:44 +00:00
JniTrRny
371394df6f
nice typo (#7104) 2022-07-01 12:51:47 -04:00
Github Actions
638172c8cf Automatic bundle update 2022-07-01 15:50:59 +00:00
xem8k5
f594461971
Update bundle_zh_CN.properties for scathe (#7095) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-07-01 11:50:03 -04:00
superSTA101
63b863166b
Update bundle_fi.properties (#7103) 
I transalted few words and descriptions and also fixed some. Imight translate more in the future :)
 2022-07-01 11:49:49 -04:00
Nunting
a30172c604
Update bundle_ko.properties (#7098) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-07-01 11:48:55 -04:00
JniTrRny
fe5a7a734a
Update bundle_th.properties (#7101) 2022-07-01 11:48:44 -04:00
1stvaliduser
d4bd6796fc
Update bundle_uk_UA.properties) (#7102) 
* Update bundle_uk_UA.properties

A lot of stuff

* :)
 2022-07-01 11:48:24 -04:00
Github Actions
261714d395 Automatic bundle update 2022-06-30 03:04:25 +00:00
xem8k5
2e6016ea76
Update bundle.properties (#7096) 2022-06-29 23:03:26 -04:00
Github Actions
82b3bd7520 Automatic bundle update 2022-06-29 22:51:22 +00:00
Anuken
efc7194fbe Bundle update 2022-06-29 18:50:09 -04:00
Anuken
28e777e1e4 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-06-29 17:38:10 -04:00
Anuken
36aa56f251 New WIP missile turret 2022-06-29 17:37:32 -04:00
smol
1c1b1295d1
changes (#7089) 
* a

* i guess so

* despawnUnitCount, which i forgot to include

* changes + despawnUnitRadius field

* enter?

* no

* can

you not
 2022-06-29 12:39:10 -04:00
Github Actions
4f0e634b42 Automatic bundle update 2022-06-27 16:54:13 +00:00
xem8k5
82ffa91b49
Update bundle_zh_CN.properties aaaaaagain (#7072) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-06-27 12:53:01 -04:00
Anuken
d857ef6290 Merge remote-tracking branch 'origin/master' 2022-06-27 10:07:04 -04:00
Anuken
3ef0f0f56e Mod release browser cleanup 2022-06-27 10:06:58 -04:00
Github Actions
8f0b8c1277 Automatic bundle update 2022-06-27 13:57:57 +00:00
KayAyeAre
b72702957b
Selectable mod releases (#7079) 
* filterable power node connections

* selectable mod releases

* Update contributors

* selectable mod releases

* Update contributors

* Revert "Merge branch 'master' of https://github.com/KayyAyeAre/Mindustry"

This reverts commit 1f210a898a, reversing
changes made to 8ba6d4b2aa.

* move the release selection to a new button
 2022-06-27 09:56:45 -04:00
Github Actions
0698c5dd8f Automatic bundle update 2022-06-26 15:52:10 +00:00
JniTrRny
a2513493df
better generation UI (#7078) 2022-06-26 11:51:17 -04:00
Github Actions
6f3c91c241 Automatic bundle update 2022-06-25 13:08:30 +00:00
xem8k5
2ac0c79b4f
Update bundle.properties (#7073) 2022-06-25 09:07:09 -04:00
Github Actions
8b66107833 Automatic bundle update 2022-06-24 00:58:28 +00:00
Anuken
be61b45d08 WIP point laser turret 2022-06-23 20:57:22 -04:00
Anuken
ac47d22ea1 Map resize dialog shift options 2022-06-23 17:10:44 -04:00
Anuken
e682a0f1d3 WIP/unfinished map 2022-06-23 16:55:16 -04:00
Anuken
4ba5be8d31 Misc improvements / Latum death unit spawning 2022-06-23 13:16:25 -04:00
Github Actions
54c4859e92 Automatic bundle update 2022-06-22 18:20:29 +00:00
xem8k5
53f4bf7b78
Update bundle_zh_CN.properties by lastcommanded and so on (#7036) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-06-22 14:19:07 -04:00
Anuken
e47af0c33f WIP/unfinished turret sprites 2022-06-21 10:03:38 -04:00
Github Actions
2f45ec7c90 Automatic bundle update 2022-06-20 23:37:58 +00:00
MEEPofFaith
59b7cddd7d
Module tier stat display (#7054) 2022-06-20 19:36:52 -04:00
Damian
85ddd2764b
Name updates, block name changes and some corrections. (#7044) 
* Name updates, block name changes and some corrections.

* More corrections.

* Corrections, followed by original bundle.properties

Item descriptions, some other descriptions, and I think some errors in translating
 2022-06-19 15:10:40 -04:00
Github Actions
3137ec09e3 Automatic bundle update 2022-06-19 14:58:55 +00:00
Goobrr
625f7e9936
LStatement categories + improved UI (#7046) 
* LStatement categories + improved UI

Co-authored-by: code-explorer786 <68312688+code-explorer786@users.noreply.github.com>

* annihilate LStatement#color

Co-authored-by: code-explorer786 <68312688+code-explorer786@users.noreply.github.com>
 2022-06-19 10:57:49 -04:00
1stvaliduser
a30f6325d4
bundle_uk_UA.properties(corrections) (#7045) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2022-06-19 09:14:00 -04:00
RTOmega
b59e519e0d
TR Translate (#7043) 
* TR Translate

* Update bundle_tr.properties

* Update bundle_tr.properties

* Update bundle_tr.properties
 2022-06-18 12:56:56 -04:00
Github Actions
8f8ffd1aeb Automatic bundle update 2022-06-18 14:16:59 +00:00
Prosta4okua
54eabee103
Update bundle_uk_UA.properties (#7042) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2022-06-18 10:15:56 -04:00
Github Actions
58e274b29f Automatic bundle update 2022-06-17 22:20:30 +00:00
Ilya246
99f55ae64c
More info on unit control responsibility (#7016) 
* do

* net.active()
 2022-06-17 18:19:17 -04:00
Anuken
55e03635c6 Merge remote-tracking branch 'origin/master' 2022-06-16 20:02:24 -04:00
Anuken
02f40d1e29 WIP shielded wall 2022-06-16 20:02:15 -04:00
Github Actions
4c3ee57ce9 Automatic bundle update 2022-06-16 19:38:22 +00:00
Angel-24
355ad39a7e
[ES] bundle_es.properties quality fixes (#6868) 
* Update bundle_es.properties

* Update contributors

* Update bundle_es.properties

* "Plano"/"Plantilla" → "Esquema"

* Improved "splash damage" string

* Plasma bore → "Perforador de plasma"

* World processor → "Procesador integrado"

The "world processor" and "world memory cell" are blocks initially placed as a part of the map. Using the word "integrado" instead of "global" fits better for these blocks, indicating that this block is built within the map by default.

* Update bundle_es.properties

Enable Console, VSync, and audio volume options.
 2022-06-16 15:37:19 -04:00
Github Actions
6db20908b3 Automatic bundle update 2022-06-16 19:35:33 +00:00
Anuken
2109a25e3e Turret progress 2022-06-16 15:34:22 -04:00
Anuken
52b5ed57bf Unfinished/WIP turret 2022-06-16 13:46:20 -04:00
xem8k5
d3e5a139e3
Update bundle_zh_CN.properties (#7017) 2022-06-14 22:40:22 -04:00
Somka000
33cd7c0bf4
Update (#7004) 2022-06-14 10:26:31 -04:00
First Creator
c1317a787d
(update bundle_fil.properties) when will anuken merge this lol (#6992) 
* we goin perhaps

UwU~

* more i guess

* Update bundle_fil.properties
 2022-06-14 08:27:52 -04:00
Github Actions
472da6f1b5 Automatic bundle update 2022-06-14 12:20:04 +00:00
Tegas Aziz
1469b96db7
[ID] Bundle updates (#7015) 
* [ID[ Bundle updates

* unicode on initerror
 2022-06-14 08:18:42 -04:00
Github Actions
22c5002931 Automatic bundle update 2022-06-14 01:10:07 +00:00
Ilya246
dc5b184d45
Add a solar panel output multiplier (#7013) 
* do

* world processor compatibility

* useless
 2022-06-13 21:09:06 -04:00
Anuken
1a63a2726e well, that didn't work. 2022-06-12 13:22:54 -04:00
xem8k5
2c197aae7c
Update bundle_zh_CN.properties again (#7001) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-06-11 08:17:10 -04:00
Anuken
8d27d70bc2 Merge remote-tracking branch 'origin/master' 2022-06-10 08:34:43 -04:00
Anuken
8418a00483 Misc bugfixes 2022-06-10 08:34:38 -04:00
Github Actions
0a96aedc22 Automatic bundle update 2022-06-09 18:34:03 +00:00
Jerzozwierz
e9bf756165
Update pl (#6853) 
Some changes in translation so it sounds better, also few things translated

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-09 14:33:07 -04:00
Github Actions
856a4dd218 Automatic bundle update 2022-06-09 18:31:39 +00:00
彭瑞暄
a618782345
Update zh-TW bundle translations (#6877) 
* formatting and minor changes

* Corrections

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

Clean-up logic-op translations

Co-authored-by: Simba-Fs 陳宏彰 <39305460+simba-fs@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-09 14:30:43 -04:00
Thomas Widyantoko
fb6e44d9e4
another v7 id_ID bundle update (#6837) 
* another v7 id_ID bundle update

Untranslated strings at line 1744-1754 and 2000-2003. Ambiguous strings at line 1170 and 1638. Fixed several typos, capitalizations and word choices.

* more id_ID v7 translation

untranslated strings at line 1744-1754
line 1942, Grafitik -> Grafit
line 1995-1997 erekir cores
 2022-06-09 14:30:03 -04:00
Anuken
dc6617cfad Threads update 2022-06-09 09:52:44 -04:00
Rex
104e65a868
Update contributors (#6856) 
At a request
 2022-06-08 11:38:23 -04:00
Github Actions
a18af7de64 Automatic bundle update 2022-06-08 15:20:55 +00:00
KayAyeAre
4646db8194
thai translation for v7 (#6927) 
* translations part 1

* translations part 2
 2022-06-08 11:18:49 -04:00
Github Actions
5ccc7d44db Automatic bundle update 2022-06-08 14:36:04 +00:00
Anuken
13ac6e0331 Made console a setting 2022-06-08 10:35:00 -04:00
Anuken
c969749163 Fixed #6898 2022-06-08 09:43:42 -04:00
xem8k5
f8de42d111
Update contributors (#6866) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-08 09:22:35 -04:00
Github Actions
642f1f74af Automatic bundle update 2022-06-08 13:21:24 +00:00
BlueWolf
38b0a664f4
so i made a slag heater (#6925) 
* Add slag fueled heater

* i have no idea why i have to do this but i do

Co-authored-by: Blue <415bluewolf@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-08 09:20:35 -04:00
Github Actions
bcbfde106d Automatic bundle update 2022-06-08 13:09:24 +00:00
Nunting
d3924dc0ae
Update bundle_ko.properties (#6848) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-08 09:08:28 -04:00
Github Actions
17bb8738cc Automatic bundle update 2022-06-08 13:06:22 +00:00
Anuken
0793ba45b5 Merge remote-tracking branch 'origin/master' 2022-06-08 09:05:31 -04:00
Anuken
b2353eba58 Misc 2022-06-08 09:05:25 -04:00
ErrorInCode
49c9841c87
Add Reinforced Surge Wall Names (#6873) 
* Added Reinforced Surge Wall Names

* i am not worthy
 2022-06-08 09:05:12 -04:00
ErrorInCode
1b9089aa30
Stats for New Blocks (#6913) 
* Stats added

* Fix bug + add WallCrafter speed

* Add more stats

* Update contributors
 2022-06-08 09:03:37 -04:00
Github Actions
91643d94c4 Automatic bundle update 2022-06-08 12:58:35 +00:00
Cryofluid
b9297a83b0
reconstructor -> refabricator (#6924) 2022-06-08 08:57:42 -04:00
MEEPofFaith
4e2b555813
Misleading description fix (#6880) 2022-06-08 08:40:37 -04:00
Anuken
e2bd6571b1 Chat message sound + minor JSOn fix 2022-05-25 23:15:09 -04:00
Yuri Polyakov
1d8d0f4a36
[RU] Big bundle update (#6849) 
* [RU] Big bundle update

r.i.p. my last pr

* Update bundle_ru.properties

* роутер
 2022-05-12 11:26:42 -04:00
澄みわたる朝色
fb8434322c
Update bundle_zh_TW.properties (#6851) 
* zh_TW translation for erekir

* zh_TW translation for erekir

* zh_TW translation for erekir

* zh_TW translation for erekir

Co-authored-by: weiliang1503 <weiliang1503@163.com>
 2022-05-12 10:51:02 -04:00
Anuken
e83e402612 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-12 00:19:14 -04:00
Github Actions
48b19751a3 Automatic bundle update 2022-05-12 04:07:42 +00:00
Anuken
9b9a1dd332 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-12 00:06:55 -04:00
xem8k5
699a8929e4
Fix bundle_zh_CN.properties (#6844) 
* Fix bundle_zh_CN.properties

block.tank-refabricator.name = 坦克重构厂
block.mech-refabricator.name = 爬虫重构厂
block.ship-refabricator.name = 飞艇重构厂

Now is "refabricator"？

* Update bundle_zh_CN.properties
 2022-05-12 00:06:47 -04:00
Somka000
1944ffe1a5
Translated everything bundle_pl.properties (#6838) 2022-05-11 21:57:26 -04:00
Rex
19d5170137
Update contributors (#6836) 2022-05-11 20:13:47 -04:00
Github Actions
eff4e91207 Automatic bundle update 2022-05-11 23:28:53 +00:00
xem8k5
37a46282f2
Update bundle_zh_CN.properties the third time (#6834) 
* Update bundle_zh_CN.properties the third time

Fixed various grammar issues

* Update bundle_zh_CN.properties
 2022-05-11 19:27:58 -04:00
Anuken
c1e98a1406 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-11 14:40:39 -04:00
Anuken
be9b7da892 Automatic consumeCoolant 2022-05-11 14:36:34 -04:00
Rex
2da60c4efc
Update bundle_es.properties (#6826) 
I just realized that they are turrets and not blocks
 2022-05-11 14:04:32 -04:00
Github Actions
4ac87ec61a Automatic bundle update 2022-05-11 14:15:24 +00:00
Rex
beae0662ce
Update bundle_es.properties (#6825) 2022-05-11 10:14:12 -04:00
snusunny
72f4d67a3b
[KO] Fix incorrect translations (#6823) 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- Fixed condensers being translated into *electric* condensers
- Fixed incorrect core names
- Made team names (derelict, sharded, crux ectc.) be proper nouns (고유명사) like you asked
- Fixed blast doors being translated as blast *compound* doors
- some other small fixes
 2022-05-11 10:02:00 -04:00
Anuken
aa3bf50731 Merge remote-tracking branch 'origin/master' 2022-05-10 21:56:41 -04:00
Anuken
8c98f8f9bf Mass driver reloadTime -> reload 2022-05-10 21:56:34 -04:00
Somka000
64e5561b5a
Translate things from Erekir and some other (#6812) 2022-05-10 21:16:32 -04:00
Anuken
2e4037451f Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 21:07:48 -04:00
Yuri Polyakov
99f98cc761
Update bundle_ru.properties (#6760) 
* Update bundle_ru.properties

* Update bundle_ru.properties

упс

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 21:07:33 -04:00
Yuri Polyakov
05cbc8a477
Update bundle_ru.properties (#6762) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2022-05-10 21:07:13 -04:00
Github Actions
05578fe8b7 Automatic bundle update 2022-05-10 23:02:41 +00:00
Anuken
6bda5546a6 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 19:01:40 -04:00
Anuken
0c6c9620a7 lang 2022-05-10 19:01:33 -04:00
end-me-please
9b8a09892a
Update bundle_de.properties (#6768) 
aHR0cHM6Ly9pLmltZ3VyLmNvbS9NSG1kV0plLnBuZw==
 2022-05-10 18:58:36 -04:00
Github Actions
fbf70224e4 Automatic bundle update 2022-05-10 22:58:02 +00:00
Nunting
3db6637e9f
Update bundle_ko.properties (#6763) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 18:56:56 -04:00
Anuken
a089afc626 Merge branch 'master' of https://github.com/Anuken/Mindustry into erekir 
 Conflicts:
	core/assets/bundles/bundle_zh_TW.properties
 2022-05-10 18:15:43 -04:00