mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-21 01:37:13 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,694 Commits 4 Branches 160 Tags 2.3 GiB
77becf9179
Commit Graph

4922 Commits

Author SHA1 Message Date
Anuken
3a6878ef60 T2 reinforced core unit 2021-11-13 10:40:55 -05:00
Anuken
2f0daa6fc4 Core cleanup / Turret draw class 2021-11-12 20:09:27 -05:00
Anuken
51301a50cc HeatCrafter 2021-11-11 20:39:43 -05:00
Anuken
a1107eae13 WIP heat reactor system 2021-11-11 18:52:51 -05:00
Anuken
c87bc11ad2 Core: Acropolis 2021-11-10 09:38:18 -05:00
Anuken
da87726176 Core: Citadel 2021-11-09 20:20:44 -05:00
Anuken
73f3fe31da Aegis core 2021-11-09 10:41:42 -05:00
Anuken
dffe90acff Directional liquid bridge 2021-11-08 12:06:55 -05:00
Anuken
ce0e26f008 New liquid tanks/routers/contaienrs 2021-11-08 09:47:00 -05:00
Anuken
07d9feeb09 WIP reinforced conduits 2021-11-07 12:56:58 -05:00
Anuken
da49328412 Stack router + Consistent item source + Item void flow 2021-11-06 16:31:42 -04:00
Anuken
059dc4b3bc Directional duct unloader 2021-11-05 19:45:27 -04:00
Anuken
6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Anuken
5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
	gradle.properties
 2021-11-04 19:39:16 -04:00
Anuken
1a8a2c326e impact drill wip 2021-11-04 11:41:12 -04:00
Anuken
38f7d2dcd0 tungsten 2021-11-02 14:49:05 -04:00
Anuken
18f28ef224 Full BuildTower impl 2021-11-02 11:47:35 -04:00
hortiSquash
134ef9e00e
hortiloaders hotfix randomness (#6283) 
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
 2021-11-01 17:34:40 -04:00
Anuken
5e249e50dd Beam tower 2021-11-01 11:46:32 -04:00
Yuri Polyakov
450f651c8f
Update bundle_ru.properties (#6267) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2021-11-01 09:32:57 -04:00
NgLam is SIMP
4cbc4a0bca
Update Vietnamese translation for V7 (#6246) 2021-11-01 09:31:34 -04:00
VizardAlpha
99e7fcd2d2
Update bundle_fr.properties (#6241) 
* Update bundle_fr.properties

After checking, there was some text missing to be translated.

* Minor modification
 2021-11-01 09:31:25 -04:00
Anuken
0781a325c7 new core unit 2021-10-29 19:42:51 -04:00
Anuken
c4a5a9aec0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-29 11:44:43 -04:00
Anuken
58544e6a21 Beam nodes 2021-10-28 22:18:07 -04:00
Anuken
cd909913ca turbine condenser 2021-10-27 19:41:12 -04:00
Anuken
3ee7ee7e79 WIP pressure turbine 2021-10-27 18:25:58 -04:00
Fernando
c15f82297d
Update bundle_pt_BR.properties (#6127) 
* Update bundle_pt_BR.properties

Add missing translations

* Update contributors

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* h

* Update bundle_pt_BR.properties
 2021-10-27 14:39:30 -04:00
Catchears
15396b6032
update german translation (#6085) 
* update german translation to 30e6bb2625

* typo
 2021-10-27 11:38:03 -04:00
彭瑞暄
75a520c3ae
Update TW translations (#6092) 2021-10-27 11:36:13 -04:00
JrTRinny
d7fd7db3cc
Update bundle_th.properties (#6187) 
* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties
 2021-10-27 11:26:02 -04:00
Prosta4okua
144731bfb0
Update bundle_uk_UA.properties (#6213) 2021-10-27 11:25:48 -04:00
VizardAlpha
7c1d4a092e
Update bundle_fr.properties (#6227) 2021-10-27 11:25:37 -04:00
kituta
a28ece6424
Update bundle_ja.properties (#6232) 
Add. //追加
 2021-10-27 11:25:30 -04:00
RebornTrack970
39c5c6a6f0
TR Translation (#6239) 2021-10-27 11:25:19 -04:00
Sharlotte
77975a710c
Update bundle_ko.properties (#6185) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Skskskskskk
 2021-10-27 11:25:15 -04:00
Rex
d95dc98652
Update bundle_es.properties (#6238) 
* Update bundle_es.properties

please see #6226 too.

* Update bundle_es.properties
 2021-10-27 11:25:10 -04:00
Thomas Widyantoko
7afa6a7f44
Update bundle_in_ID.properties (#6240) 
i am speed
 2021-10-27 11:25:01 -04:00
Hexrotor
65ef189921
Corrected wrong zh_CN translation (#6224) 2021-10-27 09:32:08 -04:00
Lin
5b3b2cf4d5
Update bundle_zh_CN.properties (#6216) 2021-10-27 08:38:37 -04:00
Anuken
705c85281c the vent 2021-10-26 20:34:45 -04:00
Darkness#3729
d89184da43
[RU] Translation of save search & map search (#6219) 2021-10-26 10:46:29 -04:00
Anuken
bc0b9e9eb3 plasma bore 2021-10-25 20:51:45 -04:00
Anuken
f347ab4714 WIP core bastion 2021-10-24 18:08:07 -04:00
Anuken
aa6eb73de8 asd 2021-10-23 19:59:11 -04:00
Anuken
693e420074 WIP breach turret 2021-10-23 14:35:37 -04:00
Anuken
a7c78c4193 Bundle case fixes 2021-10-22 18:17:25 -04:00
TranquillyUnpleasant
5c5acb2d48
Saved games search & Mapsearch filter improvements (#6194) 
* better filter menu

* remove unused bundle property

* indent

* Add text instead of using labels

* Saved game search

* Save not map

* auto cursor to search bar

* change icon to terrain
 2021-10-22 18:14:33 -04:00
hortiSquash
c9eed5a936
horti and the better unloaders (#6201) 
* hortiloaders 0.9.8.1 seq fix

* tiny fixes
added more comments

* a tiny fix, and rewriting of a comment
 2021-10-22 10:57:16 -04:00
Anuken
9416f137cb bugfixes 2021-10-20 11:01:47 -04:00
Anuken
d3343c0ae9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Planets.java
	tools/src/mindustry/tools/Generators.java
 2021-10-20 10:45:51 -04:00
RebornTrack970
59435c8372
TR Translation, fix for 132 (#6176) 
* TR Translation, fix for 132

* Update bundle_tr.properties
 2021-10-17 15:24:10 -04:00
VizardAlpha
fc9abeb908
Update bundle_fr.properties (#6172) 
* Update bundle_fr.properties

More branch merging.. Commits and more..

* Added logic variable display window
 2021-10-17 15:23:59 -04:00
Prosta4okua
ea3802bfc7
Update bundle_uk_UA.properties (#6180) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-10-17 15:23:50 -04:00
Darkness#3729
d970eb45e3
Lol (#6171) 2021-10-16 12:45:16 -04:00
Anuken
b7f030eb13 Added logic variable display window 2021-10-16 12:30:00 -04:00
Sharlotte
06bf2711a4
Update [KO] bundles once again (#6147) 
* Why did you marge this

* Update bundle_ko.properties
 2021-10-16 09:49:58 -04:00
Yuri Polyakov
91acda56c1
[RU] New blocks translated (#6159) 
* [RU] New blocks translated

ь

* Поправил 2 строчки

* а

* Еще перевел пару строк

* Поправил строчку

Как же плохо без очков
 2021-10-16 09:49:37 -04:00
JrTRinny
0f29a01292
Update bundle_th.properties (#6162) 2021-10-16 09:46:27 -04:00
Anuken
56d291c963 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/content/Planets.java
	core/src/mindustry/io/SaveFileReader.java
	core/src/mindustry/mod/ClassMap.java
	core/src/mindustry/type/UnitType.java
	core/src/mindustry/world/Block.java
 2021-10-14 21:00:14 -04:00
Anuken
b855849e4a Merge remote-tracking branch 'origin/master' 2021-10-14 20:58:13 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
082edbff6f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	tools/src/mindustry/tools/Generators.java
 2021-10-14 19:15:59 -04:00
Anuken
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
itsragedev
d5babe88e3
Update bundle_de.properties (#6150) 
Changing some strings to match the original a little more.
 2021-10-14 11:38:25 -04:00
Anuken
4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Anuken
d2ec511ede Bundle things 2021-10-13 09:53:52 -04:00
BorisA11
bf8276f501
Serbian translation of all blocks (#6129) 
all blocks are now translated, meaning the game should be more playable on this language
block descriptions are not yet done
 2021-10-12 15:36:29 -04:00
Yuri Polyakov
1fc3974e1b
[RU] Minor translation of some lines (#6016) 
* [RU] Minor translation of some lines

Translated 3 lines. That's all for now ...

* [RU] Editor translate

bruh

* [RU] Editor translate (2)

* [RU] Editor translate

bruh2

* update

* update 2
 2021-10-12 15:34:51 -04:00
Sharlotte
c857c8a438
Update bundle_ko.properties (#5984) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2021-10-12 15:21:48 -04:00
Anuken
5b9e11cc6c
Revert "Update this bundle (#6081)" (#6143) 
This reverts commit 10b1ce2a3d.
 2021-10-12 15:18:56 -04:00
GuestUser25
10b1ce2a3d
Update this bundle (#6081) 2021-10-12 15:18:25 -04:00
Angel-24
5b3ae4ae15
[ES] Updated spanish translation (#6031) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Updated line 125

Remove suggestion of changing auto-disabling mods setting when the game crashes, just what Anuke did in the original bundle.
 2021-10-12 14:16:22 -04:00
Anuken
44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00
Darkness#3729
8468214dd7
Another translate and typo fix (#6115) 
* Update bundle_ru.properties

* Another typo and some translation

* Also this

* And hint

* Bruh
 2021-10-10 10:29:58 -04:00
GlennFolker
758921c077
Added 2 versatile trigger event types (#6130) 
* t

* oops
 2021-10-10 08:08:04 -04:00
MrSampleJay
c22ede229e
Update bundle_fil.properties (#6128) 
Translated item description from copper to surge
 2021-10-09 17:15:43 -04:00
Wojtek G
1ca6db9cf5
Update bundle_pl.properties (#5206) 
[tutorial] changed "Poradnik" (Guide) to "Samouczek" (Tutorial) for consistency 

[command.rally] changed "Zbierz" (Sounds more like collecting something) to "Zbiórka" (Sounds more like gathering units together)
 2021-10-09 14:08:44 -04:00
BorisA11
dc7ffbc8b8
The partial Serbian language translation (#6118) 
* The partial Serbian language translation

Since all south-slavic langauges are very similar, this would also be usable by Croats, Bosnians, etc. The translation is not yet fully completed, many things are still not done, but I will propose this as it is now, then finish it up later, if possible.

* typo

typed rs instead of sr

* typo 2

ohno

* more unit descriptions

* more translations - over 100 more lines are done

* more translations

more complete translations
 2021-10-08 18:11:54 -04:00
kituta
f9da6f8904
Update bundle_ja.properties (#6121) 
Add. //追加しました
 2021-10-08 18:11:19 -04:00
Darkness#3729
200aa3e32b
Typo (#6114) 2021-10-07 12:47:52 -04:00
Anuken
083321d6c7 Merge remote-tracking branch 'origin/master' 2021-10-07 12:07:32 -04:00
Anuken
00be5b7fa5 Converted soundtrack to ogg 2021-10-07 12:07:26 -04:00
SoMall-dumpling
55537f09dc
Torpedos->Torpedoes (#6113) 
Typo, yes.
 2021-10-07 09:32:24 -04:00
Darkness#3729
6e3de78026
[RU] Unit descriptions and more (#6110) 
* Небольшое обновление бандла

* Перевод криогенной жидкости, а так же поиска карт

* Надо ещё оксиное перевести

* Добавил описание Оксино

* Убрал ненужное
 2021-10-06 10:23:32 -04:00
JrTRinny
17af905d52
Update bundle_th.properties (#6036) 
* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties
 2021-10-05 22:18:18 -04:00
VizardAlpha
f2139fad6e
Update bundle_fr.properties (#6035) 
* Update bundle_fr.properties

* Adding new commits

* Don't suggest changing the mod disable option

* ....
 2021-10-05 22:18:06 -04:00
Anuken
10b8a6e4a5 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
 2021-10-01 09:41:33 -04:00
Anuken
b265ddac03 Don't suggest changing the mod disable option 2021-10-01 09:28:23 -04:00
Yuri Polyakov
558fb26dcb
Update bundle_ru.properties (#6078) 
б
 2021-09-30 13:03:28 -04:00
Anuken
5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
 2021-09-28 18:45:09 -04:00
Anuken
c6c374f672 Merge remote-tracking branch 'origin/master' 2021-09-28 11:28:58 -04:00
Anuken
d226ffe633 Fixed #6071 2021-09-28 11:28:53 -04:00
TranquillyUnpleasant
366822e4d1
Remove unused variable (#6063) 
This got leftover from some other shader testing I did.
 2021-09-27 22:25:22 -04:00
SoMall-dumpling
30e6bb2625
Retusa Description Change (#6061) 
Now that Retusa has been remaked, the description needs to be changed too.
 2021-09-27 19:11:48 -04:00
Anuken
61a28aca91 Cryofluid floor tweaks 2021-09-27 15:07:10 -04:00
Anuken
7c00b54191 hgdf 2021-09-27 14:51:50 -04:00
TranquillyUnpleasant
dbd31b9031
Cryo tiles (#6054) 
* Cryo tile

* tile name

* Shader

* Icon and property
 2021-09-27 14:46:28 -04:00
TranquillyUnpleasant
bf89ef1e5e
Map search (#6004) 
* Map search

* Fix format

* check and continue

* icons and style

* grow pane so search bar doesnt move

* Inline focusing

* Use boolean instead of checking size
 2021-09-27 11:33:12 -04:00
Anuken
6d41b894ab Slight difficulty increase of Desolate Rift 2021-09-22 19:21:58 -04:00
Anuken
bd8b0c985a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-20 09:19:16 -04:00
Kowkodivka
e4e1bac2aa
[RU] Multiplayer translate (#6014) 
Перевел строчку "servers.local.steam = Open Games & Local Servers".
 2021-09-17 21:39:49 -04:00
Anuken
61fa72dcd3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/graphics/g3d/PlanetRenderer.java
 2021-09-17 21:33:01 -04:00
Anuken
01771c5288 Merge remote-tracking branch 'origin/master' 2021-09-17 11:46:58 -04:00
Anuken
58a21c3cc7 Arc compatibility 2021-09-17 11:46:52 -04:00
Kowkodivka
effd226c3e
[RU] Settings translate (#6013) 
Перевел 2 строчки в настройках графики.
 2021-09-17 11:33:46 -04:00
Kowkodivka
8ccca23a24
Update bundle_ru.properties (#6012) 
Translated "status.overdrive.name"
 2021-09-17 10:16:03 -04:00
Anuken
18d34c5854 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 14:18:24 -04:00
Anuken
0756da0dd1 Fixed shader warnings 2021-09-16 12:41:45 -04:00
Anuken
a8fd047cd6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 10:23:31 -04:00
Anuken
845b64945e "Realistic" specular planet lighting 2021-09-16 10:20:32 -04:00
Anuken
e86171e3c7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-15 20:51:57 -04:00
Darkness#3729
248f59131b
[RU] Translation of all latest bundles (#5985) 
* [RU] Translation of all latest bundles

* Also this line

* Update bundle_ru.properties

* Fix
 2021-09-14 12:52:19 -04:00
Rex
be0397355f
br (#5990) 2021-09-13 21:08:42 -04:00
Anuken
ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
Rex
d36a00a6fe
update bundle_es.properties (#5989) 
* Update bundle_es.properties

* Update bundle_es.properties

* 131

* support units

* fixed
 2021-09-13 20:08:40 -04:00
kituta
d20048fe11
Update bundle_ja.properties (#5849) 
* Update bundle_ja.properties

Addition. //追加
Changed wording of the toolmode. //toolmodeの文言を変更
Small fixes. //小さな修正

* Update bundle_ja.properties

Change of wording //文言の変更

* Update bundle_ja.properties

Addition. //追加

* Update bundle_ja.properties

Addition. //追加
366 editor.cliffs = Walls To Cliffs は「建築不能領域を表す断崖の壁を描く機能」だと思いますが、把握できていないため未翻訳で置いておきます。
「断崖を描く」

* Update bundle_ja.properties

Add

* Update bundle_ja.properties

fix //句点を忘れていました

* Update bundle_ja.properties

Small fixes. //小さな修正
 2021-09-13 08:44:13 -04:00
Shockwave
f64d078f29
Update bundle_zh_CN.properties (#5938) 
* Update bundle_zh_CN.properties

1. Inherited from <https://github.com/Anuken/Mindustry/pull/5661>
2. Synced latest commit from English bundle.

* Update bundle_zh_CN.properties

Synced cliff support for editor

* Update bundle_zh_CN.properties

Minor optimization

* Update bundle_zh_CN.properties

Minor fix at line 349~

* Update bundle_zh_CN.properties

Synced recent update in English bundle. (Hide All and Show All)

* Update bundle_zh_CN.properties

1. Synced hint for high threat level sector
2. Unified the term "sector"
3. Minor fix on the half-width commas

* Update bundle_zh_CN.properties

Optimized key-pressing descriptions.

* Update bundle_zh_CN.properties

Restore line 934 to half-width comma

* Update bundle_zh_CN.properties

Synced name of new sectors.
 2021-09-12 12:54:32 -04:00
RebornTrack970
da465c7786
TR Translate before release (#5980) 2021-09-12 11:34:03 -04:00
NickName73
9c12125e89
Update bundle_ru.properties (#5911) 2021-09-12 11:22:17 -04:00
Sharlotte
2a6d7c5a13
Update bundle_ko.properties (#5892) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2021-09-12 11:21:53 -04:00
YellOw139
71e38862b9
[Bundle][RO] Update (#5848) 
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 254284760f
- Typo fixes & various other improvements

* Update full_description.txt

* Update full_description.txt

* killing confusion

* Update bundle_ro.properties

* deep-tainted-water

* should do for now

* sector.name
 2021-09-12 11:21:17 -04:00
彭瑞暄
b58a63b200
Update bundle_zh_TW.properties (#5860) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

minor correction
 2021-09-12 11:21:09 -04:00
VizardAlpha
ee8b4f478d
Updates bundle_fr.properties (#5931) 
* Updates bundle_fr.properties

* Added rivers on Serpulo / Added deep tainted water

* Error correction

* More campaign map progress .. Added new commits

* Update bundle_fr.properties
 2021-09-12 11:09:46 -04:00
JrTRinny
1941f22676
Update bundle_th.properties (#5908) 
* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties

* more beautiful names

* Update bundle_th.properties
 2021-09-12 11:09:40 -04:00
Darkness6030
515ee060d2
[RU] Sectors name translation (#5972) 
С береговой линией все понятно. 
Но почему я выбрал "Прибрежная крепость"?
Все просто. "Naval" переводится как "Водяной", но "Водяная Крепость" - звучит *не очень*.
Нужен какой-то синоним. Я рассмотрел варианты "Морская", "Береговая", но в конце концов остановился на варианте "Прибрежная".

Если вы думаете иначе, предлагайте свой вариант перевода.
 2021-09-11 10:20:57 -04:00
Anuken
caa34c959e More campaign map progress 2021-09-10 17:07:06 -04:00
Anuken
47d5be679d Map progress 2021-09-10 16:33:26 -04:00
Anuken
7c028ffcb8 Experimental positional spawn support / WIP map 2021-09-10 13:56:12 -04:00
Anuken
10c3f9e44a River noise target field 2021-09-10 09:22:39 -04:00
Anuken
b2a634e5e7 Untested/WIP naval campaign map 2021-09-10 09:17:25 -04:00
Anuken
cbe188abab Map editor bugfixes / Re-added build noise 2021-09-09 17:04:55 -04:00
Anuken
2222330b43 Added hint for high threat level sector 2021-09-08 11:23:37 -04:00
Matthew Peng
d257adf0c1
Show All (#5954) 2021-09-07 15:20:59 -04:00
TranquillyUnpleasant
34d2a0d3a0
Hide all button for units (#5953) 
* Hide all button for units

* Add bundle property
 2021-09-07 13:38:43 -04:00
Anuken
5641b4901c Easier stained mountains guardian 2021-09-05 23:01:26 -04:00
Anuken
4da21ba363 Added cliff support to editor 2021-09-05 20:08:02 -04:00
Anuken
ed86f50a2f Serpulo clouds 2021-09-05 00:42:47 -04:00
Anuken
393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
 2021-09-04 23:12:28 -04:00
Anuken
24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
Anuken
ed1d4414a0 Payload conveyors are magnetic 2021-09-04 12:27:15 -04:00
Anuken
dddb282ce3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-09-04 12:26:07 -04:00
Matthew Peng
264052a95f
Remove the slight delay in wind3.ogg (#5909) 
* Remove the slight delay in `wind3.ogg`

* Don't need to export the quality that high
 2021-09-04 10:26:42 -04:00
Anuken
259d0baeb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-28 16:30:07 -04:00
Darkness6030
d254d971a9
Add unitSpawnEvent (#5876) 2021-08-28 10:53:19 -04:00
Anuken
9e16d7385a Implemented #5853 2021-08-25 10:09:00 -04:00
Anuken
26dd7e00eb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/UnitTypes.java
 2021-08-25 09:22:23 -04:00
VizardAlpha
4f22db8db5
Updates bundle_fr.properties (#5663) 
* Updates bundle_fr.properties

Final core launch animation / Added option to skip core animations

* Translation end

* Proper name/impl for "borderless windowed" on Windows

* Mod import progress bar

* WIP team icons

* Improved environmental block internal names

* Update core/assets/bundles/bundle_fr.properties

Co-authored-by: Lucien Perregaux <57545107+Luhrel@users.noreply.github.com>

* payload source and void descriptions

* Game stats cleanup

* Added max units field for wave editor

* Added max units

Co-authored-by: Lucien Perregaux <57545107+Luhrel@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-08-23 16:58:31 -04:00
Anuken
254284760f Hid details of locked content 2021-08-23 15:20:56 -04:00
RebornTrack970
81f25b76fd
TR Fix (#5781) 2021-08-23 14:41:32 -04:00
SoMall-dumpling
3bd3d3aa37
Avoid ambiguity (#5809) 
* Avoid ambiguity

When you see 'boost: 150%'
It can be 'increase the speed to 150%' or 'increase the speed to 250%'.
Maybe you will say that the colon has already avoided this ambiguity.
But you know there's always someone who ignores those things, and also translating 'boost' is hard with no 'x' to avoid ambiguity.
With a 'x', it will show 'Boost: x150%', which will never be thought as 250%.

* Update OverdriveProjector.java

When power is low, show 'low power: -{0}%';
When power is high, show 'boost: +{0}%'.

* Update bundle.properties

* Update bundle.properties

* Update OverdriveProjector.java

bugfix（perhaps）

* Update OverdriveProjector.java

what if

* Update OverdriveProjector.java

InTeReStInG

* Update OverdriveProjector.java

back to the past

* Update OverdriveProjector.java

Now using Math.max.

* Update bundle_bg.properties

* Update bundle_de.properties

* Update bundle_fr.properties

* Update bundle_hu.properties

* Update bundle_in_ID.properties

* Update bundle_ja.properties

* Update bundle_ko.properties

* Update bundle_pl.properties

* Update bundle_ro.properties

* Update bundle_ru.properties

* Update bundle_th.properties

* Update bundle_uk_UA.properties

* Update bundle_vi.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_TW.properties

* Update OverdriveProjector.java

Maybe this is necessary.

* Update OverdriveProjector.java

The stats are '+50%' ,etc. now.

* Update OverdriveProjector.java

Necessary, because the previous one is strange.
2.5 does not make sense. 12.5 does.
 2021-08-23 12:37:34 -04:00
Prosta4okua
fa9573e6dc
[UKR] Translation (#5810) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-08-23 12:27:17 -04:00
Sharlotte
b4d19bf71b
Update bundle_ko.properties (#5842) 2021-08-23 12:26:27 -04:00
YellOw139
0f019f58bd
[Bundle][RO] Update (#5839) 
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 5d4ab9ecd7
- Typo fixes & various other improvements

* new button

* derelict changes
 2021-08-23 12:26:15 -04:00
kituta
572166b157
Update bundle_ja.properties (#5813) 
* Update bundle_ja.properties

Corrections to notational errors. //表記揺れの修正
Change to appropriate wording. //適切な語句への変更

* Update bundle_ja.properties

Add and remove. //追加と削除
 2021-08-23 12:26:08 -04:00
JrTRinny
e16dba3336
Update bundle_th.properties (#5845) 
* Update bundle_th.properties

* database button
 2021-08-23 12:25:59 -04:00
Darkness6030
73b24d2966
Update bundle_ru.properties (#5844) 2021-08-23 10:24:36 -04:00
Anuken
006c796da7 Added database button in menu 2021-08-23 10:03:26 -04:00
Anuken
2ef9cfdad6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/entities/comp/FlyingComp.java
 2021-08-22 15:53:33 -04:00
Anuken
3ba2498815 Removed atrax from archipelago waves 2021-08-22 13:44:55 -04:00
Anuken
a6c8b3a2bd Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-21 10:15:44 -04:00
彭瑞暄
c0c0ebb71f
Update bundle_zh_TW.properties (#5739) 
1609 lst.lookup not translated for clarity (using original description)
 2021-08-20 23:03:17 -04:00
Anuken
946bba63d0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-19 23:52:06 -04:00
Anuken
5d4ab9ecd7 Added max units field for wave editor 2021-08-19 23:26:39 -04:00
Anuken
9e9cd213f3 Liquid container 2021-08-19 21:48:18 -04:00
Anuken
a39f2bd3a9 wip 2021-08-19 17:46:10 -04:00
Anuken
130f32f3cd Dormany cyst item 2021-08-18 17:38:30 -04:00
Anuken
ba48373bbc Game stats cleanup 2021-08-18 16:39:20 -04:00
Anuken
f3cacb9e99 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-18 15:04:30 -04:00
kituta
5b61a183cd
Update bundle_ja.properties (#5376) 
* Update bundle_ja.properties

* Update bundle_ja.properties

Minor corrections and additions

* Update bundle_ja.properties

* Update bundle_ja.properties

Add 2 lines

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update bundle_ja.properties

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>
 2021-08-18 10:45:39 -04:00
Sunny Kim
d1271f3e4b
Boss (Guardian) Status Sprite (#5773) 
* boss status

* almost forgot

* Update bundle_ko.properties
 2021-08-17 18:00:00 -04:00
JrTRinny
59456b67a1
payload source and void descriptions (#5778) 2021-08-16 08:22:03 -04:00
YellOw139
487bc1866a
[Bundle][RO] Update (#5668) 
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 5ca5025fb1
- Typo fixes & various other improvements

* Update bundle_ro.properties

* Update bundle_ro.properties

* progress

* derelict

* typo

* Update bundle_ro.properties

* Update bundle_ro.properties

* teamwork

* []

* AI

* Агрессоры

* sector info

* Update bundle_ro.properties

* Update bundle_ro.properties

* Update bundle_ro.properties

* Update bundle_ro.properties
 2021-08-15 21:24:27 -04:00
Thomas Widyantoko
0b99d71bd4
[ID] v7 prealpha translation (#5669) 
* Indonesian bundle update

lenum.controller description and Tar Fields map

* translation bundle sync

* Indonesian translation standardization

* healing status effect

* Indonesian translation for V7

bit confused on line 1611

* [ID] WIP polygonal core protection

* [ID] Updates Indonesian V7 translation

Logic wait & content look up instructions

* [ID] v7 prealpha translation

draft 1

* [ID] v7 prealpha translation part 2

Fixed a line and made changes to untranslated lines.
 2021-08-15 21:24:13 -04:00
Sharlotte
8d811550e2
Update bundle_ko.properties (#5680) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* They don't like unofficial properties h

* Update bundle_ko.properties

* translated b80129e17b (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), 7e047ef726 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), 1cf2bd4892 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), a5fe8970c6 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), 1b0de739f9 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c)
* marged from https://github.com/Anuken/Mindustry/pull/5731
 2021-08-15 21:24:07 -04:00
JrTRinny
09486946fc
Update bundle_th.properties (#5694) 
* Update bundle_th.properties

* banned unit

* better environment block name

* craters fix + color

* name consistensies

* add new updates
 2021-08-15 21:23:56 -04:00
RebornTrack970
3f988cec72
TR Translate (#5770) 2021-08-15 21:23:18 -04:00
Anuken
2200a44653 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-13 10:08:34 -04:00
Anuken
1b0de739f9 Sector info list / Minor hint fixes 2021-08-12 22:16:13 -04:00
Anuken
a5fe8970c6 Per-team AI settings / Errors for missing player cores 2021-08-12 09:24:20 -04:00
Anuken
1cf2bd4892 Team-specific rules / Player+Enemy team rules 2021-08-11 23:36:06 -04:00
Anuken
90a58388d6 merge 2021-08-10 16:34:57 -04:00
Anuken
e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
 2021-08-10 15:15:07 -04:00
Anuken
9c1063c7cc Misc minor bugfixes 2021-08-09 16:53:49 -04:00
Anuken
7e047ef726 Stone craters name fix 2021-08-09 12:13:07 -04:00
Anuken
cc0d7af610 Merge remote-tracking branch 'origin/master' 2021-08-08 13:38:01 -04:00
Anuken
00a2c1aad0 Refactored fireball into FireBulletType 2021-08-08 13:37:55 -04:00
Yakuzet
99b3420423
fix update TR bundle (#5715) 
translated some new things and fixed some translation
 2021-08-07 18:12:31 -04:00
Anuken
b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Anuken
4fa04b9e23 Bannable units / Show tech tree icon for unresearched units 2021-08-05 23:01:58 -04:00
Anuken
79bf77f4be WIP team icons 2021-07-31 18:23:22 -04:00
Anuken
1d257c1a35 Mod import progress bar 2021-07-31 10:58:09 -04:00
JrTRinny
589430055e
translation update (#5670) 2021-07-30 22:19:27 -04:00
Anuken
a7cc6185ad Proper name/impl for "borderless windowed" on Windows 2021-07-30 14:27:46 -04:00
Anuken
d855840fe2 Fixed #5672 2021-07-30 13:05:12 -04:00
RebornTrack970
676a064b6b
Updated TR bundle to Build 21565 (#5671) 2021-07-30 10:46:25 -04:00
Prosta4okua
59aff44a55
Update bundle_uk_UA.properties (#5540) 2021-07-28 16:58:06 -04:00
YellOw139
aa74679998
[Bundle][RO] Update (#5573) 
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 8041c305ad
- Typo fixes & various other improvements

* Update bundle_ro.properties

* Update bundle_ro.properties

* settings

* Update bundle_ro.properties

* new blocks

* new units I

* new units II

* Update bundle_ro.properties

* Update bundle_ro.properties
 2021-07-28 16:57:54 -04:00
Ksawi
5cb5434ffe
Update bundle_pl.properties (#5572) 
* Update bundle_pl.properties

Added translation of statuses and processor functions. Changed few translations.

* content.status.name

* Update bundle_pl.properties

* Update bundle_pl.properties

* Flares in omura.description

* Update bundle_pl.properties

* Now better?

* Update bundle_pl.properties

* Better names

* Update bundle_pl.properties

* bullet.lightning

* mods.browser

* Badania -> Zbadaj

* Final statuses names (I think)

* Ready to merge

* Tutorial (as in #5206)

* Research

* Final changes
 2021-07-28 10:45:49 -04:00
Catchears
2f71a4092f
german v7 update (#5631) 2021-07-28 10:45:15 -04:00
VizardAlpha
a97573c5a9
Updates bundle_fr.properties (#5611) 
* Updates bundle_fr.properties

Add and translate.
Commits on Jul 13, 2021
Commits on Jul 17, 2021 
Commits on Jul 18, 2021

* Minor. Correcting translation errors

* Add commit

* Add commit

* Add new commit

Translation not finish;
unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.

* Translation finish

* Added hint & tooltip for derelict structures

* Correction of an error

hint.placeTurret = Placez des \fuf861 -> hint.placeTurret = Placez des \uf861

* Fixed #5645

servers.local.steam = Open Games & Serveurs Locaux 

Not finish

* Removed flow rate option
 2021-07-28 10:45:02 -04:00
Sharlotte
108baa467d
Update bundle_ko.properties (#5604) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* halha

* Update bundle_ko.properties
 2021-07-28 10:44:44 -04:00
JrTRinny
193015f1cd
update bundle_th.properties (#5591) 
* separated from `#5491`

* follow latest changes

like settings tooltips, large launch pad removal and clean up team PvP

* follow latest changes

* descriptions for new content

* line spacings and edit errors

* derelict tooltips

* open games

* remove resource flow rate
 2021-07-28 10:44:35 -04:00
Anuken
5ca5025fb1 Final core launch animation / Added option to skip core animations 2021-07-27 19:02:04 -04:00
Anuken
00e3a59463 Land animation progress / IntelliJ android plugin hack 2021-07-27 16:26:13 -04:00
Anuken
adbe55b0db Minor cloud bugfixes / Removed flow rate option 2021-07-27 09:08:09 -04:00
Anuken
c19a7e8452 New core landing animation 2021-07-26 19:29:14 -04:00
Anuken
c9ca08ff1c Merge remote-tracking branch 'origin/master' 2021-07-25 12:04:52 -04:00
Anuken
c14532ecae Fixed #5645 2021-07-25 12:04:17 -04:00
EnderquakeYT
b66cc8d8d7
Fixed stuff and added translation (#5440) 
Fixed wave.enemy and added a translation for stat.charge
 2021-07-25 09:08:16 -04:00
Anuken
0ee137fe05 Added hint & tooltip for derelict structures 2021-07-24 12:48:25 -04:00
SoMall-dumpling
7897d2858c
Update bundle_zh_CN.properties (#5530) 
* 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

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Create bundle_zh_CN.properties

* Create bundle_zh_CN.properties

* 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

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

Updates the latest Navy Support Units description.

* Update bundle_zh_CN.properties

Perfectly matches.
 2021-07-24 08:40:23 -04:00
Anuken
385f493f36 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/net/CrashSender.java
	core/src/mindustry/ui/Links.java
	core/src/mindustry/ui/dialogs/SchematicsDialog.java
	core/src/mindustry/world/blocks/power/LightBlock.java
	gradle.properties
 2021-07-23 17:58:02 -04:00
Anuken
ed1d02d2c2 Payload loader/unloader progress 2021-07-22 21:07:36 -04:00
Anuken
bda461e480 Large constructor variant 2021-07-22 17:48:50 -04:00
Anuken
fcb9ebb8c3 Thermal generator effect tweaks 2021-07-21 09:02:08 -04:00
Anuken
db13bffad6 Descriptions for new content 2021-07-21 07:58:50 -04:00
Anuken
4c51519b8a #4886 2021-07-20 13:59:19 -04:00
Anuken
ba227d64fb #5224 2021-07-20 11:42:11 -04:00
Anuken
b2ed0ee884 #4440 2021-07-20 10:56:58 -04:00
Anuken
7879648090 Suppress invalid save meta errors 2021-07-18 14:40:59 -04:00
Anuken
974d3498c1 Settings tooltips 2021-07-18 11:11:28 -04:00
Anuken
6973ed7d55 PvP defeated team cleanup 2021-07-17 08:52:24 -04:00
Sharlotte
57b22a9cab
Update bundle_ko.properties (#5590) 2021-07-16 08:56:23 -04:00
Anuken
103f24d41d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/world/blocks/environment/Floor.java
	core/src/mindustry/world/blocks/payloads/Payload.java
	gradle.properties
 2021-07-15 09:13:35 -04:00
Anuken
a559c3581e Fixed continuous weapon sounds / Improved naval support audio 2021-07-14 18:46:51 -04:00
Anuken
dd5389c738 New sound for rock/plant breaking 2021-07-14 17:22:21 -04:00
Anuken
8041c305ad Misc bugfixes 2021-07-13 10:28:35 -04:00
VizardAlpha
2a1fdded72
bundle_fr.properties Updates (#5558) 
* bundle_fr.properties Updates

Add new commits

* Update Bundle
 2021-07-12 14:49:24 -04:00
Angel-24
2b757fe107
Update bundle_es.properties (#5526) 
Updated Spanish trasnlations to the 1 - Jul - 2021 changes in "bundle.properties".
 2021-07-12 14:47:17 -04:00
Sharlotte
a8d78453ff
Update bundle_ko.properties (#5527) 2021-07-12 14:47:05 -04:00
Antsiferov Andrew
2b88396aac
[Bundle][RU] Update (#5531) 
* double newline fix

hint.guardian

* 13 changed lines

mod.enabled
mod.disabled
status.burning.name
status.freezing.name
status.wet.name
status.melting.name
status.sapped.name
status.spore-slowed.name
status.tarred.name
status.overclock.name
status.shocked.name
status.blasted.name
status.unmoving.name

* yon't

* x'nt

* Update bundle_ru.properties

* 1 new, 1 changed

New:
stat.healing

Changed:
bullet.healpercent

* Inverse trig logic functions

See 00ca247d0f

* new v7 stuff, long list

New:
schematic.tags
schematic.edittags
schematic.addtag
schematic.texttag
schematic.icontag
schematic.renametag
schematic.tagdelconfirm
schematic.tagexists
tps
guardian
sector.changeicon
status.electrified.name
unsupported.environment
stat.repairspeed
ability.energyfield
bar.strength
rules.corecapture
block.rhyolite.name
block.repair-turret.name
hint.blockInfo
lenum.config
laccess.progress
unit.retusa.name
unit.oxynoe.name
unit.cyerce.name
unit.aegires.name
unit.navanax.name
block.duct.name
block.duct-router.name
block.duct-bridge.name
block.payload-propulsion-tower.name
block.payload-void.name
block.payload-source.name
filter.option.rotate

Changed:
stat.repairtime
bullet.pierce
team.crux.name
team.sharded.name
item.titanium.description

Deleted:
quit.confirm.tutorial
boss.health
team.orange.name
lenum.configure

* Update bundle_ru.properties

* 1 line changed

unit.oxynoe.name

* роутер-marshrutizator

ibglish

* 2 lines changed

block.surge-wall.name
block.surge-wall-large.name

* 3 new, 2 changed

New:
stat.showinmap
block.metal-floor-4.name
block.metal-floor-5.name

Changed:
stat.affinities
stat.opposites

* undone the dumb

* 1 new line

filter.option.replacement

* 1 new, 1 changed

New:
rules.polygoncoreprotection

Changed:
hint.respawn

* Fixed outdated minke description

unit.minke.description: "зажигательными" -> "артиллерийскими"

* 3 new lines

unit.tilessecond (ec59cb602c)
lst.wait, lst.lookup (0949852758)

* typo

еденицы -> единицы

Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
 2021-07-12 14:46:46 -04:00
Antsiferov Andrew
f856ad16ba
Fixed a typo (#5532) 2021-07-12 14:46:36 -04:00
Anuken
1baa82a7c6 Mostly-complete cliff crusher implementation 2021-07-08 16:16:44 -04:00
Anuken
a0c5ed3761 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-07-08 09:29:36 -04:00
Anuken
017552f573 Fixed crash caused by invalid NinePatch sprites 2021-07-06 15:23:37 -04:00
Anuken
481881aa8b Prop cleanup / Optimization of large skybox PNG 2021-07-05 21:18:40 -04:00
Anuken
dfcc9a595f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-07-05 09:17:34 -04:00
TranquillyUnpleasant
789e354400
Server qol (#5534) 2021-07-04 21:18:41 -04:00
Anuken
ebf0c71db6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/mod/ClassMap.java
 2021-07-04 09:52:57 -04:00
Anuken
6afb976a44 Payload deconstructor sprite 2021-07-01 17:53:26 -04:00
Anuken
bc7085826e Re-generated ClassMap 2021-07-01 11:44:29 -04:00
Anuken
ec59cb602c Crash fix / tilesSecond speed unit 2021-07-01 11:17:42 -04:00
RebornTrack970
4dcac119d8
Updated TR Bundle to the latest V7 prealpha (#5505) 
* Updated TR Bundle to the latest V7 prealpha

* Update bundle_tr.properties
 2021-06-30 13:24:52 -04:00
Thomas Widyantoko
5cc92506c9
[ID] Updates Indonesian V7 translation (#5513) 
* Indonesian bundle update

lenum.controller description and Tar Fields map

* translation bundle sync

* Indonesian translation standardization

* healing status effect

* Indonesian translation for V7

bit confused on line 1611

* [ID] WIP polygonal core protection

* [ID] Updates Indonesian V7 translation

Logic wait & content look up instructions
 2021-06-30 08:34:08 -04:00
Anuken
3ea3df5c73 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-06-28 18:57:27 -04:00
Catchears
ebd444cc5f
final v7 german translation (#5473) 2021-06-25 16:57:20 -04:00
Anuken
cd2c605036 Suppress certain mod errors on client load 2021-06-25 14:37:32 -04:00
RebornTrack970
0546d6cf55
TR Bundle Change: Bug Fix (#5404) 
* TR Bundle Change: Yakalandı -> Elegeçirldi

* Bug Fix
 2021-06-25 13:30:08 -04:00
彭瑞暄
1bf3345b2f
Update bundle_zh_TW.properties (#5364) 
translation for new block and naval unit names
 2021-06-25 13:08:44 -04:00